RMT Fixes and new platforms

.github/workflows/build.yml

@@ -107,11 +107,20 @@ jobs:
           - target: "esp32_tetra2go"
             chip: "esp32"
           #
+          - target: "esp32_tetra2go_eth"
+            chip: "esp32"
+          #
           - target: "esp32_octa2go"
             chip: "esp32"
           #
+          - target: "esp32_octa2go_eth"
+            chip: "esp32"
+          #
           - target: "esp32_solo2go"
             chip: "esp32"
+          #
+          - target: "esp32_solo2go_eth"
+            chip: "esp32"
           # KR Lights
           - target: "esp32_kr_lights_msm"
             chip: "esp32"

dist/firmware/firmware.json

@@ -1144,6 +1144,41 @@
                 "offset": "0x3B0000"
             }
         },
+        {
+            "name": "ESP32 Tetra2go ETH",
+            "description": "D1 ESP32 based quad controller",
+            "chip": "esp32",
+            "appbin": "esp32/esp32_tetra2go_eth-app.bin",
+            "esptool": {
+                "baudrate": "460800",
+                "options": "--before default_reset --after hard_reset",
+                "flashcmd": "write_flash -z"
+            },
+            "binfiles": [
+                {
+                    "name": "esp32/esp32_tetra2go_eth-bootloader.bin",
+                    "offset": "0x01000"
+                },
+                {
+                    "name": "esp32/esp32_tetra2go_eth-partitions.bin",
+                    "offset": "0x08000"
+                },
+                {
+                    "name": "esp32/boot_app0.bin",
+                    "offset": "0x0e000"
+                },
+                {
+                    "name": "esp32/esp32_tetra2go_eth-app.bin",
+                    "offset": "0x10000"
+                }
+            ],
+            "filesystem": {
+                "page": "256",
+                "block": "4096",
+                "size": "0x50000",
+                "offset": "0x3B0000"
+            }
+        },
         {
             "name": "ESP32 Octa2go",
             "description": "D1 ESP32 based quad controller",
@@ -1180,9 +1215,44 @@
             }
         },
         {
-            "name": "ESP32 Solo2go",
+            "name": "ESP32 Octa2go ETH",
             "description": "D1 ESP32 based quad controller",
             "chip": "esp32",
+            "appbin": "esp32/esp32_octa2go_eth-app.bin",
+            "esptool": {
+                "baudrate": "460800",
+                "options": "--before default_reset --after hard_reset",
+                "flashcmd": "write_flash -z"
+            },
+            "binfiles": [
+                {
+                    "name": "esp32/esp32_octa2go_eth-bootloader.bin",
+                    "offset": "0x01000"
+                },
+                {
+                    "name": "esp32/esp32_octa2go_eth-partitions.bin",
+                    "offset": "0x08000"
+                },
+                {
+                    "name": "esp32/boot_app0.bin",
+                    "offset": "0x0e000"
+                },
+                {
+                    "name": "esp32/esp32_octa2go_eth-app.bin",
+                    "offset": "0x10000"
+                }
+            ],
+            "filesystem": {
+                "page": "256",
+                "block": "4096",
+                "size": "0x50000",
+                "offset": "0x3B0000"
+            }
+        },
+        {
+            "name": "ESP32 Solo2go",
+            "description": "D1 ESP32 based single port controller",
+            "chip": "esp32",
             "appbin": "esp32/esp32_solo2go-app.bin",
             "esptool": {
                 "baudrate": "460800",
@@ -1214,14 +1284,49 @@
                 "offset": "0x3B0000"
             }
         },
