Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-11 14:07:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Start of 5.X work

Browse Source
This commit is contained in:
Sebastien L
2025-03-18 17:38:34 -04:00
parent c0ddf0a997
commit 73bd096f37
442 changed files with 227862 additions and 21075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
components/wifi-manager/network_ethernet.c
View File

@@ -2,14 +2,13 @@
#define LOG_LOCAL_LEVEL NETWORK_ETHERNET_LOG_LEVEL
#endif
#include "network_ethernet.h"
#include "freertos/timers.h"
#include "messaging.h"
#include "network_status.h"
// #include "Configurator.h"
#pragma message("fixme: search for TODO below")
#include "Config.h"
#include "accessors.h"
#include "esp_log.h"
#include "freertos/timers.h"
#include "globdefs.h"
#include "messaging.h"
#include "network_status.h"
#include "tools.h"
static char TAG[] = "network_ethernet";
@@ -20,22 +19,21 @@ const int LINK_UP_BIT = BIT0;
static network_ethernet_driver_t* network_driver = NULL;
extern network_ethernet_detect_func_t DM9051_Detect, W5500_Detect, LAN8720_Detect;
static network_ethernet_detect_func_t* drivers[] = {
DM9051_Detect, W5500_Detect, LAN8720_Detect, NULL};
static network_ethernet_detect_func_t* drivers[] = {DM9051_Detect, W5500_Detect, LAN8720_Detect, NULL};
#define ETH_TIMEOUT_MS (30 * 1000)
network_ethernet_driver_t* network_ethernet_driver_autodetect() {
sys_Eth* eth_config;
sys_EthCommon* eth_common;
sys_dev_eth_config * eth_config;
sys_dev_eth_common* eth_common;
if (!SYS_ETH(eth_config) || !SYS_ETH_COMMON(eth_common)) {
ESP_LOGD(TAG, "Ethernet not configured");
return NULL;
}
for (uint8_t i = _sys_EthModelEnum_MIN; i < _sys_EthModelEnum_MAX; i++) {
for (uint8_t i = _sys_dev_eth_models_MIN; i < _sys_dev_eth_models_MAX; i++) {
network_ethernet_driver_t* found_driver = drivers[i](eth_config);
if (found_driver) {
ESP_LOGI(TAG, "Detected driver %s ", sys_EthModelEnum_name(eth_common->model));
ESP_LOGI(TAG, "Detected driver %s ", sys_dev_eth_models_name(eth_common->model));
network_driver = found_driver;
return found_driver;
}
@@ -43,22 +41,17 @@ network_ethernet_driver_t* network_ethernet_driver_autodetect() {
return NULL;
}
static void eth_event_handler(
void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data);
static void eth_event_handler(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data);
esp_netif_t* network_ethernet_get_interface() { return eth_netif; }
bool network_ethernet_is_up() {
return (xEventGroupGetBits(ethernet_event_group) & LINK_UP_BIT) != 0;
}
bool network_ethernet_is_up() { return (xEventGroupGetBits(ethernet_event_group) & LINK_UP_BIT) != 0; }
bool network_ethernet_enabled() { return network_driver != NULL && network_driver->handle != NULL; }
bool network_ethernet_wait_for_link(uint16_t max_wait_ms) {
if (!network_ethernet_enabled()) return false;
bool link_up = (xEventGroupGetBits(ethernet_event_group) & LINK_UP_BIT) != 0;
if (!link_up) {
ESP_LOGD(TAG, "Waiting for Ethernet link to be established...");
link_up = (xEventGroupWaitBits(ethernet_event_group, LINK_UP_BIT, pdFALSE, pdTRUE,
max_wait_ms / portTICK_PERIOD_MS) &
LINK_UP_BIT) != 0;
link_up = (xEventGroupWaitBits(ethernet_event_group, LINK_UP_BIT, pdFALSE, pdTRUE, max_wait_ms / portTICK_PERIOD_MS) & LINK_UP_BIT) != 0;
if (!link_up) {
ESP_LOGW(TAG, "Ethernet Link timeout.");
} else {
@@ -72,47 +65,41 @@ static void ETH_Timeout(void* timer_id);
void destroy_network_ethernet() {}
static void network_ethernet_print_config(const network_ethernet_driver_t* eth_config) {
sys_Eth* sys_eth;
sys_dev_eth_config * sys_eth;
int mdc = -1, mdio = -1, rst = -1, intr = -1, cs = -1;
int16_t speed = 0;
uint32_t speed = 0;
int8_t host = 0;
if (SYS_ETH(sys_eth)) {
if (sys_eth->which_ethType == sys_Eth_spi_tag) {
if (sys_eth->ethType.spi.has_cs) {
cs = sys_eth->ethType.spi.cs.pin;
}
if (sys_eth->ethType.spi.has_intr) {
intr = sys_eth->ethType.spi.intr.pin;
}
speed = sys_eth->ethType.spi.speed;
host = sys_eth->ethType.spi.host;
rst = sys_eth->common.rst;
} else if (sys_eth->which_ethType == sys_Eth_rmii_tag) {
if (sys_eth->ethType.rmii.has_mdc) {
mdc = sys_eth->ethType.rmii.mdc.pin;
}
if (sys_eth->ethType.rmii.has_mdio) {
mdio = sys_eth->ethType.rmii.mdio.pin;
}
if (sys_eth->which_ethType == sys_dev_eth_config_spi_tag) {
cs = sys_eth->ethType.spi.cs;
intr = sys_eth->ethType.spi.intr;
speed = sys_eth->ethType.spi.speed;
host = sys_eth->ethType.spi.host - sys_dev_common_hosts_Host0;
} else if (sys_eth->which_ethType == sys_dev_eth_config_rmii_tag) {
mdc = sys_eth->ethType.rmii.mdc;
mdio = sys_eth->ethType.rmii.mdio;
}
}
ESP_LOGI(TAG,
"Ethernet config => model: %s, valid: %s, type: %s, mdc:%d, mdio:%d, rst:%d, intr:%d, "
"cs:%d, speed:%d, host:%d",
sys_EthModelEnum_name(eth_config->model), eth_config->valid ? "YES" : "NO",
eth_config->spi ? "SPI" : "RMII", mdc, mdio, rst, intr, cs, speed, host);
sys_dev_eth_models_name(eth_config->model), eth_config->valid ? "YES" : "NO", eth_config->spi ? "SPI" : "RMII", mdc, mdio, rst, intr, cs, speed,
host);
}
void init_network_ethernet() {
esp_err_t err = ESP_OK;
ESP_LOGI(TAG, "Attempting to initialize Ethernet");
sys_Eth* sys_eth;
if(!SYS_ETH(sys_eth)){
ESP_LOGD(TAG,"No ethernet configured");
sys_dev_eth_config * sys_eth;
if (!SYS_ETH(sys_eth)) {
ESP_LOGD(TAG, "No ethernet configured");
return;
}
network_ethernet_driver_t*driver= network_ethernet_driver_autodetect();
network_ethernet_driver_t* driver = network_ethernet_driver_autodetect();
if (!driver || !driver->valid) {
ESP_LOGI(TAG, "No Ethernet configuration, or configuration invalid");
return;
@@ -122,13 +109,13 @@ void init_network_ethernet() {
network_ethernet_print_config(driver);
eth_netif = esp_netif_new(network_driver->cfg_netif);
esp_eth_set_default_handlers(eth_netif);
// esp_eth_set_default_handlers(eth_netif);
esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &eth_event_handler, NULL);
ethernet_event_group = xEventGroupCreate();
xEventGroupClearBits(ethernet_event_group, LINK_UP_BIT);
spi_device_handle_t spi_handle = NULL;
if (sys_eth->which_ethType == sys_Eth_spi_tag) {
err = spi_bus_add_device(sys_eth->ethType.spi.host, network_driver->devcfg, &spi_handle);
if (sys_eth->which_ethType == sys_dev_eth_config_spi_tag) {
err = spi_bus_add_device(sys_eth->ethType.spi.host - sys_dev_common_hosts_Host0, network_driver->devcfg, &spi_handle);
if (err != ESP_OK) {
ESP_LOGE(TAG, "SPI host failed : %s", esp_err_to_name(err));
}
@@ -139,7 +126,7 @@ void init_network_ethernet() {
if (err == ESP_OK) {
uint8_t mac_address[6];
esp_read_mac(mac_address, ESP_MAC_ETH);
char* mac_string = network_manager_alloc_get_mac_string(mac_address);
char* mac_string = alloc_get_formatted_mac_string(mac_address);
ESP_LOGD(TAG, "Assigning mac address %s to ethernet interface", STR_OR_BLANK(mac_string));
FREE_AND_NULL(mac_string);
esp_eth_ioctl(network_driver->handle, ETH_CMD_S_MAC_ADDR, mac_address);
@@ -153,8 +140,7 @@ void init_network_ethernet() {
err = esp_eth_start(network_driver->handle);
}
if (err != ESP_OK) {
messaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM,
"Configuring Ethernet failed: %s", esp_err_to_name(err));
messaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM, "Configuring Ethernet failed: %s", esp_err_to_name(err));
if (spi_handle) {
spi_bus_remove_device(spi_handle);
}
@@ -162,14 +148,10 @@ void init_network_ethernet() {
}
}
void network_ethernet_start_timer() {
ETH_timer =
xTimerCreate("ETH check", pdMS_TO_TICKS(ETH_TIMEOUT_MS), pdFALSE, NULL, ETH_Timeout);
}
void network_ethernet_start_timer() { ETH_timer = xTimerCreate("ETH check", pdMS_TO_TICKS(ETH_TIMEOUT_MS), pdFALSE, NULL, ETH_Timeout); }
/** Event handler for Ethernet events */
static void eth_event_handler(
void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data) {
static void eth_event_handler(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data) {
uint8_t mac_addr[6] = {0};
/* we can get the ethernet driver handle from event data */
if (event_base == ETH_EVENT) {
@@ -179,8 +161,8 @@ static void eth_event_handler(
xEventGroupSetBits(ethernet_event_group, LINK_UP_BIT);
esp_eth_ioctl(eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr);
ESP_LOGI(TAG, "");
ESP_LOGI(TAG, "Ethernet Link Up, HW Addr %02x:%02x:%02x:%02x:%02x:%02x", mac_addr[0],
mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
ESP_LOGI(TAG, "Ethernet Link Up, HW Addr %02x:%02x:%02x:%02x:%02x:%02x", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4],
mac_addr[5]);
network_async_link_up();
break;
case ETHERNET_EVENT_DISCONNECTED: