AP default channel 6 (thx wled), activeAP (also ETH)

ewowi · ewowi · commit 124d1b9eb5ce · 2025-11-27T14:53:27.000+01:00
diff --git a/factory_settings.ini b/factory_settings.ini
@@ -16,7 +16,7 @@ build_flags =
   -D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED
   -D FACTORY_AP_SSID=\"ML-#{unique_id}\" ; 1-64 characters, supports placeholders
   -D FACTORY_AP_PASSWORD=\"\" ; 8-64 characters  ; 🌙 empty no password needed
-  -D FACTORY_AP_CHANNEL=1
+  -D FACTORY_AP_CHANNEL=6 ; // 🌙: See https://github.com/wled/WLED/commit/fc7993f4a7241739d1878df25fd4600100abc506
   -D FACTORY_AP_SSID_HIDDEN=false
   -D FACTORY_AP_MAX_CLIENTS=4
   -D FACTORY_AP_LOCAL_IP=\"4.3.2.1\" ; 🌙
diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef FACTORY_AP_CHANNEL
-#define FACTORY_AP_CHANNEL 1
+#define FACTORY_AP_CHANNEL 6 // 🌙: See https://github.com/wled/WLED/commit/fc7993f4a7241739d1878df25fd4600100abc506
 #endif
 
 #ifndef FACTORY_AP_SSID_HIDDEN
diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
@@ -176,7 +176,7 @@ class FSPersistence
     virtual void applyDefaults()
     {
         JsonDocument jsonDocument;
-        JsonObject jsonObject = jsonDocument.as<JsonObject>();
+        JsonObject jsonObject = jsonDocument.to<JsonObject>(); // 🌙: to instead of as
         _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
     }
 };
diff --git a/src/MoonBase/Module.h b/src/MoonBase/Module.h
@@ -180,16 +180,6 @@ class Module : public StatefulService<ModuleState> {
   EventSocket* _socket;
   void readFromFS() {             // used in ModuleEffects, for live scripts...
     _fsPersistence.readFromFS();  // overwrites the default settings in state
-    // sizeof(StatefulService<ModuleState>);  // 200
-    // sizeof(_server);                       // 8
-    // sizeof(HttpEndpoint<ModuleState>);     // 152
-    //   sizeof(EventEndpoint<ModuleState>);    // 112
-    //   sizeof(WebSocketServer<ModuleState>);  // 488
-    //   sizeof(FSPersistence<ModuleState>);    // 128
-    //   sizeof(PsychicHttpServer*);            // 8
-    //   sizeof(HttpEndpoint<APSettings>);      // 152
-    //   sizeof(FSPersistence<APSettings>);     // 128
-    //   sizeof(Module);                        // 1144
   }
 
  private:
diff --git a/src/MoonBase/Modules/ModuleDevices.h b/src/MoonBase/Modules/ModuleDevices.h
@@ -127,9 +127,10 @@ class ModuleDevices : public Module {
       message.name = esp32sveltekit.getWiFiSettingsService()->getHostname().c_str();
       deviceUDP.write((uint8_t*)&message, sizeof(message));
       deviceUDP.endPacket();
-      // EXT_LOGD(MB_TAG, "UDP packet written (%s -> %d)", message.name.c_str(), WiFi.localIP()[3]);
 
-      updateDevices(message.name.c_str(), WiFi.localIP());
+      IPAddress activeIP = WiFi.localIP() ? WiFi.localIP() : ETH.localIP();
+      // EXT_LOGD(MB_TAG, "UDP packet written (%s -> %d)", message.name.c_str(), activeIP[3]);
+      updateDevices(message.name.c_str(), activeIP);
     }
   }
 };
diff --git a/src/MoonBase/Modules/ModuleTasks.h b/src/MoonBase/Modules/ModuleTasks.h
@@ -96,7 +96,7 @@ class ModuleTasks : public Module {
       }
 
       Char<32> summary;
