MoonModules · troyhacks · Jan 15, 2026 · Jan 15, 2026 · Jan 15, 2026 · Jan 15, 2026
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -2,6 +2,7 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
+        "pioarduino.pioarduino-ide",
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [

diff --git a/package.json b/package.json
@@ -31,4 +31,4 @@
   "engines": {
     "node": ">=20.0.0"
   }
-}
+}
diff --git a/platformio.ini b/platformio.ini
@@ -115,6 +115,7 @@ default_envs =
   abc_wled_controller_v43_V4_S
   athom_music_esp32_4MB_V4_M
   adafruit_matrixportal_esp32s3  ;;  HUB75 supported, uses standard bootloader
+  WaveShare_ESP32-S3-ETH         ;;  Easiest ESP32-S3 with W5500 Ethernet and USB-C for programming
   ; adafruit_matrixportal_esp32s3_tinyUF2 ;;  supports the adafruit "tinyUF2" bootloader
 
 ; Go to MoonModules environments for environments
@@ -263,6 +264,7 @@ lib_deps =
     https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.4.2
     bitbank2/AnimatedGIF@^1.4.7
     https://github.com/Aircoookie/GifDecoder.git#bc3af189b6b1e06946569f6b4287f0b79a860f8e
+    https://github.com/troyhacks/ETHClass2.git#ff08486701faebd497b1d429233abcf222a91df1
   #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
     #TFT_eSPI
   #For compatible OLED display uncomment following
@@ -326,6 +328,7 @@ lib_deps =
   ${esp8266.lib8266_deps}           ;; use proven library versions for 8266
 lib_ignore =
    NeoESP32RmtHI
+   ETHClass2
 
 ;; compatibilty flags - same as 0.14.0 which seems to work better on some 8266 boards. Not using PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48
 build_flags_compat =
@@ -375,6 +378,7 @@ lib_deps =
   ${env.lib_deps}
 lib_ignore =
    NeoESP32RmtHI
+   ETHClass2
 monitor_filters = esp32_exception_decoder
 board_build.partitions = ${esp32.default_partitions}      ;; default partioning for 4MB Flash - can be overridden in build envs
 default_partitions = ${esp32.default_partitions}          ;; backwards compatibility
@@ -412,21 +416,25 @@ board_build.flash_mode = dio
 ;; WLEDMM begin
 
 ;; tasmota platform - reduces firmaware size by ~280KB
-platformTasmota = https://github.com/tasmota/platform-espressif32/releases/download/2023.06.02/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.9 with IPv6 support, based on IDF 4.4.4
-platform_packagesTasmota =
+platformTasmota = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.00/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.15 with IPv6 support, based on IDF 4.4.7
+platform_packagesTasmota = framework-arduinoespressif32 @ https://github.com/troyhacks/troymota.git#2b97d2e77632d1bb9ac646f62f3db45f091591e5
 
 ;; ** For compiling with latest Frameworks (IDF4.4.x and arduino-esp32 v2.0.x) **
 ;;; previous standard V4 platform
 platformV4_pre = espressif32@5.2.0
 platformV4_packages_pre =
   toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to platform >=5.3.0
 ;;; standard V4 platform
-platformV4 = espressif32@ ~6.3.2
-platformV4_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+; platformV4 = espressif32@ ~6.3.2
+; platformV4_packages = platformio/framework-arduinoespressif32 @ 3.20011.230801    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
+platformV4 = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.00/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.15 with IPv6 support, based on IDF 4.4.7
+platformV4_packages = framework-arduinoespressif32 @ https://github.com/troyhacks/troymota.git#2b97d2e77632d1bb9ac646f62f3db45f091591e5
 
 ;;; experimental: latest V4 platform with latest arduino-esp32 2.0.14 + ESP-IDF 4.4.6 (may or may not work)
-platformV4_xp = espressif32@ ~6.5.0
-platformV4_packages_xp = platformio/framework-arduinoespressif32 @ 3.20014.231204 ;; arduino-esp32 2.0.14
+; platformV4_xp = espressif32@ ~6.5.0
+; platformV4_packages_xp = platformio/framework-arduinoespressif32 @ 3.20014.231204 ;; arduino-esp32 2.0.14
+platformV4_xp = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.00/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.15 with IPv6 support, based on IDF 4.4.7
+platformV4_packages_xp = framework-arduinoespressif32 @ https://github.com/troyhacks/troymota.git#2b97d2e77632d1bb9ac646f62f3db45f091591e5
 
 build_flagsV4 = -g
   -DARDUINO_ARCH_ESP32 -DESP32
