Dig Uno setup, ethernet pins as variables

ewowi · ewowi · commit fee6969d3c9f · 2025-12-05T13:21:20.000+01:00
Back end
========
- Ethernet: compiler directives to variables , explicitly for CONFIG_IDF_TARGET_ESP32S3
- Devices: add delete option
- IO: add SPI pins, add readPins (for ethernet), add jumper1 (switch IR / ethernet for SE16), setup dig uno
- Node manager: on default on
diff --git a/lib/framework/ESP32SvelteKit.cpp b/lib/framework/ESP32SvelteKit.cpp
@@ -81,7 +81,7 @@ void ESP32SvelteKit::begin()
     _wifiSettingsService.initWiFi();
 
     // SvelteKit uses a lot of handlers, so we need to increase the max_uri_handlers
-    // WWWData has 77 Endpoints, Framework has 27, and Lighstate Demo has 4
+    // WWWData has 77->27!! Endpoints, Framework has 27, and each module has 4 // 🌙 updated numbers
     _server->config.max_uri_handlers = _numberEndpoints;
     _server->listen(80);
 
diff --git a/lib/framework/EthernetSettingsService.cpp b/lib/framework/EthernetSettingsService.cpp
@@ -83,17 +83,17 @@ void EthernetSettingsService::configureNetwork(ethernet_settings_t &network)
         ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
     }
 // (re)start ethernet
-#if CONFIG_IDF_TARGET_ESP32
+// 🌙 compiler directives to variables
+#if CONFIG_IDF_TARGET_ESP32S3 
+    if (v_ETH_SPI_SCK != UINT8_MAX) {
+        // For SPI based ethernet modules like W5500, ENC28J60 etc.
+        SPI.begin(v_ETH_SPI_SCK, v_ETH_SPI_MISO, v_ETH_SPI_MOSI);
+        ETH.begin(v_ETH_PHY_TYPE, v_ETH_PHY_ADDR, v_ETH_PHY_CS, v_ETH_PHY_IRQ, v_ETH_PHY_RST, SPI);
+    }
+#elif CONFIG_IDF_TARGET_ESP32P4 // 🌙 todo: setup in P4
+#else // CONFIG_IDF_TARGET_ESP32, what about S2/C3 ...
     // ESP32 chips with built-in ethernet MAC/PHY
     ETH.begin();
-#elif CONFIG_IDF_TARGET_ESP32P4
-    // todo: setup in P4
-#else
-    #ifdef ETH_PHY_TYPE //only if defined
-        // For SPI based ethernet modules like W5500, ENC28J60 etc.
-        SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI);
-        ETH.begin(ETH_PHY_TYPE, ETH_PHY_ADDR, ETH_PHY_CS, ETH_PHY_IRQ, ETH_PHY_RST, SPI);
-    #endif
 #endif
     // set hostname (again) after (re)starting ethernet due to a bug in the ESP-IDF implementation
     ETH.setHostname(_state.hostname.c_str());
diff --git a/lib/framework/EthernetSettingsService.h b/lib/framework/EthernetSettingsService.h
@@ -33,7 +33,7 @@
 
 #define ETHERNET_EVENT_DELAY 500
 
-#define ETHERNET_SETTINGS_FILE "/.config/ethernetSettings.json"
+#define ETHERNET_SETTINGS_FILE "/.config/ethernetSettings.json" // 🌙 MoonLight uses .config (hidden)
 #define ETHERNET_SETTINGS_SERVICE_PATH "/rest/ethernetSettings"
 
 #define EVENT_ETHERNET "ethernet"
@@ -110,6 +110,19 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>
     String getHostname();
     String getIP();
 
