From e6d4a51ddeddc8935eaa025277b8fa90a722098f Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Thu, 19 Mar 2026 17:06:57 +0100 Subject: [PATCH 01/28] first commit - new way of treating 128x16 --- data/logoDEX16.raw | Bin 6144 -> 12288 bytes docs/images/logos/128x16/128x16.raw | Bin 6144 -> 12288 bytes src/main.cpp | 32 ++++++++++++---------------- src/panel.h | 13 ++++++----- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/data/logoDEX16.raw b/data/logoDEX16.raw index 419f28d6d3ae4755ce3799d1c8c064472d2fb184..c2f0299afa1459e365ec5f3a4b7685be170d5945 100644 GIT binary patch delta 97 pcmZoLXh_)Tz`{5&;0qztFi}Wrq5;oD1GbGeN5nTeG83bz5dd&EGPeK# delta 7 OcmZojXfRmBBLM&l9RgPX diff --git a/docs/images/logos/128x16/128x16.raw b/docs/images/logos/128x16/128x16.raw index 419f28d6d3ae4755ce3799d1c8c064472d2fb184..c2f0299afa1459e365ec5f3a4b7685be170d5945 100644 GIT binary patch delta 97 pcmZoLXh_)Tz`{5&;0qztFi}Wrq5;oD1GbGeN5nTeG83bz5dd&EGPeK# delta 7 OcmZojXfRmBBLM&l9RgPX diff --git a/src/main.cpp b/src/main.cpp index 786b03c..e53f4cf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -126,11 +126,6 @@ uint8_t lastBuffer __attribute__((aligned(4))); uint8_t processingBuffer __attribute__((aligned(4))); bool rgb565ZoneStream = false; -#ifdef ZEDMD_DEX16 -int8_t yOffset = 8; -#else -int8_t yOffset = 0; -#endif // Init display on a low brightness to avoid power issues, but bright enough to // see something. #ifdef DISPLAY_RM67162_AMOLED @@ -144,6 +139,7 @@ uint8_t panelDriver = 0; uint8_t panelI2sspeed = 8; uint8_t panelLatchBlanking = 2; uint8_t panelMinRefreshRate = 60; +int8_t yOffset = 0; #ifdef DMDREADER bool core_0_initialized = false; bool core_1_initialized = false; @@ -308,24 +304,24 @@ void DisplayVersion(bool logo = false) { char version[10]; snprintf(version, 9, "%d.%d.%d", ZEDMD_VERSION_MAJOR, ZEDMD_VERSION_MINOR, ZEDMD_VERSION_PATCH); - #ifdef DMDREADER +#ifdef DMDREADER display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4), - TOTAL_HEIGHT - 5, 255 * !logo, 255 * !logo, 255 * !logo, - logo); - #else + MENU_HEIGHT - 5 + MENU_OFFSET, 255 * !logo, 255 * !logo, + 255 * !logo, logo); +#else display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4) - 5, - TOTAL_HEIGHT - 5, 255 * !logo, 255 * !logo, 255 * !logo, - logo); - #endif + MENU_HEIGHT - 5 + MENU_OFFSET, 255 * !logo, 255 * !logo, + 255 * !logo, logo); +#endif } void DisplayLum(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { - display->DisplayText(" ", (TOTAL_WIDTH / 2) - 26 - 1, TOTAL_HEIGHT - 6, r, g, - b); - display->DisplayText("Brightness:", (TOTAL_WIDTH / 2) - 26, TOTAL_HEIGHT - 6, - r, g, b); - DisplayNumber(brightness, 2, (TOTAL_WIDTH / 2) + 18, TOTAL_HEIGHT - 6, 255, - 191, 0); + display->DisplayText(" ", (TOTAL_WIDTH / 2) - 26 - 1, + MENU_HEIGHT - 6 + MENU_OFFSET, r, g, b); + display->DisplayText("Brightness:", (TOTAL_WIDTH / 2) - 26, + MENU_HEIGHT - 6 + MENU_OFFSET, r, g, b); + DisplayNumber(brightness, 2, (TOTAL_WIDTH / 2) + 18, + MENU_HEIGHT - 6 + MENU_OFFSET, 255, 191, 0); } void DisplayRGB(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { diff --git a/src/panel.h b/src/panel.h index f762882..4f4c6c3 100644 --- a/src/panel.h +++ b/src/panel.h @@ -13,10 +13,6 @@ #define PANEL_WIDTH 64 // Width: number of LEDs for 1 panel. #define PANEL_HEIGHT 64 // Height: number of LEDs. #define PANELS_NUMBER 3 // Number of horizontally chained panels. -#elif defined(ZEDMD_DEX16) -#define PANEL_WIDTH 64 // Width: number of LEDs for 1 panel. -#define PANEL_HEIGHT 32 // Height: number of LEDs. -#define PANELS_NUMBER 2 // Number of horizontally chained panels. #endif #ifndef PANEL_WIDTH #define PANEL_WIDTH 64 // Width: number of LEDs for 1 panel. @@ -28,11 +24,18 @@ #ifdef ZEDMD_HD_HALF #define TOTAL_HEIGHT (PANEL_HEIGHT / 2) #elif defined(ZEDMD_DEX16) -#define TOTAL_HEIGHT (PANEL_HEIGHT / 2) +#define MENU_HEIGHT (PANEL_HEIGHT / 2) +#define MENU_OFFSET 8 #endif #ifndef TOTAL_HEIGHT #define TOTAL_HEIGHT PANEL_HEIGHT #endif +#ifndef MENU_HEIGHT +#define MENU_HEIGHT PANEL_HEIGHT +#endif +#ifndef MENU_OFFSET +#define MENU_OFFSET 0 +#endif #define TOTAL_BYTES (TOTAL_WIDTH * TOTAL_HEIGHT * 3) #define RGB565_TOTAL_BYTES (TOTAL_WIDTH * TOTAL_HEIGHT * 2) #define ZONE_WIDTH (TOTAL_WIDTH / 16) From 66bf1dbacb67e3880409c1c6503121deaa896ce1 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Thu, 19 Mar 2026 17:10:47 +0100 Subject: [PATCH 02/28] for testing --- platformio.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio.ini b/platformio.ini index abdfcb8..4cd243f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -175,6 +175,7 @@ extends = pico board = rpipico2 build_flags = ${pico.build_flags} -DBOARD_HAS_PSRAM + -DZEDMD_DEX16=1 [env:pico2_256x64] extends = pico From 9aa1178fb949da37e04f56f9e3a7b69fbe24e254 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 20 Mar 2026 00:45:00 +0100 Subject: [PATCH 03/28] menu test --- src/main.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e53f4cf..1f67b52 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -306,7 +306,7 @@ void DisplayVersion(bool logo = false) { ZEDMD_VERSION_PATCH); #ifdef DMDREADER display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4), - MENU_HEIGHT - 5 + MENU_OFFSET, 255 * !logo, 255 * !logo, + MENU_HEIGHT - 5 + MENU_Y_OFFSET, 255 * !logo, 255 * !logo, 255 * !logo, logo); #else display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4) - 5, @@ -317,24 +317,24 @@ void DisplayVersion(bool logo = false) { void DisplayLum(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { display->DisplayText(" ", (TOTAL_WIDTH / 2) - 26 - 1, - MENU_HEIGHT - 6 + MENU_OFFSET, r, g, b); + MENU_HEIGHT - 6 + MENU_Y_OFFSET, r, g, b); display->DisplayText("Brightness:", (TOTAL_WIDTH / 2) - 26, - MENU_HEIGHT - 6 + MENU_OFFSET, r, g, b); + MENU_HEIGHT - 6 + MENU_Y_OFFSET, r, g, b); DisplayNumber(brightness, 2, (TOTAL_WIDTH / 2) + 18, - MENU_HEIGHT - 6 + MENU_OFFSET, 255, 191, 0); + MENU_HEIGHT - 6 + MENU_Y_OFFSET, 255, 191, 0); } void DisplayRGB(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { #ifndef DISPLAY_RM67162_AMOLED - display->DisplayText("red", 0, 0, 0, 0, 0, true, true); + display->DisplayText("red", MENU_Y_OFFSET, 0, 0, 0, 0, true, true); for (uint8_t i = 0; i < 6; i++) { - display->DrawPixel(TOTAL_WIDTH - (4 * 4) - 1, i, 0, 0, 0); - display->DrawPixel((TOTAL_WIDTH / 2) - (6 * 4) - 1, i, 0, 0, 0); + display->DrawPixel(TOTAL_WIDTH - (4 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); + display->DrawPixel((TOTAL_WIDTH / 2) - (6 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); } - display->DisplayText("blue", TOTAL_WIDTH - (4 * 4), 0, 0, 0, 0, true, true); - display->DisplayText("green", 0, TOTAL_HEIGHT - 6, 0, 0, 0, true, true); - display->DisplayText("RGB Order:", (TOTAL_WIDTH / 2) - (6 * 4), 0, r, g, b); - DisplayNumber(rgbMode, 2, (TOTAL_WIDTH / 2) + (4 * 4), 0, 255, 191, 0); + display->DisplayText("blue", TOTAL_WIDTH - (4 * 4), MENU_Y_OFFSET, 0, 0, 0, true, true); + display->DisplayText("green", 0, TOTAL_HEIGHT - 6, MENU_Y_OFFSET, 0, 0, true, true); + display->DisplayText("RGB Order:", (TOTAL_WIDTH / 2) - (6 * 4), MENU_Y_OFFSET, r, g, b); + DisplayNumber(rgbMode, 2, (TOTAL_WIDTH / 2) + (4 * 4), MENU_Y_OFFSET, 255, 191, 0); #endif } @@ -959,7 +959,7 @@ void DisplayLogo() { f = LittleFS.open("/logoHD.raw", "r"); } else if (TOTAL_WIDTH == 192 && TOTAL_HEIGHT == 64) { f = LittleFS.open("/logoSEGAHD.raw", "r"); - } else if (TOTAL_WIDTH == 128 && TOTAL_HEIGHT == 16) { + } else if (TOTAL_WIDTH == 128 && MENU_HEIGHT == 16) { f = LittleFS.open("/logoDEX16.raw", "r"); } else { f = LittleFS.open("/logo.raw", "r"); @@ -1410,7 +1410,7 @@ uint8_t HandleData(uint8_t *pData, size_t len) { Serial.write(CtrlChars, N_ACK_CHARS); Serial.flush(); } - display->DisplayText("Saving settings ...", 0, 0, 255, 0, 0); + display->DisplayText("Saving settings ...", MENU_Y_OFFSET, 0, 255, 0, 0); display->Render(); SaveLum(); SaveDebug(); @@ -1427,7 +1427,7 @@ uint8_t HandleData(uint8_t *pData, size_t len) { #ifdef ZEDMD_HD_HALF SaveYOffset(); #endif - display->DisplayText("Saving settings ... done", 0, 0, 255, 0, 0); + display->DisplayText("Saving settings ... done", MENU_Y_OFFSET, 0, 255, 0, 0); display->Render(); headerBytesReceived = 0; numCtrlCharsFound = 0; @@ -2010,7 +2010,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); + (MENU_HEIGHT / 2) + 4, 255, 191, 0); const auto forwardButton = new Bounce2::Button(); forwardButton->attach(FORWARD_BUTTON_PIN, INPUT_PULLUP); @@ -2067,7 +2067,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); + (MENU_HEIGHT / 2) + 4, 255, 191, 0); break; } case 2: { // Brightness From c3d74b7d0b4102d3b21960bc9e446ffc5b64bb85 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 20 Mar 2026 00:47:10 +0100 Subject: [PATCH 04/28] incorrect declaration --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 1f67b52..e4eeced 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -310,7 +310,7 @@ void DisplayVersion(bool logo = false) { 255 * !logo, logo); #else display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4) - 5, - MENU_HEIGHT - 5 + MENU_OFFSET, 255 * !logo, 255 * !logo, + MENU_HEIGHT - 5 + MENU_Y_OFFSET, 255 * !logo, 255 * !logo, 255 * !logo, logo); #endif } From dde32951dd57d3da7cafb2fc2a07a92f936b87c9 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 20 Mar 2026 00:48:10 +0100 Subject: [PATCH 05/28] save panel.h,,. --- src/panel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panel.h b/src/panel.h index 4f4c6c3..9d59535 100644 --- a/src/panel.h +++ b/src/panel.h @@ -33,8 +33,8 @@ #ifndef MENU_HEIGHT #define MENU_HEIGHT PANEL_HEIGHT #endif -#ifndef MENU_OFFSET -#define MENU_OFFSET 0 +#ifndef MENU_Y_OFFSET +#define MENU_Y_OFFSET 0 #endif #define TOTAL_BYTES (TOTAL_WIDTH * TOTAL_HEIGHT * 3) #define RGB565_TOTAL_BYTES (TOTAL_WIDTH * TOTAL_HEIGHT * 2) From fa4080a680bb7733fea7ba81d9634080088b6f6a Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 21 Mar 2026 23:43:19 +0100 Subject: [PATCH 06/28] check exit location --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e4eeced..bbe2f45 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2010,7 +2010,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4, 255, 191, 0); + (MENU_HEIGHT / 2) + 4 + MENU_Y_OFFSET, 255, 191, 0); const auto forwardButton = new Bounce2::Button(); forwardButton->attach(FORWARD_BUTTON_PIN, INPUT_PULLUP); @@ -2067,7 +2067,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4, 255, 191, 0); + (MENU_HEIGHT / 2) + 4 + MENU_Y_OFFSET, 255, 191, 0); break; } case 2: { // Brightness From 7b8ad90fa0ef1c836b4059a92ce46ac2000fc2d0 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 21 Mar 2026 23:53:39 +0100 Subject: [PATCH 07/28] fix exit location --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index bbe2f45..5d02716 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -326,7 +326,7 @@ void DisplayLum(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { void DisplayRGB(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { #ifndef DISPLAY_RM67162_AMOLED - display->DisplayText("red", MENU_Y_OFFSET, 0, 0, 0, 0, true, true); + display->DisplayText("red", 0, MENU_Y_OFFSET, 0, 0, 0, true, true); for (uint8_t i = 0; i < 6; i++) { display->DrawPixel(TOTAL_WIDTH - (4 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); display->DrawPixel((TOTAL_WIDTH / 2) - (6 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); @@ -1101,7 +1101,7 @@ void RefreshSetupScreen() { display->DisplayText("LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); + (MENU_HEIGHT / 2) + 4 + MENU_Y_OFFSET, 128, 128, 128); } uint8_t HandleData(uint8_t *pData, size_t len) { From fe7b0601799d782290977f3b73487e26125624da Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sun, 22 Mar 2026 00:01:24 +0100 Subject: [PATCH 08/28] fix Y_offest naming --- src/panel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panel.h b/src/panel.h index 9d59535..86f43e7 100644 --- a/src/panel.h +++ b/src/panel.h @@ -25,7 +25,7 @@ #define TOTAL_HEIGHT (PANEL_HEIGHT / 2) #elif defined(ZEDMD_DEX16) #define MENU_HEIGHT (PANEL_HEIGHT / 2) -#define MENU_OFFSET 8 +#define MENU_Y_OFFSET 8 #endif #ifndef TOTAL_HEIGHT #define TOTAL_HEIGHT PANEL_HEIGHT From 220623bf5be0aa6781471aa48bf9e2e947bfc3ab Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sun, 22 Mar 2026 00:04:45 +0100 Subject: [PATCH 09/28] more alignment fixes --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 5d02716..ec8b976 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -332,7 +332,7 @@ void DisplayRGB(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { display->DrawPixel((TOTAL_WIDTH / 2) - (6 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); } display->DisplayText("blue", TOTAL_WIDTH - (4 * 4), MENU_Y_OFFSET, 0, 0, 0, true, true); - display->DisplayText("green", 0, TOTAL_HEIGHT - 6, MENU_Y_OFFSET, 0, 0, true, true); + display->DisplayText("green", 0, MENU_HEIGHT - 6 + MENU_Y_OFFSET, 0, 0, 0, true, true); display->DisplayText("RGB Order:", (TOTAL_WIDTH / 2) - (6 * 4), MENU_Y_OFFSET, r, g, b); DisplayNumber(rgbMode, 2, (TOTAL_WIDTH / 2) + (4 * 4), MENU_Y_OFFSET, 255, 191, 0); #endif From 0e63b258a51c89b0c5e2456ee59bdd4694269068 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sun, 22 Mar 2026 01:02:09 +0100 Subject: [PATCH 10/28] don't show debug for dmdreader --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index ec8b976..be6bc48 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1017,7 +1017,7 @@ void DisplayUpdate() { f = LittleFS.open("/ppucHD.raw", "r"); } else if (TOTAL_WIDTH == 192 && TOTAL_HEIGHT == 64) { // need to add some day - } else if (TOTAL_WIDTH == 128 && TOTAL_HEIGHT == 16) { + } else if (TOTAL_WIDTH == 128 && MENU_HEIGHT == 16) { // need to add some day } else { f = LittleFS.open("/ppuc.raw", "r"); @@ -1069,10 +1069,12 @@ void RefreshSetupScreen() { DisplayLum(); display->DisplayText(transport->getTypeString(), 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); +#ifndef DMDREADER display->DisplayText("Debug:", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) - 10, 128, 128, 128); DisplayNumber(debug, 1, 7 * (TOTAL_WIDTH / 128) + (6 * 4), (TOTAL_HEIGHT / 2) - 10, 255, 191, 0); +#endif if (transport->isUsb()) { display->DisplayText("USB Packet Size:", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); From 32d32dde8e9a5a0e54bc0561ee74e49b3dfd6045 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sun, 22 Mar 2026 01:31:22 +0100 Subject: [PATCH 11/28] exclude transport type, center color --- src/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index be6bc48..7519702 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1067,9 +1067,10 @@ void RefreshSetupScreen() { } DisplayRGB(); DisplayLum(); + +#ifndef DMDREADER display->DisplayText(transport->getTypeString(), 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); -#ifndef DMDREADER display->DisplayText("Debug:", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) - 10, 128, 128, 128); DisplayNumber(debug, 1, 7 * (TOTAL_WIDTH / 128) + (6 * 4), @@ -1090,10 +1091,10 @@ void RefreshSetupScreen() { #ifdef DMDREADER else if (transport->isSpi()) { display->DisplayText("Color:", 7 * (TOTAL_WIDTH / 128), - (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); + (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); display->DisplayText(ColorString(loopbackColor), 7 * (TOTAL_WIDTH / 128) + (6 * 4), - (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); } #endif #ifdef ZEDMD_HD_HALF From a51324e15b68e9b500e536dfdfc20bae85cea155 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sun, 22 Mar 2026 02:21:58 +0100 Subject: [PATCH 12/28] clear a specific part for x16 --- src/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 7519702..192c1fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1058,8 +1058,13 @@ void ScreenSaver() { void RefreshSetupScreen() { DisplayLogo(); +#ifdef ZEDMD_DEX16 + for (uint16_t y = (TOTAL_HEIGHT / 32 * 5) + MENU_Y_OFFSET; + y < MENU_HEIGHT - 10; y++) { +#else for (uint16_t y = (TOTAL_HEIGHT / 32 * 5); y < TOTAL_HEIGHT - (TOTAL_HEIGHT / 32 * 5); y++) { +#endif for (uint16_t x = (TOTAL_WIDTH / 128 * 5); x < TOTAL_WIDTH - (TOTAL_WIDTH / 128 * 5); x++) { display->DrawPixel(x, y, 0, 0, 0); From 10b1d111e52bce6f4383ca2014a3f48017fafed1 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 01:50:38 +0200 Subject: [PATCH 13/28] change raw file to what it will become --- data/logoDEX16.raw | Bin 12288 -> 12288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/logoDEX16.raw b/data/logoDEX16.raw index c2f0299afa1459e365ec5f3a4b7685be170d5945..7b55fdea750cdc2d5758be91822c5d89d46d6976 100644 GIT binary patch delta 118 zcmZojXh_&Fi*KTU?&RZqEfWR)Pxcb1+bF=wIQgt#^+o{>#>oM~6&nRK87F@f2?x`K zVhI}s6o7p3*o^|pjFSr`A@oP7sEq<@K)wu69Z=r|S)e|kIll5hbC?)6pHi@6oG4(w J*Sls~C3w`|tNvNCM~9a|$MM;C)gJ|4@UtAx0>r@TCE1cEJusi#D@h zGxN5(WU4DY3fLP~Abv`olVBP<%=FZ>Yi0b+ICY(z{7*%=M<$EGT#Zl#B7{+)VnUNq zVW;D-%r0hC2>8Bwr>CxE<@zQ(6;wH^pw7Wb8gQCqMR4T^lI0cKqa|BeGnI8y-tcJz zgQBwf$EtV;uo^hb-k-f5&gr;GNX~0r2l2 zSXTCZ?jLxC!)Ib5A+M-A%yJMa=~IdHHNRnna_cs?W=org{!}>A}8ln0)u_GaUs#`3SCH7YW|ZUD(sse zvMHUAu}kMuAHbXuytBQ7B2z}?BQrbOR;aLL3!8R-msV-^4tyHftSEw#1_(pusKLUP zKNFkx&HUTEHVvs7{fd^VxWz)MBbO8Do7e87Q2dz=>WSiy5f$QwZlnxz0isM)0^>E+ zF(XHy1?w(|#P1(aTu=1g?(N#0LsK|1g=3#0nF=m;vr$_CtpjqeC<+3M%vR7)p_+B` zpOJxFu0RYFcM#BO^h9)17iz`d&HvyC){@~0A?;2*fstegJvDdPi+t(W`gCNAhc?7G0?QEyjBNU)z*epeN`JQ>L(% z4|YV|g@gWzL?qmj#1 z`J{|}_F|Mk@XTL|7w4%p4uUcve?mcM+_L+yRKKycYn#3`sXLRpk4C}W2^pV*#Kn@h zw3eA--~(=aN?Kxyt00k5DX0^y7xis}Pk?p*X8-|C3eu~i3 Date: Tue, 31 Mar 2026 02:26:53 +0200 Subject: [PATCH 14/28] adjusted logo --- data/logoDEX16.raw | Bin 12288 -> 12288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/logoDEX16.raw b/data/logoDEX16.raw index 7b55fdea750cdc2d5758be91822c5d89d46d6976..bc847481d082d2156c94fb221bdf81968e95311e 100644 GIT binary patch delta 233 zcmX}lKTE?v0ETfKEF9dW`NM5ZF12+21BZhMf*|+}l8+&Rkniy99o&ULz{yb% z1i??xcI(txsvw>nI{dcx;ce=sZk?o%{{&7hxKxfxX&P11DzWpd*1QF0tOCt%Fr(=A z_9p!e*WrXJ)I5aKZXO;U@DZJ`j5J?SNfyV9<1M$zF?FK5yJRMq4`QAMTRu}iOf}zW z*=3n8Z_Jp=Xzq=pHNCygY>9a{G4JacBaEMSJvNK-`ERUD?P!BUGO?`EJynB GNd5uIcv5}< delta 151 zcmZojXh_&#!?TfzgK@Gxug&BJUdzenc%MuZ(3-r7&wTPfK8wlT{I5VIIHW?`yPp(pO0y|>8vdtnD9stMiI1c~- From 33f87530ac694c8098ee38c61417afe98109f6f0 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 13:04:27 +0200 Subject: [PATCH 15/28] adjust menu height and merged branch fix --- src/main.cpp | 3 ++- src/panel.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 09580fa..4e56c53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1073,9 +1073,10 @@ void RefreshSetupScreen() { DisplayRGB(); DisplayLum(); -#ifndef DMDREADER +#ifndef ZEDMD_DEX16 display->DisplayText(transport->getTypeString(), 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); +#endif #ifndef DMDREADER display->DisplayText("Debug:", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) - 10, 128, 128, 128); diff --git a/src/panel.h b/src/panel.h index 86f43e7..45038d9 100644 --- a/src/panel.h +++ b/src/panel.h @@ -24,8 +24,8 @@ #ifdef ZEDMD_HD_HALF #define TOTAL_HEIGHT (PANEL_HEIGHT / 2) #elif defined(ZEDMD_DEX16) -#define MENU_HEIGHT (PANEL_HEIGHT / 2) -#define MENU_Y_OFFSET 8 +#define MENU_HEIGHT ((PANEL_HEIGHT / 2) + 2) +#define MENU_Y_OFFSET 7 #endif #ifndef TOTAL_HEIGHT #define TOTAL_HEIGHT PANEL_HEIGHT From ea081ecbdc04af1951b0f361aeceabc6372676fb Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 13:18:53 +0200 Subject: [PATCH 16/28] take the correct raw file --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 4e56c53..fd7ee51 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -959,7 +959,7 @@ void DisplayLogo() { f = LittleFS.open("/logoHD.raw", "r"); } else if (TOTAL_WIDTH == 192 && TOTAL_HEIGHT == 64) { f = LittleFS.open("/logoSEGAHD.raw", "r"); - } else if (TOTAL_WIDTH == 128 && MENU_HEIGHT == 16) { + } else if (TOTAL_WIDTH == 128 && MENU_HEIGHT == 18) { f = LittleFS.open("/logoDEX16.raw", "r"); } else { f = LittleFS.open("/logo.raw", "r"); From ae81be65d4246ed14053ac796be4b15bc12b4f5c Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 13:28:04 +0200 Subject: [PATCH 17/28] fixed raw file --- data/logoDEX16.raw | Bin 12288 -> 12288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/logoDEX16.raw b/data/logoDEX16.raw index bc847481d082d2156c94fb221bdf81968e95311e..fa847124c0e9abc348f9c3fcc3b27147087bdf41 100644 GIT binary patch literal 12288 zcmeI1v5A6V5JV?5umA%a5NtrO0qsCL5GxQ!FJ?LZq4Y(TI90}C)PoV#!@{+Dl# zWtNxE%u5&W*?lGur4I-TLp{KFpGfWBY#2D?2Y>mwr7*X#Ekj*KkNi0J!OZ*V#@GQT2HeZ79) z<;uw9hVJNBDH_~w?9S+c6chrKna>AP7`%{$Qb*hD_lsHdK1igk22I-c!$gw5FTdZ3 a(#Py8ZOh|qzy@r<25i6vY`_Nooq-<#r((ze literal 12288 zcmeIvA!q_&7{>888ZQ_O25lY~v?*A$DOlD#Fo;PGgP6o7Vi1#vK}>>%!4?EHWp)cjYu z1e;NWQNW-=gDUlE4mF#&xw>A1&8)(#pxvN$i<%vWn=euGU+oSYEi@abcggINIdrJm z#Ld-%Asl`5x+ssxn2<4ZxcL$_|23V#F~N9*r)SE|DYF!!X35nOA{KMJydtxv Date: Tue, 31 Mar 2026 13:39:02 +0200 Subject: [PATCH 18/28] comment --- src/panel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panel.h b/src/panel.h index 45038d9..c767b51 100644 --- a/src/panel.h +++ b/src/panel.h @@ -23,7 +23,7 @@ #define TOTAL_WIDTH (PANEL_WIDTH * PANELS_NUMBER) #ifdef ZEDMD_HD_HALF #define TOTAL_HEIGHT (PANEL_HEIGHT / 2) -#elif defined(ZEDMD_DEX16) +#elif defined(ZEDMD_DEX16) // should be centered and 18 pixels high #define MENU_HEIGHT ((PANEL_HEIGHT / 2) + 2) #define MENU_Y_OFFSET 7 #endif From cd01f174842bfb4b01c4dd7773f6f4ba319adbd5 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 15:09:35 +0200 Subject: [PATCH 19/28] fix color: placement --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fd7ee51..27e5913 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1098,10 +1098,10 @@ void RefreshSetupScreen() { #ifdef DMDREADER else if (transport->isSpi()) { display->DisplayText("Color:", 7 * (TOTAL_WIDTH / 128), - (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); + (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); display->DisplayText(ColorString(loopbackColor), 7 * (TOTAL_WIDTH / 128) + (6 * 4), - (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); + (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); } #endif #ifdef ZEDMD_HD_HALF From 491e676bf428c51da26ed508fc6ff637094f9a3e Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 15:17:02 +0200 Subject: [PATCH 20/28] let the y offset center it --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 27e5913..61d6e62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1098,10 +1098,10 @@ void RefreshSetupScreen() { #ifdef DMDREADER else if (transport->isSpi()) { display->DisplayText("Color:", 7 * (TOTAL_WIDTH / 128), - (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); + (TOTAL_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 128, 128, 128); display->DisplayText(ColorString(loopbackColor), 7 * (TOTAL_WIDTH / 128) + (6 * 4), - (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); + (TOTAL_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 255, 191, 0); } #endif #ifdef ZEDMD_HD_HALF From 62d9ba12bced51d99ab6514f9eced1798f151cbc Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 15:17:38 +0200 Subject: [PATCH 21/28] also fix the static one --- src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 61d6e62..bc7a400 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2097,7 +2097,8 @@ void setup() { case 4: { // Color RefreshSetupScreen(); display->DisplayText("Color:", 7 * (TOTAL_WIDTH / 128), - TOTAL_HEIGHT / 2 + 4, 255, 191, 0); + (TOTAL_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 255, + 191, 0); break; } #else From 66c06a307be3aeebad0c194841f4c367a8ec1ae6 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 15:24:08 +0200 Subject: [PATCH 22/28] also adjust the position of the color --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index bc7a400..9c39ef2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2203,7 +2203,7 @@ void setup() { display->DisplayText(ColorString(loopbackColor), 7 * (TOTAL_WIDTH / 128) + (6 * 4), - TOTAL_HEIGHT / 2 + 4, 255, 191, 0); + TOTAL_HEIGHT / 2 + 4 - MENU_Y_OFFSET, 255, 191, 0); break; } #else From 8e6509aa113931b2ae07ca739b44d5788fe8f900 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 16:10:44 +0200 Subject: [PATCH 23/28] center exit --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9c39ef2..507a303 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1111,7 +1111,7 @@ void RefreshSetupScreen() { display->DisplayText("LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4 + MENU_Y_OFFSET, 128, 128, 128); + (MENU_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 128, 128, 128); } uint8_t HandleData(uint8_t *pData, size_t len) { @@ -2020,7 +2020,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4 + MENU_Y_OFFSET, 255, 191, 0); + (MENU_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 255, 191, 0); const auto forwardButton = new Bounce2::Button(); forwardButton->attach(FORWARD_BUTTON_PIN, INPUT_PULLUP); @@ -2079,7 +2079,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4 + MENU_Y_OFFSET, 255, 191, 0); + (MENU_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 255, 191, 0); break; } case 2: { // Brightness From 4bd19c2d49ef46e3f96cf25132c3f64dc84f7939 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 16:14:05 +0200 Subject: [PATCH 24/28] no offset for exit --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 507a303..2892368 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1111,7 +1111,7 @@ void RefreshSetupScreen() { display->DisplayText("LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 128, 128, 128); + (MENU_HEIGHT / 2) + 4, 128, 128, 128); } uint8_t HandleData(uint8_t *pData, size_t len) { @@ -2020,7 +2020,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 255, 191, 0); + (MENU_HEIGHT / 2) + 4, 255, 191, 0); const auto forwardButton = new Bounce2::Button(); forwardButton->attach(FORWARD_BUTTON_PIN, INPUT_PULLUP); @@ -2079,7 +2079,7 @@ void setup() { RefreshSetupScreen(); display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, - (MENU_HEIGHT / 2) + 4 - MENU_Y_OFFSET, 255, 191, 0); + (MENU_HEIGHT / 2) + 4, 255, 191, 0); break; } case 2: { // Brightness From b6bc49aedc45c1d3f7f74fe528077133b71aab74 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 18:05:29 +0200 Subject: [PATCH 25/28] "Test" in "LED Test" shouldn't be shown for x16 --- src/main.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 2892368..403c7a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1108,8 +1108,13 @@ void RefreshSetupScreen() { display->DisplayText("Y-Offset", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 10, 128, 128, 128); #endif +#ifdef ZEDMD_DEX16 + display->DisplayText("LED", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); +#else display->DisplayText("LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 3, 128, 128, 128); +#endif display->DisplayText("Exit", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 15, (MENU_HEIGHT / 2) + 4, 128, 128, 128); } @@ -2129,9 +2134,15 @@ void setup() { } case 8: { // LED Test RefreshSetupScreen(); +#ifdef ZEDMD_DEX16 + display->DisplayText("LED", + TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); +#else display->DisplayText("LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); +#endif break; } #ifdef ZEDMD_HD_HALF @@ -2278,9 +2289,15 @@ void setup() { switch(ledTest) { case 0: RefreshSetupScreen(); +#ifdef ZEDMD_DEX16 + display->DisplayText("LED", + TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); +#else display->DisplayText("LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); +#endif break; case 1: display->FillScreen(255, 0, 0); From c8220184d93d6ad9212f748cc2a794e509fbf059 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 18:11:17 +0200 Subject: [PATCH 26/28] revert --- platformio.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 4cd243f..abdfcb8 100644 --- a/platformio.ini +++ b/platformio.ini @@ -175,7 +175,6 @@ extends = pico board = rpipico2 build_flags = ${pico.build_flags} -DBOARD_HAS_PSRAM - -DZEDMD_DEX16=1 [env:pico2_256x64] extends = pico From 5313524251f3520d7fbd18242769d64bafa328b9 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 18:14:07 +0200 Subject: [PATCH 27/28] format selection --- src/main.cpp | 59 +++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 403c7a7..0e37dbe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -306,12 +306,12 @@ void DisplayVersion(bool logo = false) { ZEDMD_VERSION_PATCH); #ifdef DMDREADER display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4), - MENU_HEIGHT - 5 + MENU_Y_OFFSET, 255 * !logo, 255 * !logo, - 255 * !logo, logo); + MENU_HEIGHT - 5 + MENU_Y_OFFSET, 255 * !logo, + 255 * !logo, 255 * !logo, logo); #else display->DisplayText(version, TOTAL_WIDTH - (strlen(version) * 4) - 5, - MENU_HEIGHT - 5 + MENU_Y_OFFSET, 255 * !logo, 255 * !logo, - 255 * !logo, logo); + MENU_HEIGHT - 5 + MENU_Y_OFFSET, 255 * !logo, + 255 * !logo, 255 * !logo, logo); #endif } @@ -329,12 +329,17 @@ void DisplayRGB(uint8_t r = 128, uint8_t g = 128, uint8_t b = 128) { display->DisplayText("red", 0, MENU_Y_OFFSET, 0, 0, 0, true, true); for (uint8_t i = 0; i < 6; i++) { display->DrawPixel(TOTAL_WIDTH - (4 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); - display->DrawPixel((TOTAL_WIDTH / 2) - (6 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, 0); - } - display->DisplayText("blue", TOTAL_WIDTH - (4 * 4), MENU_Y_OFFSET, 0, 0, 0, true, true); - display->DisplayText("green", 0, MENU_HEIGHT - 6 + MENU_Y_OFFSET, 0, 0, 0, true, true); - display->DisplayText("RGB Order:", (TOTAL_WIDTH / 2) - (6 * 4), MENU_Y_OFFSET, r, g, b); - DisplayNumber(rgbMode, 2, (TOTAL_WIDTH / 2) + (4 * 4), MENU_Y_OFFSET, 255, 191, 0); + display->DrawPixel((TOTAL_WIDTH / 2) - (6 * 4) - 1, i + MENU_Y_OFFSET, 0, 0, + 0); + } + display->DisplayText("blue", TOTAL_WIDTH - (4 * 4), MENU_Y_OFFSET, 0, 0, 0, + true, true); + display->DisplayText("green", 0, MENU_HEIGHT - 6 + MENU_Y_OFFSET, 0, 0, 0, + true, true); + display->DisplayText("RGB Order:", (TOTAL_WIDTH / 2) - (6 * 4), MENU_Y_OFFSET, + r, g, b); + DisplayNumber(rgbMode, 2, (TOTAL_WIDTH / 2) + (4 * 4), MENU_Y_OFFSET, 255, + 191, 0); #endif } @@ -1425,7 +1430,8 @@ uint8_t HandleData(uint8_t *pData, size_t len) { Serial.write(CtrlChars, N_ACK_CHARS); Serial.flush(); } - display->DisplayText("Saving settings ...", MENU_Y_OFFSET, 0, 255, 0, 0); + display->DisplayText("Saving settings ...", MENU_Y_OFFSET, 0, 255, + 0, 0); display->Render(); SaveLum(); SaveDebug(); @@ -1442,7 +1448,8 @@ uint8_t HandleData(uint8_t *pData, size_t len) { #ifdef ZEDMD_HD_HALF SaveYOffset(); #endif - display->DisplayText("Saving settings ... done", MENU_Y_OFFSET, 0, 255, 0, 0); + display->DisplayText("Saving settings ... done", MENU_Y_OFFSET, 0, + 255, 0, 0); display->Render(); headerBytesReceived = 0; numCtrlCharsFound = 0; @@ -2136,12 +2143,12 @@ void setup() { RefreshSetupScreen(); #ifdef ZEDMD_DEX16 display->DisplayText("LED", - TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, - (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); + TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); #else display->DisplayText("LED Test", - TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, - (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); + TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); #endif break; } @@ -2212,9 +2219,9 @@ void setup() { // 255, set it to DMD_WHITE loopbackColor = ((uint8_t)Color::DMD_WHITE); - display->DisplayText(ColorString(loopbackColor), - 7 * (TOTAL_WIDTH / 128) + (6 * 4), - TOTAL_HEIGHT / 2 + 4 - MENU_Y_OFFSET, 255, 191, 0); + display->DisplayText( + ColorString(loopbackColor), 7 * (TOTAL_WIDTH / 128) + (6 * 4), + TOTAL_HEIGHT / 2 + 4 - MENU_Y_OFFSET, 255, 191, 0); break; } #else @@ -2286,17 +2293,17 @@ void setup() { --ledTest > 3) // underflow will result in 255, set it to 2 ledTest = 3; - switch(ledTest) { + switch (ledTest) { case 0: RefreshSetupScreen(); #ifdef ZEDMD_DEX16 - display->DisplayText("LED", - TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, - (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); + display->DisplayText( + "LED", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); #else - display->DisplayText("LED Test", - TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, - (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); + display->DisplayText( + "LED Test", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, + (TOTAL_HEIGHT / 2) - 3, 255, 191, 0); #endif break; case 1: From 19ce6df0224b4b748070a6387b4823f08bfd8e00 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 31 Mar 2026 18:27:55 +0200 Subject: [PATCH 28/28] update dmdreader as well --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index abdfcb8..ee31ca5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -239,7 +239,7 @@ board_build.filesystem_size = 256k lib_deps = thomasfredericks/Bounce2 https://github.com/PPUC/pimoroni-pico#13f14db59efbabdbd51f0b4ab95269e18c7701ce - https://github.com/PPUC/dmdreader#50165188eb2d0b8fd5157b64261c708a943cd70e + https://github.com/PPUC/dmdreader#5ae0e4a1489ed61f7bce0542079f554a33368683 lib_ignore = WiFi AsyncUDP