feedc0de/espwifistack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Changes for new idf

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-16 14:34:00 +01:00
parent ca9e408bd1
commit 65908208d4
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/espwifistack.cpp
View File

@@ -2580,12 +2580,12 @@ tl::expected<void, std::string> eth_begin(const config &config, const eth_config
return tl::make_unexpected(std::move(msg)); return tl::make_unexpected(std::move(msg));
} }
if (const auto result = esp_eth_set_default_handlers(esp_netifs[ESP_IF_ETH]); result != ESP_OK) // if (const auto result = esp_eth_set_default_handlers(esp_netifs[ESP_IF_ETH]); result != ESP_OK)
{ // {
auto msg = fmt::format("esp_eth_set_default_handlers() failed with {}", esp_err_to_name(result)); // auto msg = fmt::format("esp_eth_set_default_handlers() failed with {}", esp_err_to_name(result));
ESP_LOGE(TAG, "%.*s", msg.size(), msg.data()); // ESP_LOGE(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg)); // return tl::make_unexpected(std::move(msg));
} // }
esp_eth_mac_t *eth_mac{}; esp_eth_mac_t *eth_mac{};
@@ -2626,8 +2626,8 @@ tl::expected<void, std::string> eth_begin(const config &config, const eth_config
switch (eth.type) switch (eth.type)
{ {
case ETH_PHY_LAN8720: case ETH_PHY_LAN87XX:
eth_phy = esp_eth_phy_new_lan8720(&phy_config); eth_phy = esp_eth_phy_new_lan87xx(&phy_config);
if (!eth_phy) if (!eth_phy)
{ {
auto msg = std::string{"esp_eth_phy_new_lan8720() failed"}; auto msg = std::string{"esp_eth_phy_new_lan8720() failed"};
@@ -2673,8 +2673,8 @@ tl::expected<void, std::string> eth_begin(const config &config, const eth_config
} }
break; break;
#endif #endif
case ETH_PHY_KSZ8041: case ETH_PHY_KSZ80XX:
eth_phy = esp_eth_phy_new_ksz8041(&phy_config); eth_phy = esp_eth_phy_new_ksz80xx(&phy_config);
if (!eth_phy) if (!eth_phy)
{ {
auto msg = std::string{"esp_eth_phy_new_ksz8041() failed"}; auto msg = std::string{"esp_eth_phy_new_ksz8041() failed"};
@@ -2682,15 +2682,6 @@ tl::expected<void, std::string> eth_begin(const config &config, const eth_config
return tl::make_unexpected(std::move(msg)); return tl::make_unexpected(std::move(msg));
} }
break; break;
// case ETH_PHY_KSZ8081:
// eth_phy = esp_eth_phy_new_ksz8081(&phy_config);
// if (!eth_phy)
// {
// auto msg = std::string{"esp_eth_phy_new_ksz8081() failed"};
// ESP_LOGE(TAG, "%.*s", msg.size(), msg.data());
// return tl::make_unexpected(std::move(msg));
// }
// break;
default: default:
auto msg = fmt::format("unknown type {}", eth.type); auto msg = fmt::format("unknown type {}", eth.type);
ESP_LOGE(TAG, "%.*s", msg.size(), msg.data()); ESP_LOGE(TAG, "%.*s", msg.size(), msg.data());

2
src/espwifistackconfig.h
View File

@@ -196,7 +196,7 @@ struct ap_config
enum eth_clock_mode_t { ETH_CLOCK_GPIO0_IN, ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ETH_CLOCK_GPIO17_OUT }; enum eth_clock_mode_t { ETH_CLOCK_GPIO0_IN, ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ETH_CLOCK_GPIO17_OUT };
enum eth_phy_type_t { ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848, ETH_PHY_DM9051, ETH_PHY_KSZ8041, /* ETH_PHY_KSZ8081, */ ETH_PHY_MAX }; enum eth_phy_type_t { ETH_PHY_LAN87XX, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848, ETH_PHY_DM9051, ETH_PHY_KSZ80XX, ETH_PHY_MAX };
struct eth_config struct eth_config
{ {