+    // 🌙 compiler directives to variables
+    #if CONFIG_IDF_TARGET_ESP32S3 
+        uint8_t v_ETH_SPI_SCK = UINT8_MAX; //42; v_ETH_SPI_SCK is check if configured, see configureNetwork and ModuleIO
+        uint8_t v_ETH_SPI_MISO = 44;
+        uint8_t v_ETH_SPI_MOSI = 43;
+
+        eth_phy_type_t v_ETH_PHY_TYPE = ETH_PHY_W5500; //currently only one supported for S3 ...
+        int32_t v_ETH_PHY_ADDR = 1;
+        int v_ETH_PHY_CS = 41;
+        int v_ETH_PHY_IRQ = 2; // -1 if you won't wire
+        int v_ETH_PHY_RST = 1; // -1 if you won't wire
+    #endif
+
 private:
     PsychicHttpServer *_server;
     SecurityManager *_securityManager;
diff --git a/src/MoonBase/Modules/ModuleDevices.h b/src/MoonBase/Modules/ModuleDevices.h
@@ -33,11 +33,11 @@ class ModuleDevices : public Module {
   void setupDefinition(const JsonArray& controls) override {
     EXT_LOGV(MB_TAG, "");
     JsonObject control;  // state.data has one or more properties
-    JsonArray rows;   // if a control is an array, this is the rows of the array
+    JsonArray rows;      // if a control is an array, this is the rows of the array
 
     control = addControl(controls, "devices", "rows");
     control["filter"] = "";
-    control["crud"] = "r";
+    control["crud"] = "rd";  // delete old devices
     rows = control["n"].to<JsonArray>();
     {
       addControl(rows, "name", "mdnsName", 0, 32, true);
diff --git a/src/MoonBase/Modules/ModuleIO.h b/src/MoonBase/Modules/ModuleIO.h
@@ -10,11 +10,11 @@
 **/
 
 #ifndef ModuleIO_h
-  #define ModuleIO_h
+#define ModuleIO_h
 
-  #if FT_MOONBASE == 1
+#if FT_MOONBASE == 1
 
-    #include "MoonBase/Module.h"
+  #include "MoonBase/Module.h"
 
 enum IO_PinUsage {
   pin_Unused,  // 0
@@ -74,6 +74,11 @@ enum IO_PinUsage {
   pin_Reserved,
   pin_Ethernet,
   pin_Button_OnOff,
+  pin_SPI_SCK,
+  pin_SPI_MISO,
+  pin_SPI_MOSI,
+  pin_PHY_CS,
+  pin_PHY_IRQ,
   pin_count
 };
 
@@ -105,12 +110,14 @@ class ModuleIO : public Module {
     // #if CONFIG_IDF_TARGET_ESP32
     //     pinMode(19, OUTPUT); digitalWrite(19, HIGH); // for serg shield boards: to be done: move to new pin manager module, switch off for S3!!!! tbd: add pin manager
     // #endif
+
+    addUpdateHandler([&](const String& originId) { readPins(sveltekit); }, false);
   }
 
   void setupDefinition(const JsonArray& controls) override {
     EXT_LOGV(MB_TAG, "");
     JsonObject control;  // state.data has one or more controls
-    JsonArray rows;   // if a control is an array, this is the rows of the array
+    JsonArray rows;      // if a control is an array, this is the rows of the array
 
     control = addControl(controls, "boardPreset", "select");
     control["default"] = 0;
@@ -137,6 +144,8 @@ class ModuleIO : public Module {
     control = addControl(controls, "maxPower", "number", 0, 500, false, "Watt");
     control["default"] = 10;
 
+    control = addControl(controls, "jumper1", "checkbox");
+
     control = addControl(controls, "pins", "rows");
     control["filter"] = "!Unused";
     control["crud"] = "ru";
@@ -204,6 +213,11 @@ class ModuleIO : public Module {
       addControlValue(control, "Reserved");
       addControlValue(control, "Ethernet");
       addControlValue(control, "Button On/Off");
+      addControlValue(control, "SPI_SCK");
+      addControlValue(control, "SPI_MISO");
+      addControlValue(control, "SPI_MOSI");
+      addControlValue(control, "PHY_CS");
+      addControlValue(control, "PHY_IRQ");
 
       addControl(rows, "summary", "text", 0, 32, true);  // ro
       // addControl(rows, "Valid", "checkbox", false, true, true);
@@ -241,11 +255,11 @@ class ModuleIO : public Module {
 
       // For RTC GPIOs, can also use RTC-specific read
       int rtc_level = -1;
-    #ifndef CONFIG_IDF_TARGET_ESP32C3
+  #ifndef CONFIG_IDF_TARGET_ESP32C3
       if (is_rtc_gpio) {
         rtc_level = rtc_gpio_get_level((gpio_num_t)gpio_num);  // to do find c3 alternative
       }
-    #endif
+  #endif
 
       // Get drive capability (if output capable)
       gpio_drive_cap_t drive_cap = GPIO_DRIVE_CAP_DEFAULT;
@@ -275,18 +289,35 @@ class ModuleIO : public Module {
       pins[46]["usage"] = pin_Button_OnOff;
       pins[8]["usage"] = pin_Voltage;
       pins[9]["usage"] = pin_Current;
-      pins[5]["usage"] = pin_Infrared;
+
+      if (_state.data["jumper1"]) {
+        pins[5]["usage"] = pin_Infrared;
+      } else {
+        pins[5]["usage"] = pin_SPI_MISO;
+        pins[6]["usage"] = pin_SPI_MOSI;
+        pins[7]["usage"] = pin_SPI_SCK;
+        pins[15]["usage"] = pin_PHY_CS;
+        pins[18]["usage"] = pin_PHY_IRQ;
+      }
+
     } else if (boardID == board_QuinLEDDigUnoV3) {
-      object["maxPower"] = 75;
-      pins[0]["usage"] = pin_Button_01;
-      pins[1]["usage"] = pin_LED_01;
+      // Dig-Uno-V3
+      // esp32-d0 (4MB)
+      // erase flash first
+      // Lolin Wifi fix no -> add as board preset
+      // you might need to reset your router if you first run WLED on the same MCU
+      // remove fuse then flash, Nice !!!
+      object["maxPower"] = 50;  // max 75, but 10A fuse
+      pins[16]["usage"] = pin_LED_01;
       pins[3]["usage"] = pin_LED_02;
-      pins[2]["usage"] = pin_I2S_SD;
-      pins[12]["usage"] = pin_I2S_WS;
-      pins[13]["usage"] = pin_Temperature;
-      pins[15]["usage"] = pin_I2S_SCK;
-      pins[16]["usage"] = pin_LED_03;
-      pins[32]["usage"] = pin_Exposed;
+      pins[0]["usage"] = pin_Button_01;
+      pins[15]["usage"] = pin_Relay;
+      // pins[2]["usage"] = pin_I2S_SD;
+      // pins[12]["usage"] = pin_I2S_WS;
+      // pins[13]["usage"] = pin_Temperature;
+      // pins[15]["usage"] = pin_I2S_SCK;
+      // pins[16]["usage"] = pin_LED_03;
+      // pins[32]["usage"] = pin_Exposed;
     } else if (boardID == board_QuinLEDDigQuadV3) {
       object["maxPower"] = 150;
       uint8_t ledPins[4] = {16, 3, 1, 4};  // LED_PINS
@@ -438,32 +469,49 @@ class ModuleIO : public Module {
   void loop() override {
     // run in sveltekit task
     Module::loop();
+
     if (newBoardID != UINT8_MAX) {
       setBoardPresetDefaults(newBoardID);  // run from sveltekit task
       newBoardID = UINT8_MAX;
     }
   }
-};
 
+  void readPins(ESP32SvelteKit* sveltekit) {
+    EXT_LOGD(MB_TAG, "Try to configure ethernet");
+    EthernetSettingsService* ess = sveltekit->getEthernetSettingsService();
+    if ((uintptr_t)ess < 0x3FC00000) {
+      EXT_LOGW(MB_TAG, "EthernetSettingsService not available");
+      EXT_LOGW(MB_TAG, "ESS PTR = %p\n", (void*)ess);
+      return;
+    }
+  #if CONFIG_IDF_TARGET_ESP32S3
+    ess->v_ETH_SPI_SCK = UINT8_MAX;
+    ess->v_ETH_SPI_MISO = UINT8_MAX;
+    ess->v_ETH_SPI_MOSI = UINT8_MAX;
+    ess->v_ETH_PHY_CS = UINT8_MAX;
+    ess->v_ETH_PHY_IRQ = UINT8_MAX;
+    // if ethernet pins change
+    // find the pins needed
+    for (JsonObject pinObject : _state.data["pins"].as<JsonArray>()) {
+      uint8_t usage = pinObject["usage"];
+      uint8_t gpio  = pinObject["GPIO"];
+      if (usage == pin_SPI_SCK) ess->v_ETH_SPI_SCK = gpio;
+      if (usage == pin_SPI_MISO) ess->v_ETH_SPI_MISO = gpio;
+      if (usage == pin_SPI_MOSI) ess->v_ETH_SPI_MOSI = gpio;
+      if (usage == pin_PHY_CS) ess->v_ETH_PHY_CS = gpio;
+      if (usage == pin_PHY_IRQ) ess->v_ETH_PHY_IRQ = gpio;
+    }
+
+    // allocate the pins found
+    if (ess->v_ETH_SPI_SCK != UINT8_MAX && ess->v_ETH_SPI_MISO != UINT8_MAX && ess->v_ETH_SPI_MOSI != UINT8_MAX && ess->v_ETH_PHY_CS != UINT8_MAX && ess->v_ETH_PHY_IRQ != UINT8_MAX) {
+      // ess->v_ETH_PHY_TYPE = ETH_PHY_W5500;
+      // ess->v_ETH_PHY_ADDR = 1;
+      ess->v_ETH_PHY_RST = -1;  // not wired
+      ess->initEthernet();      // restart ethernet
+    }
   #endif
-#endif
+  }
+};
 
-// format:
-// {
-//   "pins": [
-//     {
-//       "GPIO": 0,
-//       "Valid": true,
-//       "Output": true,
-//       "RTC": true,
-//       "Level": "HIGH",
-//       "DriveCap": "MEDIUM",
-//     },
-//     {
-//       "GPIO": 1,
-//       "Valid": true,
-//       "Output": true,
-//       "RTC": false,
-//       "Level": "HIGH",
-//       "DriveCap": "MEDIUM",
-//     },
+#endif
+#endif
diff --git a/src/MoonBase/NodeManager.h b/src/MoonBase/NodeManager.h
@@ -93,7 +93,8 @@ class NodeManager : public Module {
       // values = control["values"].to<JsonArray>();
       addNodes(control);
 
-      addControl(rows, "on", "checkbox");
+      control = addControl(rows, "on", "checkbox");
+      control["default"] = true;
       control = addControl(rows, "controls", "controls");
       rows = control["n"].to<JsonArray>();
       {
diff --git a/src/MoonLight/Layers/VirtualLayer.cpp b/src/MoonLight/Layers/VirtualLayer.cpp
@@ -369,7 +369,7 @@ void VirtualLayer::drawLine(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, CRGB
     if (depth < 2) {
       x1 = x0;
       y1 = y0;
-    }       // single pixel
+    }  // single pixel
     else {  // shorten line
       x0 *= 2;
       y0 *= 2;                                                 // we do everything "*2" for better rounding
@@ -450,7 +450,7 @@ void VirtualLayer::drawLine3D(uint8_t x1, uint8_t y1, uint8_t z1, uint8_t x2, ui
       x2 = x1;
       y2 = y1;
       z2 = z1;
-    }       // single pixel
+    }  // single pixel
     else {  // shorten line
       x1 *= 2;
       y1 *= 2;

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ class NodeManager : public Module {`
`93`	`93`	`// values = control["values"].to<JsonArray>();`
`94`	`94`	`addNodes(control);`
`95`	`95`
`96`		`- addControl(rows, "on", "checkbox");`
	`96`	`+ control = addControl(rows, "on", "checkbox");`
	`97`	`+ control["default"] = true;`
`97`	`98`	`control = addControl(rows, "controls", "controls");`
`98`	`99`	`rows = control["n"].to<JsonArray>();`
`99`	`100`	`{`