Skip to content

Commit e8b977d

Browse files
authored
Fix build errors for SPI ethernet on Esp32 (#3178)
1 parent 9cf2a69 commit e8b977d

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ CONFIG_LWIP_IPV6=n
6868
CONFIG_LWIP_MAX_ACTIVE_TCP=10
6969
CONFIG_LWIP_MAX_LISTENING_TCP=5
7070
CONFIG_LWIP_SNTP_MAX_SERVERS=2
71+
CONFIG_LWIP_NETIF_LOOPBACK=n
7172

7273
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
7374
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y

targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ CONFIG_LWIP_DHCPS=n
4747
CONFIG_LWIP_IPV6=n
4848
CONFIG_LWIP_MAX_LISTENING_TCP=8
4949
CONFIG_LWIP_SNTP_MAX_SERVERS=2
50+
CONFIG_LWIP_NETIF_LOOPBACK=n
5051

5152
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
5253
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y

targets/ESP32/_IDF/sdkconfig.default_rev3.esp32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ CONFIG_LWIP_DHCPS=n
5656
CONFIG_LWIP_IPV6=n
5757
CONFIG_LWIP_MAX_LISTENING_TCP=8
5858
CONFIG_LWIP_SNTP_MAX_SERVERS=2
59+
CONFIG_LWIP_NETIF_LOOPBACK=n
5960

6061
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
6162
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y

targets/ESP32/_Network/NF_ESP32_Ethernet.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,19 @@ esp_err_t NF_ESP32_InitialiseEthernet(uint8_t *pMacAdr)
131131

132132
#elif ESP32_ETHERNET_SPI == TRUE
133133
// Or Use SPI ethernet module
134-
// Initialise SPI bus
134+
135+
// Install gpio isr service for spi interupts
135136
gpio_install_isr_service(0);
137+
138+
// Initialise SPI bus
136139
spi_bus_config_t buscfg = {0};
137140
buscfg.miso_io_num = ESP32_ETHERNET_SPI_MISO_GPIO;
138141
buscfg.mosi_io_num = ESP32_ETHERNET_SPI_MOSI_GPIO;
139142
buscfg.sclk_io_num = ESP32_ETHERNET_SPI_SCLK_GPIO;
140143
buscfg.quadwp_io_num = -1;
141144
buscfg.quadhd_io_num = -1;
142145

143-
ESP_ERROR_CHECK(spi_bus_initialize(SPI2_HOST, &buscfg, 1));
146+
ESP_ERROR_CHECK(spi_bus_initialize(ESP32_ETHERNET_SPI_HOST, &buscfg, SPI_DMA_CH_AUTO));
144147

145148
#pragma
146149
// Define SPI interface to use
@@ -154,7 +157,7 @@ esp_err_t NF_ESP32_InitialiseEthernet(uint8_t *pMacAdr)
154157
.queue_size = 20};
155158

156159
/* dm9051 ethernet driver is based on spi driver */
157-
eth_dm9051_config_t dm9051_config = ETH_DM9051_DEFAULT_CONFIG(CONFIG_EXAMPLE_ETH_SPI_HOST, &devcfg);
160+
eth_dm9051_config_t dm9051_config = ETH_DM9051_DEFAULT_CONFIG(ESP32_ETHERNET_SPI_HOST, &devcfg);
158161
dm9051_config.int_gpio_num = ESP32_ETHERNET_SPI_INT_GPIO;
159162
esp_eth_mac_t *mac = esp_eth_mac_new_dm9051(&dm9051_config, &mac_config);
160163
esp_eth_phy_t *phy = esp_eth_phy_new_dm9051(&phy_config);
@@ -172,7 +175,7 @@ esp_err_t NF_ESP32_InitialiseEthernet(uint8_t *pMacAdr)
172175
.queue_size = 20};
173176

174177
// w5500 ethernet driver is based on spi driver
175-
eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(CONFIG_EXAMPLE_ETH_SPI_HOST, &devcfg);
178+
eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(ESP32_ETHERNET_SPI_HOST, &devcfg);
176179
w5500_config.int_gpio_num = ESP32_ETHERNET_SPI_INT_GPIO;
177180
esp_eth_mac_t *mac = esp_eth_mac_new_w5500(&w5500_config, &mac_config);
178181
esp_eth_phy_t *phy = esp_eth_phy_new_w5500(&phy_config);
@@ -189,7 +192,7 @@ esp_err_t NF_ESP32_InitialiseEthernet(uint8_t *pMacAdr)
189192
.queue_size = 20};
190193

191194
// enj28j60 ethernet driver is based on spi driver
192-
eth_dm9051_config_t enj28j60_config = ETH_ENJ28J60_DEFAULT_CONFIG(CONFIG_EXAMPLE_ETH_SPI_HOST, &devcfg);
195+
eth_dm9051_config_t enj28j60_config = ETH_ENJ28J60_DEFAULT_CONFIG(ESP32_ETHERNET_SPI_HOST, &devcfg);
193196
enj28j60_config.int_gpio_num = ESP32_ETHERNET_SPI_INT_GPIO;
194197
esp_eth_mac_t *mac = esp_eth_mac_new_enj28j60(&enj28j60_config, &mac_config);
195198

0 commit comments

Comments
 (0)