Add defined(CONFIG_IDF_TARGET_ESP32P4) and ETH.begin() for P4/S3 ifnospi

Author: ewowi

lib/framework/EthernetSettingsService.cpp

@@ -84,13 +84,16 @@ void EthernetSettingsService::configureNetwork(ethernet_settings_t &network)
     }
 // (re)start ethernet
 // 🌙 compiler directives to variables
-#if CONFIG_IDF_TARGET_ESP32S3 
+#ifdef 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 
+        ETH.begin();
+#elif defined(CONFIG_IDF_TARGET_ESP32P4)
+    ETH.begin(); // for the time being, todo: setup in P4
 #else // CONFIG_IDF_TARGET_ESP32, what about S2/C3 ...
     // ESP32 chips with built-in ethernet MAC/PHY
     ETH.begin();

lib/framework/EthernetSettingsService.h

@@ -111,7 +111,7 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>
     String getIP();
 
     // 🌙 compiler directives to variables
-    #if CONFIG_IDF_TARGET_ESP32S3 
+    #ifdef 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;

src/MoonBase/Modules/ModuleIO.h

@@ -484,7 +484,7 @@ class ModuleIO : public Module {
       EXT_LOGW(MB_TAG, "ESS PTR = %p\n", (void*)ess);
       return;
     }
-  #if CONFIG_IDF_TARGET_ESP32S3
+  #ifdef 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;

src/MoonBase/Nodes.h

@@ -264,7 +264,7 @@ extern I2SClocklessLedDriver ledsDriver;  // defined in Nodes.cpp
   #else                                   // ESP32_LEDSDRIVER
     #include "ESP32-LedsDriver.h"
     #define MAX_PINS 20  // this is also defined in ESP32-LedsDriver.h...
-    #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
+    #if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32S2)
 static PhysicalDriverESP32S3 ledsDriver;  //    sizeof(driver) = 1080K !
     #elif CONFIG_IDF_TARGET_ESP32
 static PhysicalDriverESP32D0 ledsDriver;  //    sizeof(driver) = 1080K !

src/MoonBase/Utilities.cpp

@@ -103,22 +103,22 @@ bool copyFile(const char* srcPath, const char* dstPath) {
 bool isInPSRAM(void* ptr) {
   if (!psramFound() || !ptr) return false;
   uintptr_t addr = (uintptr_t)ptr;
-#if CONFIG_IDF_TARGET_ESP32
+#if defined(CONFIG_IDF_TARGET_ESP32)
   return (addr >= 0x3F800000 && addr < 0x40000000);
-#elif CONFIG_IDF_TARGET_ESP32S2
+#elif defined(CONFIG_IDF_TARGET_ESP32S2)
   return (addr >= 0x3F500000 && addr < 0x3FF80000);
-#elif CONFIG_IDF_TARGET_ESP32S3
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
   return (addr >= 0x3C000000 && addr < 0x3E000000);
-#elif CONFIG_IDF_TARGET_ESP32C3
+#elif defined(CONFIG_IDF_TARGET_ESP32C3)
   return false;  // ESP32-C3 does not support external PSRAM
-#elif CONFIG_IDF_TARGET_ESP32C6
+#elif defined(CONFIG_IDF_TARGET_ESP32C6)
   return false;  // ESP32-C6 does not support external PSRAM
-#elif CONFIG_IDF_TARGET_ESP32H2
+#elif defined(CONFIG_IDF_TARGET_ESP32H2)
   return false;  // ESP32-H2 does not support external PSRAM
-#elif CONFIG_IDF_TARGET_ESP32P4
+#elif defined(CONFIG_IDF_TARGET_ESP32P4)
   // ESP32-P4 PSRAM mapping (when available)
   return (addr >= 0x80000000 && addr < 0x88000000);
-#elif CONFIG_IDF_TARGET_ESP32C4
+#elif defined(CONFIG_IDF_TARGET_ESP32C4)
   return false;  // ESP32-C4 does not support external PSRAM
 #endif
   EXT_LOGE(MB_TAG, "isInPSRAM not implemented for this target");

src/MoonLight/Nodes/Drivers/D_FastLED.h

@@ -392,7 +392,7 @@ class FastLEDDriver : public Node {
           break;
   #endif  // CONFIG_IDF_TARGET_ESP32S2
 
-  #if CONFIG_IDF_TARGET_ESP32S3
+  #ifdef CONFIG_IDF_TARGET_ESP32S3
         case 0:
           FastLED.addLeds<ML_CHIPSET, 0 COLOR_ORDER_ARG>(leds, startLed, nrOfLights).setCorrection(TypicalLEDStrip) RGBW_CALL;
           break;

src/MoonLight/Nodes/Drivers/D_ParallelLEDDriver.h

@@ -146,7 +146,7 @@ class ParallelLEDDriver : public DriverNode {
         return;
       }
 
-    #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32
+    #if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32)
       int numPins = 0;
       PinConfig pinConfig[MAX_PINS];