Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ETHERNET - Peripheral manager implementation #8297

Merged
merged 4 commits into from
Jun 29, 2023
Merged

ETHERNET - Peripheral manager implementation #8297

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed4680c
Peripheral manager implemented
P-R-O-C-H-Y Jun 8, 2023
2f57e1f
remove unused variable
P-R-O-C-H-Y Jun 8, 2023
adbc792
Add all RMII pins
P-R-O-C-H-Y Jun 13, 2023
f914839
fix typo
P-R-O-C-H-Y Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cores/esp32/esp32-hal-periman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ typedef enum {
#endif
#if SOC_USB_SERIAL_JTAG_SUPPORTED || SOC_USB_OTG_SUPPORTED
ESP32_BUS_TYPE_USB, // IO is used as USB pin
#endif
#if CONFIG_IDF_TARGET_ESP32
ESP32_BUS_TYPE_ETHERNET, // IO is used as ETHERNET-RMII pin
#endif
ESP32_BUS_TYPE_MAX
} peripheral_bus_type_t;
Expand Down
91 changes: 87 additions & 4 deletions libraries/Ethernet/src/ETH.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#if ESP_IDF_VERSION_MAJOR > 3
#include "esp_event.h"
#include "esp_eth.h"
#include "esp_eth_phy.h"
#include "esp_eth_mac.h"
#include "esp_eth_com.h"
#if CONFIG_IDF_TARGET_ESP32
Expand All @@ -32,6 +31,7 @@
//#include "soc/io_mux_reg.h"
//#include "hal/gpio_hal.h"
#endif
#include "esp32-hal-periman.h"
#else
#include "eth_phy/phy.h"
#include "eth_phy/phy_tlk110.h"
Expand Down Expand Up @@ -225,19 +225,28 @@ ETHClass::ETHClass()
#if ESP_IDF_VERSION_MAJOR > 3
,eth_handle(NULL)
#endif
,started(false)
,_started(false)
{
}

ETHClass::~ETHClass()
{}

bool ETHClass::ethDetachBus(void * bus_pointer){
ETHClass *bus = (ETHClass *) bus_pointer;
if(bus->_started) {
bus->end();
}
return true;
}

bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_type_t type, eth_clock_mode_t clock_mode, bool use_mac_from_efuse)
{
#if ESP_IDF_VERSION_MAJOR > 3
if(esp_netif != NULL){
return true;
}
perimanSetBusDeinit(ESP32_BUS_TYPE_ETHERNET, ETHClass::ethDetachBus);

eth_clock_mode = clock_mode;
tcpipInit();
Expand Down Expand Up @@ -267,10 +276,25 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
mac_config.smi_mdc_gpio_num = mdc;
mac_config.smi_mdio_gpio_num = mdio;

_pin_mcd = mdc;
_pin_mdio = mdio;
_pin_rmii_clock = mac_config.clock_config.rmii.clock_gpio;

if(!perimanSetPinBus(_pin_rmii_clock, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(_pin_mcd, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(_pin_mdio, ESP32_BUS_TYPE_INIT, NULL)){ return false; }

eth_mac_config_t eth_mac_config = ETH_MAC_DEFAULT_CONFIG();
eth_mac_config.sw_reset_timeout_ms = 1000;

eth_mac = esp_eth_mac_new_esp32(&mac_config, &eth_mac_config);

if(!perimanSetPinBus(ETH_RMII_TX_EN, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(ETH_RMII_TX0, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(ETH_RMII_TX1, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(ETH_RMII_RX0, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(ETH_RMII_RX1_EN, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
if(!perimanSetPinBus(ETH_RMII_CRS_DV, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
#endif
#if CONFIG_ETH_SPI_ETHERNET_DM9051
}
Expand All @@ -281,9 +305,15 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
return false;
}

_pin_power = power;
if(_pin_power != -1){
if(!perimanSetPinBus(_pin_power, ESP32_BUS_TYPE_INIT, NULL)){ return false; }
}

eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
phy_config.phy_addr = phy_addr;
phy_config.reset_gpio_num = power;

esp_eth_phy_t *eth_phy = NULL;
switch(type){
case ETH_PHY_LAN8720:
Expand Down Expand Up @@ -347,6 +377,22 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
log_e("esp_eth_start failed");
return false;
}
_started = true;

if(!perimanSetPinBus(_pin_rmii_clock, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(_pin_mcd, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(_pin_mdio, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }

if(!perimanSetPinBus(ETH_RMII_TX_EN, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(ETH_RMII_TX0, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(ETH_RMII_TX1, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(ETH_RMII_RX0, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(ETH_RMII_RX1_EN, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
if(!perimanSetPinBus(ETH_RMII_CRS_DV, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }

if(_pin_power != -1){
if(!perimanSetPinBus(_pin_power, ESP32_BUS_TYPE_ETHERNET, (void *)(this))){ goto err; }
}
#else
esp_err_t err;
if(initialized){
Expand All @@ -355,7 +401,7 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
log_e("esp_eth_enable error: %d", err);
return false;
}
started = true;
_started = true;
return true;
}
_eth_phy_mdc_pin = mdc;
Expand Down Expand Up @@ -401,7 +447,7 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
if(err){
log_e("esp_eth_enable error: %d", err);
} else {
started = true;
_started = true;
return true;
}
} else {
Expand All @@ -413,6 +459,11 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
delay(50);

return true;

err:
log_e("Failed to set all pins bus to ETHERNET");
ETHClass::ethDetachBus((void *)(this));
return false;
}

bool ETHClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2)
Expand Down Expand Up @@ -615,4 +666,36 @@ String ETHClass::macAddress(void)
return String(macStr);
}

#if ESP_IDF_VERSION_MAJOR > 3

void ETHClass::end(void)
{
if(esp_eth_stop(eth_handle) != ESP_OK) {
log_e("Failed to stop Ehternet");
return;
}
if(esp_eth_driver_uninstall(eth_handle) != ESP_OK) {
log_e("Failed to stop Ehternet");
P-R-O-C-H-Y marked this conversation as resolved.
Show resolved Hide resolved
return;
}
_started = false;

perimanSetPinBus(_pin_rmii_clock, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(_pin_mcd, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(_pin_mdio, ESP32_BUS_TYPE_INIT, NULL);

perimanSetPinBus(ETH_RMII_TX_EN, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(ETH_RMII_TX0, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(ETH_RMII_TX1, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(ETH_RMII_RX0, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(ETH_RMII_RX1_EN, ESP32_BUS_TYPE_INIT, NULL);
perimanSetPinBus(ETH_RMII_CRS_DV, ESP32_BUS_TYPE_INIT, NULL);

if(_pin_power != -1){
perimanSetPinBus(_pin_power, ESP32_BUS_TYPE_INIT, NULL);
}
}

#endif

ETHClass ETH;
21 changes: 19 additions & 2 deletions libraries/Ethernet/src/ETH.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
#include "esp_eth.h"
#include "esp_netif.h"

//Dedicated GPIOs for RMII
#define ETH_RMII_TX_EN 21
#define ETH_RMII_TX0 19
#define ETH_RMII_TX1 22
#define ETH_RMII_RX0 25
#define ETH_RMII_RX1_EN 26
#define ETH_RMII_CRS_DV 27

#ifndef ETH_PHY_ADDR
#define ETH_PHY_ADDR 0
#endif
Expand Down Expand Up @@ -66,10 +74,14 @@ class ETHClass {
esp_netif_t *esp_netif;

protected:
bool started;
bool _started;
int8_t _pin_mcd = -1;
int8_t _pin_mdio = -1;
int8_t _pin_power = -1;
int8_t _pin_rmii_clock = -1;
static void eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
#else
bool started;
bool _started;
eth_config_t eth_config;
#endif
public:
Expand Down Expand Up @@ -102,8 +114,13 @@ class ETHClass {
uint8_t * macAddress(uint8_t* mac);
String macAddress();

void end();

friend class WiFiClient;
friend class WiFiServer;

private:
static bool ethDetachBus(void * bus_pointer);
};

extern ETHClass ETH;
Expand Down