aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-10-31 13:52:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: keep Ethernet settings independent of the framework

Browse source 
Prepares the move to Arduino 3.x / ESP-IDF 5.5, which renumbers
eth_phy_type_t (ETH_PHY_GENERIC is now 0) and only has the RMII MAC
API on the original ESP32.

- Store the PHY chip as our own id (eth_phy_id_t, the 2.x values) and
  translate it by name at ETH.begin(), so NVS, backups and the web UI
  keep their numbers on either framework.
- Build Ethernet only where CONFIG_ETH_USE_ESP32_EMAC is set instead of
  everywhere but the C6.  C3 and S3 could never use it.  A stored
  Ethernet connection falls back to Wi-Fi on those chips.
- /networksettings reports hasEthernet; the UI hides the Ethernet
  options without it.
- Fix the UI PHY list: 5 is the KSZ8041, add the KSZ8081 (6), drop the
  DM9051, an SPI chip the MAC can't drive.
- SSDP takes its address from WiFi/ETH.localIP() instead of the
  tcpip_adapter API IDF 5 removed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-19 21:13:49 +02:00
parent b74f382650
commit e1a62fe5be
12 changed files with 190 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/stubs/ETH.h Normal file
View file

@ -0,0 +1,16 @@
// Stand-in for the Arduino core's ETH.h in the native test env. Uses the
// Arduino 3.x numbering, which put ETH_PHY_GENERIC first, so a stored PHY id
// that is cast instead of translated fails the tests.
#ifndef eth_stub_h
#define eth_stub_h
typedef enum {
ETH_PHY_GENERIC,
ETH_PHY_LAN8720,
ETH_PHY_TLK110,
ETH_PHY_RTL8201,
ETH_PHY_DP83848,
ETH_PHY_KSZ8041,
ETH_PHY_KSZ8081,
ETH_PHY_MAX
} eth_phy_type_t;
#endif

63
test/test_ethphy/test_ethphy.cpp Normal file
View file

@ -0,0 +1,63 @@
#include <unity.h>
// As on the original ESP32, so the translation is built.
#define CONFIG_ETH_USE_ESP32_EMAC 1
#include "EthPhy.h"
void setUp() {}
void tearDown() {}
static eth_phy_type_t translate(eth_phy_id_t id) {
eth_phy_type_t type = ETH_PHY_MAX;
TEST_ASSERT_TRUE(ethPhyType(static_cast<uint8_t>(id), type));
return type;
}
/*********************************************************************
* Stored ids
********************************************************************/
static void test_ids_match_stored_values() {
// NVS, backups and the web UI hold these numbers. Changing one moves
// every existing Ethernet board to another chip.
TEST_ASSERT_EQUAL_UINT8(0, static_cast<uint8_t>(eth_phy_id_t::LAN8720));
TEST_ASSERT_EQUAL_UINT8(1, static_cast<uint8_t>(eth_phy_id_t::TLK110));
TEST_ASSERT_EQUAL_UINT8(2, static_cast<uint8_t>(eth_phy_id_t::RTL8201));
TEST_ASSERT_EQUAL_UINT8(3, static_cast<uint8_t>(eth_phy_id_t::DP83848));
TEST_ASSERT_EQUAL_UINT8(4, static_cast<uint8_t>(eth_phy_id_t::DM9051));
TEST_ASSERT_EQUAL_UINT8(5, static_cast<uint8_t>(eth_phy_id_t::KSZ8041));
TEST_ASSERT_EQUAL_UINT8(6, static_cast<uint8_t>(eth_phy_id_t::KSZ8081));
}
/*********************************************************************
* ethPhyType
********************************************************************/
static void test_translates_each_rmii_chip_by_name() {
TEST_ASSERT_EQUAL(ETH_PHY_LAN8720, translate(eth_phy_id_t::LAN8720));
TEST_ASSERT_EQUAL(ETH_PHY_TLK110, translate(eth_phy_id_t::TLK110));
TEST_ASSERT_EQUAL(ETH_PHY_RTL8201, translate(eth_phy_id_t::RTL8201));
TEST_ASSERT_EQUAL(ETH_PHY_DP83848, translate(eth_phy_id_t::DP83848));
TEST_ASSERT_EQUAL(ETH_PHY_KSZ8041, translate(eth_phy_id_t::KSZ8041));
TEST_ASSERT_EQUAL(ETH_PHY_KSZ8081, translate(eth_phy_id_t::KSZ8081));
}
static void test_lan8720_is_not_the_framework_zero() {
// The default board stores 0. Arduino 3.x's 0 is ETH_PHY_GENERIC.
TEST_ASSERT_NOT_EQUAL(0, translate(eth_phy_id_t::LAN8720));
}
static void test_rejects_dm9051() {
eth_phy_type_t type = ETH_PHY_MAX;
TEST_ASSERT_FALSE(ethPhyType(static_cast<uint8_t>(eth_phy_id_t::DM9051), type));
}
static void test_rejects_unknown_ids() {
eth_phy_type_t type = ETH_PHY_MAX;
TEST_ASSERT_FALSE(ethPhyType(7, type));
TEST_ASSERT_FALSE(ethPhyType(255, type));
}
int main(int, char **) {
UNITY_BEGIN();
RUN_TEST(test_ids_match_stored_values);
RUN_TEST(test_translates_each_rmii_chip_by_name);
RUN_TEST(test_lan8720_is_not_the_framework_zero);
RUN_TEST(test_rejects_dm9051);
RUN_TEST(test_rejects_unknown_ids);
return UNITY_END();
}