+        {
+            "name": "ESP32 Solo2go ETH",
+            "description": "D1 ESP32 based Single Port controller",
+            "chip": "esp32",
+            "appbin": "esp32/esp32_solo2go_eth-app.bin",
+            "esptool": {
+                "baudrate": "460800",
+                "options": "--before default_reset --after hard_reset",
+                "flashcmd": "write_flash -z"
+            },
+            "binfiles": [
+                {
+                    "name": "esp32/esp32_solo2go_eth-bootloader.bin",
+                    "offset": "0x01000"
+                },
+                {
+                    "name": "esp32/esp32_solo2go_eth-partitions.bin",
+                    "offset": "0x08000"
+                },
+                {
+                    "name": "esp32/boot_app0.bin",
+                    "offset": "0x0e000"
+                },
+                {
+                    "name": "esp32/esp32_solo2go_eth-app.bin",
+                    "offset": "0x10000"
+                }
+            ],
+            "filesystem": {
+                "page": "256",
+                "block": "4096",
+                "size": "0x50000",
+                "offset": "0x3B0000"
+            }
+        },
         {
             "name": "ESP32 KR Lights MSM",
             "description": "ESP32 based 5 port controller",
             "chip": "esp32",
             "appbin": "esp32/esp32_kr_lights_msm-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1256,7 +1361,7 @@
             "appbin": "esp32/esp32_ka-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1291,7 +1396,7 @@
             "appbin": "esp32/esp32_ka_4-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1326,7 +1431,7 @@
             "appbin": "esp32/esp32_breakdancev2-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1361,7 +1466,7 @@
             "appbin": "esp32/esp32_relayboardx8-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1396,7 +1501,7 @@
             "appbin": "esp32s3/esp32s3_devkitc-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1431,7 +1536,7 @@
             "appbin": "esp32s3/esp32s3_devkitc_Internal_SD-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [
@@ -1501,7 +1606,7 @@
             "appbin": "esp32/esp32_devkitv_eth-app.bin",
             "esptool": {
                 "baudrate": "460800",
-                "options": "",
+                "options": "--before default_reset --after hard_reset",
                 "flashcmd": "write_flash -z"
             },
             "binfiles": [

include/GPIO_Defs.hpp

@@ -106,10 +106,16 @@
 #   include "platforms/GPIO_Defs_ESP32_ESP3DEUXQuattro_DMX.hpp"
 #elif defined (BOARD_ESP32_OCTA2GO)
 #   include "platforms/GPIO_Defs_ESP32_Octa2go.hpp"
+#elif defined (BOARD_ESP32_OCTA2GO_ETH)
+#   include "platforms/GPIO_Defs_ESP32_Octa2go_ETH.hpp"
 #elif defined (BOARD_ESP32_TETRA2GO)
 #   include "platforms/GPIO_Defs_ESP32_Tetra2go.hpp"
+#elif defined (BOARD_ESP32_TETRA2GO_ETH)
+#   include "platforms/GPIO_Defs_ESP32_Tetra2go_ETH.hpp"
 #elif defined (BOARD_ESP32_SOLO2GO)
 #   include "platforms/GPIO_Defs_ESP32_Solo2go.hpp"
+#elif defined (BOARD_ESP32_SOLO2GO_ETH)
+#   include "platforms/GPIO_Defs_ESP32_Solo2go_ETH.hpp"
 #elif defined (BOARD_ESP32_KR_LIGHTS_MSM)
 #   include "platforms/GPIO_Defs_ESP32_kr_lights_msm.hpp"
 #elif defined (BOARD_ESP32_BREAKDANCEV2)

include/output/OutputMgr.hpp

@@ -58,7 +58,6 @@ class c_OutputMgr
     void      SetConfig         (const char * NewConfig);  ///< Save the current configuration data to nvram
     void      SetConfig         (ArduinoJson::JsonDocument & NewConfig);  ///< Save the current configuration data to nvram
     void      GetStatus         (JsonObject & jsonStatus);
-//    void      GetPortCounts     (uint16_t& PixelCount, uint16_t& SerialCount) {PixelCount = uint16_t(OutputPortId_End); SerialCount = uint16_t(NUM_UARTS); }
     uint8_t*  GetBufferAddress  () { return pOutputBuffer; } ///< Get the address of the buffer into which the E1.31 handler will stuff data
     uint32_t  GetBufferUsedSize () { return UsedBufferSize; } ///< Get the size (in intensities) of the buffer into which the E1.31 handler will stuff data
     uint32_t  GetBufferSize     () { return uint32_t(OM_MAX_NUM_CHANNELS); } ///< Get the size (in intensities) of the buffer into which the E1.31 handler will stuff data
@@ -149,31 +148,10 @@ class c_OutputMgr
     };
     uint32_t NumberOfOutputProtocols = uint32_t(0);
 
-    // must be 16 byte aligned. Determined by upshifting the max size of all drivers
-    // #define OutputDriverMemorySize 1200
-    #define OutputDriverMemorySize 1400
-    uint32_t GetDriverSize() {return OutputDriverMemorySize;}
 private:
-    struct alignas(16) DriverInfo_t
-    {
-        byte                OutputDriver[OutputDriverMemorySize];
-        uint32_t            OutputBufferStartingOffset  = 0;
-        uint32_t            OutputBufferDataSize        = 0;
-        uint32_t            OutputBufferEndOffset       = 0;
-
-        uint32_t            OutputChannelStartingOffset = 0;
-        uint32_t            OutputChannelSize           = 0;
-        uint32_t            OutputChannelEndOffset      = 0;
-
-        OM_OutputPortDefinition_t PortDefinition;
-        uint8_t             DriverId                    = -1;
-        bool                OutputDriverInUse           = false;
-    };
 
     // pointer(s) to the current active output drivers
-    DriverInfo_t   *pOutputChannelDrivers = nullptr;
-    uint8_t         NumOutputPorts = 0;
-    uint32_t        SizeOfTable = 0;
+    uint8_t         NumOutputPorts;
 
     // configuration parameter names for the channel manager within the config file
     #define NO_CONFIG_NEEDED time_t(-1)
@@ -186,11 +164,11 @@ class c_OutputMgr
     bool ProcessJsonConfig (JsonDocument & jsonConfig);
     void CreateJsonConfig  (JsonObject & jsonConfig);
     void UpdateDisplayBufferReferences (void);
-    void InstantiateNewOutputChannel(DriverInfo_t &ChannelIndex, e_OutputProtocolType NewChannelType, bool StartDriver = true);
+    void InstantiateNewOutputChannel(uint32_t PortIndex, e_OutputProtocolType NewChannelType, bool StartDriver = true);
     void CreateNewConfig();
     void SetSerialUart();
     bool FindJsonChannelConfig (JsonDocument& jsonConfig, OM_PortId_t PortId, JsonObject& ChanConfig);
-    bool SetPortDefnitionDefaults(DriverInfo_t & CurrentOutput, e_OutputProtocolType TargetProtocolType);
+    bool SetPortDefnitionDefaults(uint32_t PortIndex, e_OutputProtocolType TargetProtocolType);
 
     String ConfigFileName;