From 333f7e5a1af80d6c73c07464d14f167be7b84491 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 14 Mar 2026 00:19:59 +0100 Subject: [PATCH 01/11] test if f close is causing flicker --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index faf44c0..008fa31 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -465,7 +465,7 @@ void LoadTransport() { void SaveRgbOrder() { File f = LittleFS.open("/rgb_order.val", "w"); f.write((uint8_t)rgbMode); - f.close(); + // f.close(); } void LoadRgbOrder() { From 9910b3fb43bc155d51c2a669ef0220153a64e831 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 14 Mar 2026 01:52:27 +0100 Subject: [PATCH 02/11] remove flicker, test --- src/main.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 008fa31..7244ef4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -465,7 +465,7 @@ void LoadTransport() { void SaveRgbOrder() { File f = LittleFS.open("/rgb_order.val", "w"); f.write((uint8_t)rgbMode); - // f.close(); + f.close(); } void LoadRgbOrder() { @@ -776,6 +776,7 @@ void AcquireNextBuffer() { void CheckMenuButton() { #ifndef DISPLAY_RM67162_AMOLED if (!digitalRead(FORWARD_BUTTON_PIN)) { + display->FillScreen(0, 0, 0); settingsMenu = true; SaveSettingsMenu(); delay(20); @@ -2147,6 +2148,11 @@ void setup() { if (up || down) { switch (position) { case 1: { // Exit + display->FillScreen(0, 0, 0); + SaveLum(); + SaveUsbPackageSizeMultiplier(); + SaveDebug(); + SaveRgbOrder(); Restart(); break; } @@ -2158,7 +2164,7 @@ void setup() { display->SetBrightness(brightness); DisplayLum(255, 191, 0); - SaveLum(); + // SaveLum(); break; } case 3: { // USB Package Size @@ -2170,7 +2176,7 @@ void setup() { DisplayNumber(usbPackageSizeMultiplier * 32, 4, 7 * (TOTAL_WIDTH / 128) + (16 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); - SaveUsbPackageSizeMultiplier(); + // SaveUsbPackageSizeMultiplier(); break; } #ifdef DMDREADER @@ -2233,7 +2239,7 @@ void setup() { if (++debug > 1) debug = 0; DisplayNumber(debug, 1, 7 * (TOTAL_WIDTH / 128) + (6 * 4), (TOTAL_HEIGHT / 2) - 10, 255, 191, 0); - SaveDebug(); + // SaveDebug(); break; } case 7: { // RGB order @@ -2251,7 +2257,7 @@ void setup() { rgbMode = 5; RefreshSetupScreen(); DisplayRGB(255, 191, 0); - SaveRgbOrder(); + // SaveRgbOrder(); break; } case 8: { // LED Test From 407a7e8b8da7d9278a35c4425a3b0233865b661a Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 14 Mar 2026 02:02:48 +0100 Subject: [PATCH 03/11] try with clearscreen --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 7244ef4..2865d82 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -776,7 +776,7 @@ void AcquireNextBuffer() { void CheckMenuButton() { #ifndef DISPLAY_RM67162_AMOLED if (!digitalRead(FORWARD_BUTTON_PIN)) { - display->FillScreen(0, 0, 0); + ClearScreen(); settingsMenu = true; SaveSettingsMenu(); delay(20); @@ -2148,7 +2148,7 @@ void setup() { if (up || down) { switch (position) { case 1: { // Exit - display->FillScreen(0, 0, 0); + ClearScreen(); SaveLum(); SaveUsbPackageSizeMultiplier(); SaveDebug(); From 3aab2f0a38be05a0b5f3cdc5393501aa3af831e3 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 14 Mar 2026 02:26:05 +0100 Subject: [PATCH 04/11] Why do we have this? --- src/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2865d82..1edb998 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2243,12 +2243,12 @@ void setup() { break; } case 7: { // RGB order - if (rgbModeLoaded != 0) { - rgbMode = 0; - SaveRgbOrder(); - delay(10); - Restart(); - } + //if (rgbModeLoaded != 0) { + // rgbMode = 0; + // SaveRgbOrder(); + // delay(10); + // Restart(); + //} if (up && ++rgbMode > 5) rgbMode = 0; else if (down && From eb65ea87b8d6307efaf8cb127e76cb0acb3e8ea9 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 14 Mar 2026 03:30:13 +0100 Subject: [PATCH 05/11] prepare for new method of saving values --- src/main.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 1edb998..71a2368 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2164,7 +2164,6 @@ void setup() { display->SetBrightness(brightness); DisplayLum(255, 191, 0); - // SaveLum(); break; } case 3: { // USB Package Size @@ -2176,7 +2175,6 @@ void setup() { DisplayNumber(usbPackageSizeMultiplier * 32, 4, 7 * (TOTAL_WIDTH / 128) + (16 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); - // SaveUsbPackageSizeMultiplier(); break; } #ifdef DMDREADER @@ -2239,16 +2237,15 @@ void setup() { if (++debug > 1) debug = 0; DisplayNumber(debug, 1, 7 * (TOTAL_WIDTH / 128) + (6 * 4), (TOTAL_HEIGHT / 2) - 10, 255, 191, 0); - // SaveDebug(); break; } case 7: { // RGB order - //if (rgbModeLoaded != 0) { - // rgbMode = 0; - // SaveRgbOrder(); - // delay(10); - // Restart(); - //} + if (rgbModeLoaded != 0) { + rgbMode = 0; + SaveRgbOrder(); + delay(10); + Restart(); + } if (up && ++rgbMode > 5) rgbMode = 0; else if (down && @@ -2257,7 +2254,6 @@ void setup() { rgbMode = 5; RefreshSetupScreen(); DisplayRGB(255, 191, 0); - // SaveRgbOrder(); break; } case 8: { // LED Test From 5198288daccf2c75c2a56e10e8aeb57c435fb547 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Mon, 16 Mar 2026 22:17:59 +0100 Subject: [PATCH 06/11] save values when exiting the menu instead of directly when changing the value. --- src/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 71a2368..920b3fe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2150,9 +2150,14 @@ void setup() { case 1: { // Exit ClearScreen(); SaveLum(); + SaveRgbOrder(); +#if defined(ARDUINO_ESP32_S3_N16R8) || defined(PICO_BUILD) SaveUsbPackageSizeMultiplier(); SaveDebug(); - SaveRgbOrder(); +#endif +#ifdef DMDREADER + SaveColor(); +#endif Restart(); break; } @@ -2191,7 +2196,6 @@ void setup() { display->DisplayText(ColorString(loopbackColor), 7 * (TOTAL_WIDTH / 128) + (6 * 4), TOTAL_HEIGHT / 2 + 4, 255, 191, 0); - SaveColor(); break; } #else From 60fd5a3ad243df7fef83d87f9b150774e71ee05d Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 17 Mar 2026 00:04:33 +0100 Subject: [PATCH 07/11] lock USB for pico builds --- src/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 920b3fe..b6d765c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -351,9 +351,8 @@ static uint8_t NormalizeTransportType(uint8_t type) { ? type : Transport::WIFI_UDP; #elif defined(ZEDMD_NO_NETWORKING) - return type == Transport::SPI ? Transport::SPI : Transport::USB; -#else - return type <= Transport::SPI ? type : Transport::USB; + (void)type; + return Transport::USB; #endif } @@ -2062,7 +2061,7 @@ void setup() { } else { if (position == 3) position = forward ? 4 : 2; } -#ifdef DMDREADER +#if defined (DMDREADER) || defined(PICO_BUILD) if (position == 5) position = forward ? 6 : 4; #endif From aa7764ddb89acb2cd02d302e47602cd922f74b4f Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 17 Mar 2026 00:34:09 +0100 Subject: [PATCH 08/11] correct one --- src/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b6d765c..df7271d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2153,8 +2153,7 @@ void setup() { #if defined(ARDUINO_ESP32_S3_N16R8) || defined(PICO_BUILD) SaveUsbPackageSizeMultiplier(); SaveDebug(); -#endif -#ifdef DMDREADER +#elif (DMDREADER) SaveColor(); #endif Restart(); From 3c7bfa6124dea32b6f8230cdc506dcf6a5d174c2 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 17 Mar 2026 00:42:24 +0100 Subject: [PATCH 09/11] only return USB --- src/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index df7271d..079f861 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -351,7 +351,6 @@ static uint8_t NormalizeTransportType(uint8_t type) { ? type : Transport::WIFI_UDP; #elif defined(ZEDMD_NO_NETWORKING) - (void)type; return Transport::USB; #endif } From 955ac5167cb574cd41b8a206f4dafe182d9b9082 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 17 Mar 2026 00:51:03 +0100 Subject: [PATCH 10/11] add back else --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 079f861..11d7f47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -352,6 +352,8 @@ static uint8_t NormalizeTransportType(uint8_t type) { : Transport::WIFI_UDP; #elif defined(ZEDMD_NO_NETWORKING) return Transport::USB; +#else + return Transport::USB; #endif } From c1ba9b8135110f87f16a25a29f9bef402c827205 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Tue, 17 Mar 2026 13:42:47 +0100 Subject: [PATCH 11/11] white space...... --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 11d7f47..298a9d7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -352,7 +352,7 @@ static uint8_t NormalizeTransportType(uint8_t type) { : Transport::WIFI_UDP; #elif defined(ZEDMD_NO_NETWORKING) return Transport::USB; -#else +#else return Transport::USB; #endif }