Skip to content

ESP32 Fixes #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkalkbrenner merged 10 commits into from
Apr 25, 2026
Merged

ESP32 Fixes #140

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5afd9a7
no point in display the logo because we have a frame.
PastorL69 Apr 24, 2026
7739ac8
For some reason the ESP requires this
PastorL69 Apr 24, 2026
17cefad
WiFi was no longer selectable on the ESP, oops
PastorL69 Apr 24, 2026
3ebc9e0
fix screen clearing and packet size text glitching when wifi is selected
PastorL69 Apr 24, 2026
9d58091
fix delay orientation
PastorL69 Apr 24, 2026
1cc46a9
don't extend too far
PastorL69 Apr 24, 2026
c506ee4
func comment can be removed now
PastorL69 Apr 24, 2026
59f4d1f
fix udp/tcp naming and selectability
PastorL69 Apr 25, 2026
b4f0254
fix menu selection wifi tcp
PastorL69 Apr 25, 2026
30f2e2f
wifi tcp shouldn't show udp delay
PastorL69 Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -1072,7 +1072,6 @@ void ScreenSaver() {
}

void RefreshSetupScreen() {
DisplayLogo();
DisplayFrame();
DisplayRGB();
DisplayLum();
Expand All @@ -1093,11 +1092,16 @@ 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 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) + 10 * 4,
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()) {
Expand Down Expand Up @@ -2078,6 +2082,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 == 3) position = forward ? 5 : 2;
} else {
if (position == 3) position = forward ? 4 : 2;
}
Expand Down Expand Up @@ -2234,7 +2240,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) + (10 * 4),
TOTAL_HEIGHT / 2 + 4, 255, 191, 0);
transport->setDelay(delay);
transport->saveDelay();
Expand Down Expand Up @@ -2296,6 +2302,7 @@ void setup() {
ledTest = 3;
switch (ledTest) {
case 0:
ClearScreen();
RefreshSetupScreen();
#ifdef ZEDMD_DEX16
display->DisplayText(
Expand Down