Merge pull request wled#1764 from k7bbr/master

Add support for WESP32 board, change default Ethernet type to none, add macro to specify default Ethernet type at compile time

Author: Aircoookie

package-lock.json

@@ -30,7 +30,7 @@ default_envs = travis_esp8266, travis_esp32
 ; default_envs = d1_mini_5CH_Shojo_PCB
 ; default_envs = wemos_shield_esp32
 ; default_envs = m5atom
-; default_envs = esp32_poe
+; default_envs = esp32_eth
 
 src_dir  = ./wled00
 data_dir = ./wled00/data
@@ -279,12 +279,12 @@ lib_ignore =
   ESPAsyncTCP
   ESPAsyncUDP
 
-[env:esp32_poe]
+[env:esp32_eth]
 board = esp32-poe
 platform = [email protected]
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D RLYPIN=-1 -D WLED_USE_ETHERNET  -D BTNPIN=-1
+build_flags = ${common.build_flags_esp32} -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1
 lib_ignore =
   ESPAsyncTCP
   ESPAsyncUDP

platformio.ini

@@ -131,6 +131,7 @@
 #define WLED_ETH_NONE             0
 #define WLED_ETH_WT32_ETH01       1
 #define WLED_ETH_ESP32_POE        2
+#define WLED_ETH_WESP32           3
 
 //Hue error codes
 #define HUE_ERROR_INACTIVE        0

wled00/const.h

@@ -69,7 +69,8 @@ <h3>Ethernet Type</h3>
 		<select name="ETH">
 		<option value="0">None</option>
 		<option value="1">WT32-ETH01</option>
-		<option value="2">ESP32-POE</option></select><br><br></div>
+		<option value="2">ESP32-POE</option>
+		<option value="3">WESP32</option></select><br><br></div>
 		<hr>
 		<button type="button" onclick="B()">Back</button><button type="submit">Save & Connect</button>
 	</form>

wled00/data/settings_wifi.htm

@@ -64,8 +64,9 @@ Can help with connectivity issues.<br>
 Do not enable if WiFi is working correctly, increases power consumption.</i><div
  id="ethd"><h3>Ethernet Type</h3><select name="ETH"><option value="0">None
 </option><option value="1">WT32-ETH01</option><option value="2">ESP32-POE
-</option></select><br><br></div><hr><button type="button" onclick="B()">Back
-</button><button type="submit">Save & Connect</button></form></body></html>)=====";
+</option><option value="3">WESP32</option></select><br><br></div><hr><button 
+type="button" onclick="B()">Back</button><button type="submit">Save & Connect
+</button></form></body></html>)=====";
 
 
 // Autogenerated from wled00/data/settings_leds.htm, do not edit!!

wled00/html_settings.h

@@ -9,7 +9,7 @@
 // Autogenerated from wled00/data/index.htm, do not edit!!
 const uint16_t PAGE_index_L = 32717;
 const uint8_t PAGE_index[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcc, 0xbd, 0x69, 0x7b, 0xe2, 0x48,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xcc, 0xbd, 0x69, 0x7b, 0xe2, 0x48,
   0xb2, 0x28, 0xfc, 0xbd, 0x7e, 0x05, 0x45, 0x4d, 0x57, 0x43, 0x21, 0x40, 0xac, 0xc6, 0xb8, 0x68,
   0x1f, 0xb1, 0x19, 0x6c, 0x83, 0xcd, 0xea, 0x6d, 0x3c, 0xe7, 0x11, 0x42, 0x08, 0xd9, 0xb2, 0x84,
   0x25, 0xb1, 0xda, 0xdc, 0xdf, 0xfe, 0x46, 0x64, 0xa6, 0x16, 0x36, 0xdb, 0x3d, 0x77, 0xe6, 0x3e,

wled00/html_ui.h

@@ -48,6 +48,16 @@ ethernet_settings ethernetBoards[] = {
     18,                  // eth_mdio, 
     ETH_PHY_LAN8720,     // eth_type,
     ETH_CLOCK_GPIO17_OUT // eth_clk_mode
+  },
+
+   // WESP32
+  {
+    0,			              // eth_address,
+    -1,			              // eth_power,
+    16,			              // eth_mdc,
+    17,			              // eth_mdio,
+    ETH_PHY_LAN8720,      // eth_type,
+    ETH_CLOCK_GPIO0_IN	  // eth_clk_mode
   }
 };
 

wled00/wled.cpp

@@ -205,7 +205,11 @@ WLED_GLOBAL IPAddress staticGateway _INIT_N(((  0,   0,  0,  0))); // gateway (r
 WLED_GLOBAL IPAddress staticSubnet  _INIT_N(((255, 255, 255, 0))); // most common subnet in home networks
 WLED_GLOBAL bool noWifiSleep _INIT(false);                         // disabling modem sleep modes will increase heat output and power usage, but may help with connection issues
 #ifdef WLED_USE_ETHERNET
-WLED_GLOBAL int ethernetType _INIT(WLED_ETH_ESP32_POE);            // ethernet board type
+  #ifdef WLED_ETH_DEFAULT                                          // default ethernet board type if specified
+    WLED_GLOBAL int ethernetType _INIT(WLED_ETH_DEFAULT);          // ethernet board type
+  #else
+    WLED_GLOBAL int ethernetType _INIT(WLED_ETH_NONE);             // use none for ethernet board type if default not defined
+  #endif               
 #endif
 
 // LED CONFIG