From 5afd9a7d73e797a8df34c3365f013a26b3dd78c4 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 24 Apr 2026 22:13:30 +0200 Subject: [PATCH 01/10] no point in display the logo because we have a frame. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 8ebb78e..67f06ba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1072,7 +1072,7 @@ void ScreenSaver() { } void RefreshSetupScreen() { - DisplayLogo(); + // DisplayLogo(); DisplayFrame(); DisplayRGB(); DisplayLum(); From 7739ac8cfd42315e5b2c293b9bc1bb45f1213a85 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 24 Apr 2026 22:31:44 +0200 Subject: [PATCH 02/10] For some reason the ESP requires this --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.cpp b/src/main.cpp index 67f06ba..2b40ab4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2297,6 +2297,7 @@ void setup() { switch (ledTest) { case 0: RefreshSetupScreen(); + display->Render(); #ifdef ZEDMD_DEX16 display->DisplayText( "LED", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, From 17cefadce3f04bedc80a19ea0b88f7cdc11a235b Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 24 Apr 2026 22:57:10 +0200 Subject: [PATCH 03/10] WiFi was no longer selectable on the ESP, oops --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 2b40ab4..912fe27 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -354,7 +354,7 @@ static uint8_t NormalizeTransportType(uint8_t type) { #elif defined(ZEDMD_NO_NETWORKING) return Transport::USB; #else - return Transport::USB; + return type <= Transport::WIFI_TCP ? type : Transport::USB; #endif } From 3ebc9e09906a4911b00cba0008bcce5f553aff1a Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 24 Apr 2026 23:32:37 +0200 Subject: [PATCH 04/10] fix screen clearing and packet size text glitching when wifi is selected --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 912fe27..be689c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1094,7 +1094,7 @@ void RefreshSetupScreen() { 7 * (TOTAL_WIDTH / 128) + (16 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); } else if (transport->isWifi()) { - display->DisplayText("UDP Delay:", 7 * (TOTAL_WIDTH / 128), + display->DisplayText("UDP/TCP Delay: ", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); DisplayNumber(transport->getDelay(), 1, 7 * (TOTAL_WIDTH / 128) + 10 * 4, (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); @@ -2296,8 +2296,8 @@ void setup() { ledTest = 3; switch (ledTest) { case 0: + ClearScreen(); RefreshSetupScreen(); - display->Render(); #ifdef ZEDMD_DEX16 display->DisplayText( "LED", TOTAL_WIDTH - (7 * (TOTAL_WIDTH / 128)) - 31, From 9d580914e8bdf9f6b878f91935878c156b6c1085 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 24 Apr 2026 23:46:56 +0200 Subject: [PATCH 05/10] fix delay orientation --- src/main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index be689c8..e855ed9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1096,7 +1096,7 @@ void RefreshSetupScreen() { } else if (transport->isWifi()) { display->DisplayText("UDP/TCP Delay: ", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); - DisplayNumber(transport->getDelay(), 1, 7 * (TOTAL_WIDTH / 128) + 10 * 4, + DisplayNumber(transport->getDelay(), 1, 7 * (TOTAL_WIDTH / 128) + (14 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); } #ifdef DMDREADER @@ -2117,8 +2117,9 @@ void setup() { #else case 4: { // UDP Delay RefreshSetupScreen(); - display->DisplayText("UDP Delay:", 7 * (TOTAL_WIDTH / 128), - TOTAL_HEIGHT / 2 + 4, 255, 191, 0); + display->DisplayText( + "UDP/TCP Delay: ", 7 * (TOTAL_WIDTH / 128), + TOTAL_HEIGHT / 2 + 4, 255, 191, 0); break; } #endif @@ -2234,7 +2235,7 @@ void setup() { --delay > 9) // underflow will result in 255, set it to 9 delay = 9; - DisplayNumber(delay, 1, 7 * (TOTAL_WIDTH / 128) + 10 * 4, + DisplayNumber(delay, 1, 7 * (TOTAL_WIDTH / 128) + (14 * 4), TOTAL_HEIGHT / 2 + 4, 255, 191, 0); transport->setDelay(delay); transport->saveDelay(); From 1cc46a90d7c96a919df38d6d920ecd5330368193 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Fri, 24 Apr 2026 23:59:19 +0200 Subject: [PATCH 06/10] don't extend too far --- src/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e855ed9..9999b76 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2117,9 +2117,8 @@ void setup() { #else case 4: { // UDP Delay RefreshSetupScreen(); - display->DisplayText( - "UDP/TCP Delay: ", 7 * (TOTAL_WIDTH / 128), - TOTAL_HEIGHT / 2 + 4, 255, 191, 0); + display->DisplayText("UDP/TCP Delay:", 7 * (TOTAL_WIDTH / 128), + TOTAL_HEIGHT / 2 + 4, 255, 191, 0); break; } #endif From c506ee4fc2ea778795aa14e94e604b923a9f73b4 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 25 Apr 2026 00:21:29 +0200 Subject: [PATCH 07/10] func comment can be removed now --- src/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 9999b76..4b85308 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1072,7 +1072,6 @@ void ScreenSaver() { } void RefreshSetupScreen() { - // DisplayLogo(); DisplayFrame(); DisplayRGB(); DisplayLum(); From 59f4d1fcf982b1870cf05375f4affcef39699474 Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 25 Apr 2026 11:33:03 +0200 Subject: [PATCH 08/10] fix udp/tcp naming and selectability --- src/main.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 4b85308..25efb8e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1092,10 +1092,11 @@ void RefreshSetupScreen() { DisplayNumber(usbPackageSizeMultiplier * 32, 4, 7 * (TOTAL_WIDTH / 128) + (16 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); - } else if (transport->isWifi()) { - display->DisplayText("UDP/TCP Delay: ", 7 * (TOTAL_WIDTH / 128), + } else if (transport->isWifi() && + transport->getType() == Transport::WIFI_UDP) { + display->DisplayText("UDP Delay: ", 7 * (TOTAL_WIDTH / 128), (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); - DisplayNumber(transport->getDelay(), 1, 7 * (TOTAL_WIDTH / 128) + (14 * 4), + DisplayNumber(transport->getDelay(), 1, 7 * (TOTAL_WIDTH / 128) + (10 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); } #ifdef DMDREADER @@ -2077,6 +2078,8 @@ void setup() { if (position == 4) position = forward ? 5 : 3; } else if (transport->isSpi()) { if (position == 3) position = forward ? 4 : 2; + } else if (transport->getType() == Transport::WIFI_TCP) { + if (position == 4) position = forward ? 5 : 2; } else { if (position == 3) position = forward ? 4 : 2; } @@ -2116,7 +2119,7 @@ void setup() { #else case 4: { // UDP Delay RefreshSetupScreen(); - display->DisplayText("UDP/TCP Delay:", 7 * (TOTAL_WIDTH / 128), + display->DisplayText("UDP Delay:", 7 * (TOTAL_WIDTH / 128), TOTAL_HEIGHT / 2 + 4, 255, 191, 0); break; } @@ -2233,7 +2236,7 @@ void setup() { --delay > 9) // underflow will result in 255, set it to 9 delay = 9; - DisplayNumber(delay, 1, 7 * (TOTAL_WIDTH / 128) + (14 * 4), + DisplayNumber(delay, 1, 7 * (TOTAL_WIDTH / 128) + (10 * 4), TOTAL_HEIGHT / 2 + 4, 255, 191, 0); transport->setDelay(delay); transport->saveDelay(); From b4f025447e5980c51dc88052fa292fd79e131b9d Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 25 Apr 2026 12:25:28 +0200 Subject: [PATCH 09/10] fix menu selection wifi tcp --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 25efb8e..3384089 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2079,7 +2079,7 @@ void setup() { } else if (transport->isSpi()) { if (position == 3) position = forward ? 4 : 2; } else if (transport->getType() == Transport::WIFI_TCP) { - if (position == 4) position = forward ? 5 : 2; + if (position == 4 || position == 3) position = forward ? 5 : 2; } else { if (position == 3) position = forward ? 4 : 2; } From 30f2e2fc88ac158d31a8eec1308d953a5ed680da Mon Sep 17 00:00:00 2001 From: Jan Vos Date: Sat, 25 Apr 2026 12:28:00 +0200 Subject: [PATCH 10/10] wifi tcp shouldn't show udp delay --- src/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 3384089..383f4be 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1098,6 +1098,10 @@ void RefreshSetupScreen() { (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); DisplayNumber(transport->getDelay(), 1, 7 * (TOTAL_WIDTH / 128) + (10 * 4), (TOTAL_HEIGHT / 2) + 4, 255, 191, 0); + } else if (transport->isWifi() && + transport->getType() == Transport::WIFI_TCP) { + display->DisplayText(" ", 7 * (TOTAL_WIDTH / 128), + (TOTAL_HEIGHT / 2) + 4, 128, 128, 128); } #ifdef DMDREADER else if (transport->isSpi()) {