@@ -438,7 +446,8 @@ build_flagsV4 = -g
   ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
   ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
   -D NO_GFX ; Disable the use of Adafruit_GFX by the HUB75 driver
-
+  -D BOARD_HAS_PSRAM
+  -D WLED_USE_ETHERNET
 ;;; V4.4.x libraries (without LOROL_LITTLEFS; with newer NeoPixelBus)
 lib_depsV4 =
   esp32async/AsyncTCP @ 3.4.7
@@ -458,12 +467,14 @@ lib_depsV4 =
 ;; platform = espressif32@ ~6.3.2
 ;; platform_packages = platformio/framework-arduinoespressif32 @ 3.20009.0    ;; select arduino-esp32 v2.0.9 (arduino-esp32 2.0.10 thru 2.0.14 are buggy so avoid them)
 
-;; Tasmota Arduino Core 2.0.9 with IPv6 support, based on IDF 4.4.4.  Warning: all kernel error asserts removed
+;; Tasmota Arduino Core 2.0.9 with IPv6 support, based on IDF 4.4.7.  Warning: all kernel error asserts removed
 platform = ${esp32.platformTasmota}
 platform_packages = ${esp32.platform_packagesTasmota}
 
 build_unflags = ${common.build_unflags}
 build_flags = -g
+  -D BOARD_HAS_PSRAM
+  -D WLED_USE_ETHERNET
   -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
   -DARDUINO_ARCH_ESP32 -DESP32
   #-DCONFIG_LITTLEFS_FOR_IDF_3_2
@@ -473,6 +484,8 @@ build_flags = -g
   -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
   ; -D WLEDMM_TWOPATH  ;; use I2S1 as the second bus --> slightly faster on some setups
   ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
+  -D BOARD_HAS_PSRAM
+  -D WLED_USE_ETHERNET
 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
 lib_deps =
   esp32async/AsyncTCP @ 3.4.7
@@ -511,7 +524,8 @@ build_flags = -g
   ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
   ;; ARDUINO_USB_CDC_ON_BOOT
   ; -D WLED_USE_SHARED_RMT ;; un-comment to use the standard RMT driver instead of RMTHI
-
+    -D BOARD_HAS_PSRAM
+  -D WLED_USE_ETHERNET
 lib_deps =
   esp32async/AsyncTCP @ 3.4.7
   makuna/NeoPixelBus @ 2.7.9 ;; experimental - reduces LED glitches on -S2
@@ -538,7 +552,8 @@ build_flags = -g
   ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
   ;; ARDUINO_USB_CDC_ON_BOOT
   -D WLED_USE_SHARED_RMT                           ;; don't use the RMTHI driver (not compatible with -C3)
-
+  -D BOARD_HAS_PSRAM
+  -D WLED_USE_ETHERNET
 lib_deps =
   esp32async/AsyncTCP @ 3.4.7
   makuna/NeoPixelBus @ 2.7.9 ;; experimental
@@ -569,6 +584,8 @@ build_flags = -g
   ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
   ;; ARDUINO_USB_MODE, ARDUINO_USB_CDC_ON_BOOT
   ;-D WLED_USE_SHARED_RMT ;; un-comment to use the standard RMT driver instead of RMTHI
+    -D BOARD_HAS_PSRAM
+  -D WLED_USE_ETHERNET
 lib_deps =
   esp32async/AsyncTCP @ 3.4.7
   makuna/NeoPixelBus @ 2.7.9 ;; experimental
@@ -1199,6 +1216,8 @@ DMXin_lib_deps = https://github.com/someweisguy/esp_dmx.git#47db25d8c515e76fabcf
 DMXin_lib_ignore = esp_dmx ;; to remove the esp-dmx lib dependancy (saves a few bytes)
 
 HUB75_build_flags =
+  -Wno-shadow ;; Shush, you.
+  -Wno-parentheses ;; Shush, you.
   -D WLED_ENABLE_HUB75MATRIX ;; - requires ESP-IDF v4.4.x
    ;-D SPIRAM_FRAMEBUFFER ;; ONLY SUPPORTED ON ESP32-S3 VARIANTS WITH OCTAL (not quad) SPIRAM/PSRAM
   -D NO_GFX ;; Disable the use of Adafruit_GFX by the HUB75 driver
