From 72ed94727399a08b1f6a151f113746d57af57ff2 Mon Sep 17 00:00:00 2001 From: Miloslav Ciz Date: Wed, 18 Jun 2025 23:09:01 +0200 Subject: [PATCH] Fix nibble --- frontend_espboy/frontend_espboy.ino | 6 ++++-- frontend_nibble/frontend_nibble.ino | 5 +++-- frontend_ringo/frontend_ringo.ino | 2 +- renderer.h | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/frontend_espboy/frontend_espboy.ino b/frontend_espboy/frontend_espboy.ino index 65ee032..f02d6d4 100644 --- a/frontend_espboy/frontend_espboy.ino +++ b/frontend_espboy/frontend_espboy.ino @@ -80,10 +80,12 @@ void LCR_appendDataStr(const char *str) void setup() { - *((volatile uint32_t *) 0x60000900) &= ~(1); // disable watchdog +// *((volatile uint32_t *) 0x60000900) &= ~(1); // disable watchdog + +wdt_disable(); dac.begin(MCP4725address); - delay (100); + delay(100); dac.setVoltage(0,false); mcp.begin(MCP23017address); delay(100); diff --git a/frontend_nibble/frontend_nibble.ino b/frontend_nibble/frontend_nibble.ino index d19c995..a480833 100644 --- a/frontend_nibble/frontend_nibble.ino +++ b/frontend_nibble/frontend_nibble.ino @@ -16,9 +16,9 @@ #define LCR_SETTING_RESOLUTION_SUBDIVIDE 2 #define LCR_SETTING_GHOST_MAX_SAMPLES 0 #define LCR_LOADING_COMMAND wdt_reset(); -#define S3L_SORT 1 +#define S3L_SORT 0 #define S3L_Z_BUFFER 0 -#define S3L_MAX_TRIANGES_DRAWN 32 +#define S3L_MAX_TRIANGLES_DRAWN 32 #define LCR_SETTING_MAP_MAX_BLOCKS 350 #define LCR_SETTING_MAX_MAP_VERTICES 300 #define LCR_SETTING_MAX_MAP_TRIANGLES 500 @@ -76,6 +76,7 @@ cbf(BTN_B,5) void setup() { + wdt_disable(); Nibble.begin(); display = Nibble.getDisplay(); sprite = display->getBaseSprite(); diff --git a/frontend_ringo/frontend_ringo.ino b/frontend_ringo/frontend_ringo.ino index 606e5b2..37dbfec 100644 --- a/frontend_ringo/frontend_ringo.ino +++ b/frontend_ringo/frontend_ringo.ino @@ -13,7 +13,7 @@ #define LCR_SETTING_RESOLUTION_SUBDIVIDE 2 #define LCR_SETTING_MUSIC 0 #define LCR_SETTING_GHOST_MAX_SAMPLES 0 -#define LCR_SETTING_MAP_MAX_BLOCKS 650 +#define LCR_SETTING_MAP_MAX_BLOCKS 1024 #define LCR_SETTING_MAX_MAP_VERTICES 1024 #define LCR_SETTING_MAX_MAP_TRIANGLES 1550 #define LCR_SETTING_REPLAY_MAX_SIZE 0 diff --git a/renderer.h b/renderer.h index 53eed21..0b3b9f2 100644 --- a/renderer.h +++ b/renderer.h @@ -267,11 +267,11 @@ void LCR_rendererDrawText(const char *text, int x, int y, uint16_t color, for (int a = 0; a < 2; ++a) { if (c & 0x01) - for (int i = 0; i < size; ++i) + for (int i = 0; i <= size; ++i) _LCR_rendererDrawFontPixel(x + a * size + i,y + b * size,color); if (c & 0x02) - for (int i = 0; i < size; ++i) + for (int i = 0; i <= size; ++i) _LCR_rendererDrawFontPixel(x + b * size,y + a * size + i,color); c >>= 2; @@ -281,7 +281,7 @@ void LCR_rendererDrawText(const char *text, int x, int y, uint16_t color, for (int a = 0; a < 2; ++a) { if (c & 0x01) - for (int i = 0; i < size; ++i) + for (int i = 0; i <= size; ++i) _LCR_rendererDrawFontPixel(x + a * size + i,y + b * size + i,color); c >>= 1;