-      summary.format("%s %d%% @ P%d", state, 100 * ts->ulRunTimeCounter / totalRunTime, ts->uxCurrentPriority);
+      summary.format("%s %d%% @ P%d", state, (uint32_t)(100ULL * ts->ulRunTimeCounter / totalRunTime), ts->uxCurrentPriority);
 
       task["name"] = ts->pcTaskName;
       task["summary"] = summary.c_str();
diff --git a/src/MoonBase/SharedEventEndpoint.h b/src/MoonBase/SharedEventEndpoint.h
@@ -1,4 +1,14 @@
-// src/MoonBase/SharedEventEndpoint.h
+/**
+    @title     MoonBase
+    @file      SharedEventEndpoint.h
+    @repo      https://github.com/MoonModules/MoonLight, submit changes to this file as PRs
+    @Authors   https://github.com/MoonModules/MoonLight/commits/main
+    @Doc       https://moonmodules.org/MoonLight/moonbase/overview/
+    @Copyright © 2025 Github MoonLight Commit Authors
+    @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+    @license   For non GPL-v3 usage, commercial licenses must be purchased. Contact us for more information.
+**/
+
 #ifndef SharedEventEndpoint_h
 #define SharedEventEndpoint_h
 
diff --git a/src/MoonBase/SharedFSPersistence.h b/src/MoonBase/SharedFSPersistence.h
@@ -1,4 +1,14 @@
-// src/MoonBase/SharedFSPersistence.h
+/**
+    @title     MoonBase
+    @file      SharedFSPersistence.h
+    @repo      https://github.com/MoonModules/MoonLight, submit changes to this file as PRs
+    @Authors   https://github.com/MoonModules/MoonLight/commits/main
+    @Doc       https://moonmodules.org/MoonLight/moonbase/overview/
+    @Copyright © 2025 Github MoonLight Commit Authors
+    @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+    @license   For non GPL-v3 usage, commercial licenses must be purchased. Contact us for more information.
+**/
+
 #ifndef SharedFSPersistence_h
 #define SharedFSPersistence_h
 
@@ -60,7 +70,7 @@ class SharedFSPersistence {
   void enableUpdateHandler(const String& moduleName) {
     auto it = _modules.find(moduleName);
     if (it != _modules.end() && !it->second.updateHandlerId) {
-      it->second.updateHandlerId = it->second.module->addUpdateHandler([this, moduleName](const String& originId) { writeToFS(moduleName); }, false);
+      it->second.updateHandlerId = it->second.module->addUpdateHandler([this, module = it->second.module](const String& originId) { writeToFS(module->_moduleName); }, false);
     }
   }
 
diff --git a/src/MoonBase/SharedHttpEndpoint.h b/src/MoonBase/SharedHttpEndpoint.h
@@ -1,4 +1,14 @@
-// In a new file: lib/framework/SharedHttpEndpoint.h
+/**
+    @title     MoonBase
+    @file      SharedHttpEndpoint.h
+    @repo      https://github.com/MoonModules/MoonLight, submit changes to this file as PRs
+    @Authors   https://github.com/MoonModules/MoonLight/commits/main
+    @Doc       https://moonmodules.org/MoonLight/moonbase/overview/
+    @Copyright © 2025 Github MoonLight Commit Authors
+    @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+    @license   For non GPL-v3 usage, commercial licenses must be purchased. Contact us for more information.
+**/
+
 #ifndef SharedHttpEndpoint_h
 #define SharedHttpEndpoint_h
 
diff --git a/src/MoonBase/SharedWebSocketServer.h b/src/MoonBase/SharedWebSocketServer.h
@@ -1,4 +1,14 @@
-// In lib/framework/SharedWebSocketServer.h
+/**
+    @title     MoonBase
+    @file      SharedWebSocketServer.h
+    @repo      https://github.com/MoonModules/MoonLight, submit changes to this file as PRs
+    @Authors   https://github.com/MoonModules/MoonLight/commits/main
+    @Doc       https://moonmodules.org/MoonLight/moonbase/overview/
+    @Copyright © 2025 Github MoonLight Commit Authors
+    @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+    @license   For non GPL-v3 usage, commercial licenses must be purchased. Contact us for more information.
+**/
+
 #ifndef SharedWebSocketServer_h
 #define SharedWebSocketServer_h
 
diff --git a/src/MoonLight/Nodes/Drivers/D_ArtnetIn.h b/src/MoonLight/Nodes/Drivers/D_ArtnetIn.h
@@ -47,7 +47,7 @@ class ArtNetInDriver : public Node {
     }
   }
 
