diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f94aac5..bffef0c76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. ### Changed - ESP32 Framework (Arduino Core) from v2.0.15 to v3.0.0 (#21180) - ESP32 Core3 platform update from 2024.04.11 to 2024.04.12 (#21199) -- ESP32 Ethernet Phy Type number for ETH_PHY_DM9051 from 4 to 10 (#21204) +- ESP32 Ethernet Phy Type number for DM9051 from 4 to 10 (#21204) ### Fixed - HASPmota dropdown class "options" attribute (#21203) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e2ed89b4a..c38ae74a1 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -156,7 +156,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm - KNX format of energy to match specifications [#21074](https://github.com/arendst/Tasmota/issues/21074) - ESP32 refactored Wifi for ESP32 Core3 release [#21106](https://github.com/arendst/Tasmota/issues/21106) - ESP32 WiFi phy modes 11n and 11ax represented as HT20, HT40 and HE20 [#19350](https://github.com/arendst/Tasmota/issues/19350) -- ESP32 Ethernet Phy Type number for ETH_PHY_DM9051 from 4 to 10 (#21204)[#21204](https://github.com/arendst/Tasmota/issues/21204) +- ESP32 Ethernet Phy Type number for DM9051 from 4 to 10 (#21204)[#21204](https://github.com/arendst/Tasmota/issues/21204) - berry.exe (pre-compiled for Windows) updated to latest Berry patches [#21024](https://github.com/arendst/Tasmota/issues/21024) - Berry class `int64` made immutable [#20727](https://github.com/arendst/Tasmota/issues/20727) - Matter reduce memory usage when reading with wildcards [#20809](https://github.com/arendst/Tasmota/issues/20809) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index f233cb4c9..f09b6723b 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -1139,15 +1139,15 @@ https://rya.nc/tasmota-fingerprint.html" //#define USE_ETHERNET // Add support for ethernet (+20k code) // #define USE_WT32_ETH01 // Add support for Wireless-Tag WT32-ETH01 -// #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110/ETH_PHY_IP101, 2 = ETH_PHY_RTL8201, 3 = ETH_PHY_DP83848, 4 = ETH_PHY_RFU, 5 = ETH_PHY_KSZ8081, 6 = ETH_PHY_KSZ8041, 7 = ETH_PHY_JL1101, 8 = ETH_PHY_W5500, 9 = ETH_PHY_KSZ8851, 10 = ETH_PHY_DM9051 +// #define ETH_TYPE 0 // [EthType] 0 = LAN8720, 1 = TLK110/IP101, 2 = RTL8201, 3 = DP83848, 4 = RFU, 5 = KSZ8081, 6 = KSZ8041, 7 = JL1101, 8 = W5500, 9 = KSZ8851, 10 = DM9051 // #define ETH_ADDRESS 1 // [EthAddress] 0 = PHY0 .. 31 = PHY31 // #define ETH_CLKMODE 0 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT // Olimex ESP32-PoE - #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110/ETH_PHY_IP101, 2 = ETH_PHY_RTL8201, 3 = ETH_PHY_DP83848, 4 = ETH_PHY_RFU, 5 = ETH_PHY_KSZ8081, 6 = ETH_PHY_KSZ8041, 7 = ETH_PHY_JL1101, 8 = ETH_PHY_W5500, 9 = ETH_PHY_KSZ8851, 10 = ETH_PHY_DM9051 + #define ETH_TYPE 0 // [EthType] 0 = LAN8720, 1 = TLK110/IP101, 2 = RTL8201, 3 = DP83848, 4 = RFU, 5 = KSZ8081, 6 = KSZ8041, 7 = JL1101, 8 = W5500, 9 = KSZ8851, 10 = DM9051 #define ETH_ADDRESS 0 // [EthAddress] 0 = PHY0 .. 31 = PHY31 #define ETH_CLKMODE 3 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT // wESP32-PoE -// #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110/ETH_PHY_IP101, 2 = ETH_PHY_RTL8201, 3 = ETH_PHY_DP83848, 4 = ETH_PHY_RFU, 5 = ETH_PHY_KSZ8081, 6 = ETH_PHY_KSZ8041, 7 = ETH_PHY_JL1101, 8 = ETH_PHY_W5500, 9 = ETH_PHY_KSZ8851, 10 = ETH_PHY_DM9051 +// #define ETH_TYPE 0 // [EthType] 0 = LAN8720, 1 = TLK110/IP101, 2 = RTL8201, 3 = DP83848, 4 = RFU, 5 = KSZ8081, 6 = KSZ8041, 7 = JL1101, 8 = W5500, 9 = KSZ8851, 10 = DM9051 // #define ETH_ADDRESS 0 // [EthAddress] 0 = PHY0 .. 31 = PHY31 // #define ETH_CLKMODE 0 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT diff --git a/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino b/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino index 2fe1b7a9d..8ff48237a 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino @@ -36,14 +36,14 @@ * GPIO12 = ETH POWER * GPIO18 = ETH MDIO * GPIO23 = ETH MDC - * #define ETH_TYPE ETH_PHY_LAN8720 + * #define ETH_TYPE 0 // LAN8720 * #define ETH_CLKMODE ETH_CLOCK_GPIO17_OUT * #define ETH_ADDRESS 0 * * {"NAME":"wESP32","GPIO":[0,0,1,0,1,1,0,0,1,1,1,1,5568,5600,1,0,0,0,0,1,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1} * GPIO16 = ETH MDC * GPIO17 = ETH MDIO - * #define ETH_TYPE ETH_PHY_LAN8720 + * #define ETH_TYPE 0 // LAN8720 * #define ETH_CLKMODE ETH_CLOCK_GPIO0_IN * #define ETH_ADDRESS 0 * @@ -51,7 +51,7 @@ * GPIO16 = Force Hi * GPIO18 = ETH MDIO * GPIO23 = ETH MDC - * #define ETH_TYPE ETH_PHY_LAN8720 + * #define ETH_TYPE 0 // LAN8720 * #define ETH_CLKMODE ETH_CLOCK_GPIO0_IN * #define ETH_ADDRESS 1 * @@ -78,7 +78,7 @@ #endif #ifndef ETH_TYPE -#define ETH_TYPE ETH_PHY_LAN8720 // ETH.h eth_phy_type_t: 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110/ETH_PHY_IP101, 2 = ETH_PHY_RTL8201, 3 = ETH_PHY_DP83848, 4 = ETH_PHY_RFU, 5 = ETH_PHY_KSZ8081, 6 = ETH_PHY_KSZ8041, 7 = ETH_PHY_JL1101, 8 = ETH_PHY_W5500, 9 = ETH_PHY_KSZ8851, 10 = ETH_PHY_DM9051 +#define ETH_TYPE 0 // 0 = LAN8720, 1 = TLK110/IP101, 2 = RTL8201, 3 = DP83848, 4 = RFU, 5 = KSZ8081, 6 = KSZ8041, 7 = JL1101, 8 = W5500, 9 = KSZ8851, 10 = DM9051 #endif #ifndef ETH_CLKMODE @@ -89,17 +89,17 @@ #include const uint8_t eth_type_xtable[] = { - 0, // 0 = ETH_PHY_LAN8720 - 1, // 1 = ETH_PHY_TLK110/ETH_PHY_IP101 - 2, // 2 = ETH_PHY_RTL8201 - 4, // 3 = ETH_PHY_DP83848 (is 4 in core3) - 0, // 4 = ETH_TYPE_RFU - Future Use - 6, // 5 = ETH_PHY_KSZ8081 - 5, // 6 = ETH_PHY_KSZ8041 - 3, // 7 = ETH_PHY_JL1101 - 8, // 8 = ETH_PHY_W5500 (is new in core3 and using SPI) - 9, // 9 = ETH_PHY_KSZ8851 (is new in core3 and using SPI) - 7 // 10 = ETH_PHY_DM9051 (is 7 in core3 and using SPI) + 0, // 0 = LAN8720 + 1, // 1 = TLK110/IP101 + 2, // 2 = RTL8201 + 4, // 3 = DP83848 (is 4 in core3) + 0, // 4 = RFU - Reserved for Future Use + 6, // 5 = KSZ8081 (is 6 in core3) + 5, // 6 = KSZ8041 (is 5 in core3) + 3, // 7 = JL1101 (is 3 in core3) + 8, // 8 = W5500 (is new in core3 and using SPI) + 9, // 9 = KSZ8851 (is new in core3 and using SPI) + 7 // 10 = DM9051 (is 7 in core3 and using SPI) }; char eth_hostname[sizeof(TasmotaGlobal.hostname)]; uint8_t eth_config_change; @@ -191,7 +191,7 @@ void EthernetInit(void) { #if CONFIG_ETH_USE_ESP32_EMAC if (WT32_ETH01 == TasmotaGlobal.module_type) { Settings->eth_address = 1; // EthAddress - Settings->eth_type = 0; // EthType 0 = ETH_PHY_LAN8720 + Settings->eth_type = 0; // EthType 0 = LAN8720 Settings->eth_clk_mode = 0; // EthClockMode 0 = ETH_CLOCK_GPIO0_IN } #else // No CONFIG_ETH_USE_ESP32_EMAC diff --git a/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino b/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino index a2fa0abc1..b0aa018a1 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino @@ -98,7 +98,7 @@ * GPIO32 - Blue status led2 * GPIO33 - Yellow error led3 * GPIO35 - Button - * #define ETH_TYPE ETH_PHY_LAN8720 + * #define ETH_TYPE 0 // LAN8720 * #define ETH_CLKMODE ETH_CLOCK_GPIO17_OUT * #define ETH_ADDRESS 0 * @@ -1946,7 +1946,7 @@ void SSPMInit(void) { #if CONFIG_IDF_TARGET_ESP32 #ifdef USE_ETHERNET Settings->eth_address = 0; // EthAddress - Settings->eth_type = ETH_PHY_LAN8720; // EthType + Settings->eth_type = 0; // EthType LAN8720 Settings->eth_clk_mode = ETH_CLOCK_GPIO17_OUT; // EthClockMode #endif #endif