@@ -3313,3 +3332,12 @@ build_flags = ${env:adafruit_matrixportal_esp32s3_wled.build_flags}
 [env:adafruit_matrixportal_esp32s3]
 ;; this buildenv is just an alias for the matrixportal UF2 build, to keep 3rd party build tools happy.
 extends = env:adafruit_matrixportal_esp32s3_wled
+
+[env:WaveShare_ESP32-S3-ETH]
+;; This is the easiest-to-use W5500 board as it has USB-C for programming
+extends = env:esp32S3_16MB_PSRAM_M_HUB75
+build_unflags = -D LEDPIN=14 -D BTNPIN=0 -D RLYPIN=15 -D I2S_SDPIN=10 -D I2S_CKPIN=11 -D I2S_WSPIN=12 -D ARDUINO_TTGO_T7_S3
+build_flags = ${env:esp32S3_16MB_PSRAM_M_HUB75.build_flags}
+              -D WLED_USE_ETHERNET
+              -D WLED_ETH_DEFAULT=16
+              -D LEDPIN=2 -D BTNPIN=-1 -D RLYPIN=-1
diff --git a/usermods/Animated_Staircase/Animated_Staircase.h b/usermods/Animated_Staircase/Animated_Staircase.h
@@ -331,6 +331,23 @@ class Animated_Staircase : public Usermod {
       if (topEchoPin            < 0) topEchoPin            = -1;
       if (bottomPIRorTriggerPin < 0) bottomPIRorTriggerPin = -1;
       if (bottomEchoPin         < 0) bottomEchoPin         = -1;
+      // Validate pins before attempting allocation to prevent conflicts with Ethernet, etc.
+      if (topPIRorTriggerPin >= 0 && (!pinManager.isPinOk(topPIRorTriggerPin, useUSSensorTop) || pinManager.isPinAllocated(topPIRorTriggerPin))) {
+        DEBUG_PRINTLN(F("Animated Staircase: top trigger pin invalid or in use."));
+        topPIRorTriggerPin = -1;
+      }
+      if (topEchoPin >= 0 && (!pinManager.isPinOk(topEchoPin, false) || pinManager.isPinAllocated(topEchoPin))) {
+        DEBUG_PRINTLN(F("Animated Staircase: top echo pin invalid or in use."));
+        topEchoPin = -1;
+      }
+      if (bottomPIRorTriggerPin >= 0 && (!pinManager.isPinOk(bottomPIRorTriggerPin, useUSSensorBottom) || pinManager.isPinAllocated(bottomPIRorTriggerPin))) {
+        DEBUG_PRINTLN(F("Animated Staircase: bottom trigger pin invalid or in use."));
+        bottomPIRorTriggerPin = -1;
+      }
+      if (bottomEchoPin >= 0 && (!pinManager.isPinOk(bottomEchoPin, false) || pinManager.isPinAllocated(bottomEchoPin))) {
+        DEBUG_PRINTLN(F("Animated Staircase: bottom echo pin invalid or in use."));
+        bottomEchoPin = -1;
+      }
       // allocate pins
       PinManagerPinType pins[4] = {
         { topPIRorTriggerPin, useUSSensorTop },

diff --git a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h b/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
@@ -256,15 +256,25 @@ class PIRsensorSwitch : public Usermod
   {
     if (enabled) {
       // pin retrieved from cfg.json (readFromConfig()) prior to running setup()
-      if (PIRsensorPin >= 0 && pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
+      // Validate pin before attempting allocation to prevent conflicts with Ethernet, etc.
+      if (PIRsensorPin < 0) {
+        DEBUG_PRINTLN(F("PIRSensorSwitch: no pin configured."));
+        enabled = false;
+      } else if (!pinManager.isPinOk(PIRsensorPin, false)) {
+        DEBUG_PRINTLN(F("PIRSensorSwitch: pin not valid for this board."));
+        PIRsensorPin = -1;
+        enabled = false;
+      } else if (pinManager.isPinAllocated(PIRsensorPin)) {
+        DEBUG_PRINTF("PIRSensorSwitch: pin %d already in use by %s.\n", PIRsensorPin, pinManager.getPinOwnerText(PIRsensorPin));
+        PIRsensorPin = -1;
+        enabled = false;
+      } else if (pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
         // PIR Sensor mode INPUT_PULLUP
         pinMode(PIRsensorPin, INPUT_PULLUP);
         sensorPinState = digitalRead(PIRsensorPin);
       } else {
-        if (PIRsensorPin >= 0) {
-          DEBUG_PRINTLN(F("PIRSensorSwitch pin allocation failed."));
-        }
-        PIRsensorPin = -1;  // allocation failed
+        DEBUG_PRINTLN(F("PIRSensorSwitch pin allocation failed."));
+        PIRsensorPin = -1;
         enabled = false;
       }
     }
@@ -455,6 +465,11 @@ class PIRsensorSwitch : public Usermod
     }
 
     PIRsensorPin = top["pin"] | PIRsensorPin;
+    // Early validation - reject obviously invalid pins
+    if (PIRsensorPin >= 0 && !pinManager.isPinOk(PIRsensorPin, false)) {
+      DEBUG_PRINTLN(F("PIRSensorSwitch: configured pin is not valid for this board."));
+      PIRsensorPin = -1;
+    }
 
     enabled = top[FPSTR(_enabled)] | enabled;
 
@@ -482,15 +497,18 @@ class PIRsensorSwitch : public Usermod
           // if we are changing pin in settings page
           // deallocate old pin
           pinManager.deallocatePin(oldPin, PinOwner::UM_PIR);
-          if (pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
+          // Validate new pin before allocation
+          if (PIRsensorPin >= 0 && pinManager.isPinOk(PIRsensorPin, false) &&
+              !pinManager.isPinAllocated(PIRsensorPin) &&
+              pinManager.allocatePin(PIRsensorPin, false, PinOwner::UM_PIR)) {
             pinMode(PIRsensorPin, INPUT_PULLUP);
           } else {
             // allocation failed
             PIRsensorPin = -1;
             enabled = false;
           }
         }
-        if (enabled) {
+        if (enabled && PIRsensorPin >= 0) {
           sensorPinState = digitalRead(PIRsensorPin);
         }
       }

diff --git a/usermods/PWM_fan/usermod_PWM_fan.h b/usermods/PWM_fan/usermod_PWM_fan.h
@@ -68,7 +68,21 @@ class PWMFanUsermod : public Usermod {
     static const char _lock[];
 
     void initTacho(void) {
-      if (tachoPin < 0 || !pinManager.allocatePin(tachoPin, false, PinOwner::UM_Unspecified)){
+      if (tachoPin < 0) {
+        return;
+      }
+      // Validate pin before attempting allocation to prevent conflicts with Ethernet, etc.
+      if (!pinManager.isPinOk(tachoPin, false)) {
+        DEBUG_PRINTLN(F("PWM-fan: tacho pin not valid for this board."));
+        tachoPin = -1;
+        return;
+      }
+      if (pinManager.isPinAllocated(tachoPin)) {
+        DEBUG_PRINTF("PWM-fan: tacho pin %d already in use.\n", tachoPin);
+        tachoPin = -1;
+        return;
+      }
+      if (!pinManager.allocatePin(tachoPin, false, PinOwner::UM_Unspecified)){
         tachoPin = -1;
         return;
       }
@@ -104,7 +118,28 @@ class PWMFanUsermod : public Usermod {
 
     // https://randomnerdtutorials.com/esp32-pwm-arduino-ide/
     void initPWMfan(void) {
-      if (pwmPin < 0 || !pinManager.allocatePin(pwmPin, true, PinOwner::UM_Unspecified)) {
+      if (pwmPin < 0) {
+        deinitTacho();
+        enabled = false;
+        return;
+      }
+      // Validate pin before attempting allocation to prevent conflicts with Ethernet, etc.
+      if (!pinManager.isPinOk(pwmPin, true)) {
+        DEBUG_PRINTLN(F("PWM-fan: PWM pin not valid for this board."));
+        deinitTacho();
+        enabled = false;
+        pwmPin = -1;
+        return;
+      }
+      if (pinManager.isPinAllocated(pwmPin)) {
+        DEBUG_PRINTF("PWM-fan: PWM pin %d already in use.\n", pwmPin);
+        deinitTacho();
+        enabled = false;
+        pwmPin = -1;
+        return;
+      }
+      if (!pinManager.allocatePin(pwmPin, true, PinOwner::UM_Unspecified)) {
+        deinitTacho();
         enabled = false;
         pwmPin = -1;
         return;
@@ -344,6 +379,9 @@ class PWMFanUsermod : public Usermod {
       enabled           = top[FPSTR(_enabled)] | enabled;
       newTachoPin       = top[FPSTR(_tachoPin)] | newTachoPin;
       newPwmPin         = top[FPSTR(_pwmPin)] | newPwmPin;
+      // Early validation - reject obviously invalid pins
+      if (newTachoPin >= 0 && !pinManager.isPinOk(newTachoPin, false)) newTachoPin = -1;
+      if (newPwmPin >= 0 && !pinManager.isPinOk(newPwmPin, true)) newPwmPin = -1;
       tachoUpdateSec    = top[FPSTR(_tachoUpdateSec)] | tachoUpdateSec;
       tachoUpdateSec    = (uint8_t) max(1,(int)tachoUpdateSec); // bounds checking
       targetTemperature = top[FPSTR(_temperature)] | targetTemperature;

diff --git a/usermods/Temperature/usermod_temperature.h b/usermods/Temperature/usermod_temperature.h
@@ -4,12 +4,17 @@
 #include "OneWire.h"
 
 //Pin defaults for QuinLed Dig-Uno if not overriden
-#ifndef TEMPERATURE_PIN
-  #ifdef ARDUINO_ARCH_ESP32
-    #define TEMPERATURE_PIN 18
-  #else //ESP8266 boards
-    #define TEMPERATURE_PIN 14
+#ifndef WLED_USE_ETHERNET
+  #ifndef TEMPERATURE_PIN
+    #ifdef ARDUINO_ARCH_ESP32
+      #define TEMPERATURE_PIN 18
+    #else //ESP8266 boards
+      #define TEMPERATURE_PIN 14
+    #endif
   #endif
+#else
+  #undef TEMPERATURE_PIN
+  #define TEMPERATURE_PIN -1
 #endif
 
 // the frequency to check temperature, 1 minute
@@ -206,7 +211,16 @@ void UsermodTemperature::setup() {
     // config says we are enabled
     DEBUG_PRINTLN(F("Allocating temperature pin..."));
     // pin retrieved from cfg.json (readFromConfig()) prior to running setup()
-    if (temperaturePin >= 0 && pinManager.allocatePin(temperaturePin, true, PinOwner::UM_Temperature)) {
+    // Validate pin before attempting allocation to prevent conflicts with Ethernet, etc.
+    if (temperaturePin < 0) {
+      DEBUG_PRINTLN(F("Temperature: no pin configured."));
+    } else if (!pinManager.isPinOk(temperaturePin, true)) {
+      DEBUG_PRINTLN(F("Temperature: pin not valid for this board."));
+      temperaturePin = -1;
+    } else if (pinManager.isPinAllocated(temperaturePin)) {
+      DEBUG_PRINTF("Temperature: pin %d already in use by %s.\n", temperaturePin, pinManager.getPinOwnerText(temperaturePin));
+      temperaturePin = -1;
+    } else if (pinManager.allocatePin(temperaturePin, true, PinOwner::UM_Temperature)) {
       oneWire = new OneWire(temperaturePin);
       if (oneWire->reset()) {
         while (!findSensor() && retries--) {
@@ -220,9 +234,7 @@ void UsermodTemperature::setup() {
         parasitePin = -1;
       }
     } else {
-      if (temperaturePin >= 0) {
-        DEBUG_PRINTLN(F("Temperature pin allocation failed."));
-      }
+      DEBUG_PRINTLN(F("Temperature pin allocation failed."));
       temperaturePin = -1;  // allocation failed
     }
   }
@@ -381,6 +393,11 @@ bool UsermodTemperature::readFromConfig(JsonObject &root) {
   }
 
   newTemperaturePin = top["pin"] | newTemperaturePin;
+  // Early validation - reject obviously invalid pins (setup() does full conflict check)
+  if (newTemperaturePin >= 0 && !pinManager.isPinOk(newTemperaturePin, true)) {
+    DEBUG_PRINTLN(F("Temperature: configured pin is not valid for this board."));
+    newTemperaturePin = -1;
+  }
   degC              = top["degC"] | degC;
   readingInterval   = top[FPSTR(_readInterval)] | readingInterval/1000;
   readingInterval   = min(120,max(10,(int)readingInterval)) * 1000;  // convert to ms
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,4 @@ @@
       "engines": {
         "node": ">=20.0.0"
       }
-    }
+    }