-  void onUpdate(const Char<20>& oldValue, const JsonObject control) {
+  void onUpdate(const Char<20>& oldValue, const JsonObject control) override {
     // add your custom onUpdate code here
     if (control["name"] == "ddp") {
       if (control["value"] == 0) {
diff --git a/src/MoonLight/Nodes/Drivers/D_ArtnetOut.h b/src/MoonLight/Nodes/Drivers/D_ArtnetOut.h
@@ -84,7 +84,8 @@ class ArtNetOutDriver : public DriverNode {
     LightsHeader* header = &layer->layerP->lights.header;
 
     // continue with Art-Net code
-    controllerIP = WiFi.localIP();
+    IPAddress activeIP = WiFi.localIP() ? WiFi.localIP() : ETH.localIP();
+    controllerIP = activeIP;
     controllerIP[3] = controllerIP3;
     if (!controllerIP) return;
 
diff --git a/src/MoonLight/Nodes/Effects/E_MoonLight.h b/src/MoonLight/Nodes/Effects/E_MoonLight.h
@@ -261,12 +261,13 @@ class ScrollingTextEffect : public Node {
         choice = (millis() / 1000 % 9) + 1;
     }
 
+    IPAddress activeIP = WiFi.localIP() ? WiFi.localIP() : ETH.localIP();
     switch (choice) {
     case 1:
       text.format("%s", textIn);
       break;
     case 2:
-      text.format(".%d", WiFi.localIP()[3]);
+      text.format(".%d", activeIP[3]);
       break;
     case 3:
       text.format("%ds", sharedData.fps);

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ class FSPersistence`
`176`	`176`	`virtual void applyDefaults()`
`177`	`177`	`{`
`178`	`178`	`JsonDocument jsonDocument;`
`179`		`- JsonObject jsonObject = jsonDocument.as<JsonObject>();`
	`179`	`+ JsonObject jsonObject = jsonDocument.to<JsonObject>(); // 🌙: to instead of as`
`180`	`180`	`_statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);`
`181`	`181`	`}`
`182`	`182`	`};`
Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,10 @@ class ModuleDevices : public Module {`
`127`	`127`	`message.name = esp32sveltekit.getWiFiSettingsService()->getHostname().c_str();`
`128`	`128`	`deviceUDP.write((uint8_t*)&message, sizeof(message));`
`129`	`129`	`deviceUDP.endPacket();`
`130`		`- // EXT_LOGD(MB_TAG, "UDP packet written (%s -> %d)", message.name.c_str(), WiFi.localIP()[3]);`
`131`	`130`
`132`		`- updateDevices(message.name.c_str(), WiFi.localIP());`
	`131`	`+ IPAddress activeIP = WiFi.localIP() ? WiFi.localIP() : ETH.localIP();`
	`132`	`+ // EXT_LOGD(MB_TAG, "UDP packet written (%s -> %d)", message.name.c_str(), activeIP[3]);`
	`133`	`+ updateDevices(message.name.c_str(), activeIP);`
`133`	`134`	`}`
`134`	`135`	`}`
`135`	`136`	`};`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class ModuleTasks : public Module {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`Char<32> summary;`
`99`		`- summary.format("%s %d%% @ P%d", state, 100 * ts->ulRunTimeCounter / totalRunTime, ts->uxCurrentPriority);`
	`99`	`+ summary.format("%s %d%% @ P%d", state, (uint32_t)(100ULL * ts->ulRunTimeCounter / totalRunTime), ts->uxCurrentPriority);`
`100`	`100`
`101`	`101`	`task["name"] = ts->pcTaskName;`
`102`	`102`	`task["summary"] = summary.c_str();`