Skip to content

Encapsulate wled_server.cpp's own runtime state as static, not global #5780

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
netmindz merged 1 commit into from
Aug 8, 2026
+8 −3
Merged

Encapsulate wled_server.cpp's own runtime state as static, not global #5780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions wled00/wled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,8 +776,7 @@ WLED_GLOBAL byte currentPreset _INIT(0);

WLED_GLOBAL byte errorFlag _INIT(0);

WLED_GLOBAL String messageHead, messageSub;
WLED_GLOBAL byte optionType;
// messageHead/messageSub/optionType are private to wled_server.cpp - see there.

WLED_GLOBAL bool configNeedsWrite _INIT(false); // flag to initiate saving of config
WLED_GLOBAL bool doReboot _INIT(false); // flag to initiate reboot from async handlers
Expand All @@ -797,7 +796,7 @@ WLED_GLOBAL AsyncWebSocket ws _INIT_N((("/ws")));
#ifndef WLED_DISABLE_HUESYNC
WLED_GLOBAL AsyncClient *hueClient _INIT(NULL);
#endif
WLED_GLOBAL AsyncWebHandler *editHandler _INIT(nullptr);
// editHandler is private to wled_server.cpp - see there.

// udp interface objects
WLED_GLOBAL WiFiUDP notifierUdp, rgbUdp, notifier2Udp;
Expand Down
6 changes: 6 additions & 0 deletions wled00/wled_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
// forward declarations
static void createEditHandler();

// Runtime state private to this file - previously WLED_GLOBAL, a leftover from
// when all state lived in one big extern block regardless of who used it.
static AsyncWebHandler *editHandler = nullptr;
static String messageHead, messageSub;
static byte optionType;


// define flash strings once (saves flash memory)
static const char s_redirecting[] PROGMEM = "Redirecting...";
Expand Down
Loading