0.8.135

* translated `/system` #1717
* added default pin seetings for opendtufusion board
* fixed ethernet static IP
* fixed ethernet MAC address read back

Author: lumapu

src/CHANGES.md

@@ -2,6 +2,9 @@
 
 ## 0.8.135 - 2024-08-11
 * translated `/system` #1717
+* added default pin seetings for opendtufusion board
+* fixed ethernet static IP
+* fixed ethernet MAC address read back
 
 ## 0.8.134 - 2024-08-10
 * combined Ethernet and WiFi variants - Ethernet is now always included, but needs to be enabled if needed

src/network/AhoyEthernet.h

@@ -22,7 +22,7 @@ class AhoyEthernet : public AhoyWifi {
         };
 
     public:
-        void begin() override {
+        virtual void begin() override {
             mMode = Mode::WIRELESS;
             mAp.enable();
             AhoyWifi::begin();
@@ -34,31 +34,32 @@ class AhoyEthernet : public AhoyWifi {
             ETH.setHostname(mConfig->sys.deviceName);
         }
 
-        String getIp(void) {
+        virtual String getIp(void) override {
             if(Mode::WIRELESS == mMode)
                 return AhoyWifi::getIp();
             else
                 return ETH.localIP().toString();
         }
 
-        String getMac(void) {
+        virtual String getMac(void) override {
             if(Mode::WIRELESS == mMode)
                 return AhoyWifi::getMac();
             else
-                return ETH.macAddress();
+                return mEthSpi.macAddress();
         }
 
-        bool isWiredConnection() {
+        virtual bool isWiredConnection() override {
             return (Mode::WIRED == mMode);
         }
 
     private:
-        void OnEvent(WiFiEvent_t event) {
+        virtual void OnEvent(WiFiEvent_t event) override {
             switch(event) {
+                case ARDUINO_EVENT_ETH_CONNECTED:
+                    mMode = Mode::WIRED; // needed for static IP
+                    [[fallthrough]];
                 case SYSTEM_EVENT_STA_CONNECTED:
                     mWifiConnecting = false;
-                    [[fallthrough]];
-                case ARDUINO_EVENT_ETH_CONNECTED:
                     if(NetworkState::CONNECTED != mStatus) {
                         if(ARDUINO_EVENT_ETH_CONNECTED == event)
                             WiFi.disconnect();

src/network/AhoyEthernetSpi.h

@@ -116,10 +116,14 @@ class AhoyEthernetSpi {
         }
 
         String macAddress() {
-            uint8_t mac_addr[6] = {0, 0, 0, 0, 0, 0};
+            uint8_t mac_addr[6];
             esp_eth_ioctl(eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr);
-            char mac_addr_str[24];
-            snprintf(mac_addr_str, sizeof(mac_addr_str), "%02X:%02X:%02X:%02X:%02X:%02X", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
+            char mac_addr_str[19];
+            for(uint8_t i = 0; i < 6; i++) {
+                snprintf(&mac_addr_str[i*3], sizeof(mac_addr_str), "%02X", mac_addr[i]);
+                mac_addr_str[i*3+2] = ':';
+            }
+            mac_addr_str[17] = '\0';
             return String(mac_addr_str);
         }
 

src/network/AhoyWifiEsp32.h

@@ -41,11 +41,11 @@ class AhoyWifi : public AhoyNetwork {
                 mAp.tickLoop();
         }
 
-        String getIp(void) override {
+        virtual String getIp(void) override {
             return WiFi.localIP().toString();
         }
 
-        String getMac(void) override {
+        virtual String getMac(void) override {
             return WiFi.macAddress();
         }
 

src/web/html/setup.html

@@ -457,11 +457,11 @@
                 [1,  "GPIO1"],
                 [2,  "GPIO2"],
                 [3,  "GPIO3"],
-                [4,  "GPIO4"],
-                [5,  "GPIO5"],
-                [6,  "GPIO6"],
+                [4,  "GPIO4 (CMT CSB)"],
+                [5,  "GPIO5 (CMT SDIO)"],
+                [6,  "GPIO6 (CMT SCLK)"],
                 [7,  "GPIO7"],
-                [8,  "GPIO8"],
+                [8,  "GPIO8 (CMT GPIO3)"],
                 [9,  "GPIO9 (DATA display)"],
                 [10, "GPIO10 (SCK display)"],
                 [11, "GPIO11 (CS display)"],
@@ -474,7 +474,7 @@
                 [18, "GPIO18"],
                 [19, "GPIO19 ({#PIN_DONT_USE} - USB-)"],
                 [20, "GPIO20 ({#PIN_DONT_USE} - USB+)"],
-                [21, "GPIO21"],
+                [21, "GPIO21 (CMT FCSB)"],
                 [26, "GPIO26 (PSRAM - {#PIN_NOT_AVAIL})"],
                 [27, "GPIO27 (FLASH - {#PIN_NOT_AVAIL})"],
                 [28, "GPIO28 (FLASH - {#PIN_NOT_AVAIL})"],