Commit f5ce3f7

Jason2866pre-commit-ci-lite[bot]

and

authored

Guard ethernet parts to make it possible to use without (espressif#10609)

* Update ETH.cpp * Update ETH.h * Update WiFiGeneric.h * Update NetworkEvents.h * remove unnecessary include "sdkconfig.h" * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

1 parent 2b6b5c7 commit f5ce3f7Copy full SHA for f5ce3f7

File tree

4 files changed

+14

-1

lines changed

libraries
- Ethernet/src
  - ETH.cpp
  - ETH.h
- Network/src
  - NetworkEvents.h
- WiFi/src
  - WiFiGeneric.h

4 files changed

+14

-1

lines changed

`‎libraries/Ethernet/src/ETH.cpp‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#define ARDUINO_CORE_BUILD`
`23`	`23`
`24`	`24`	`#include "ETH.h"`
	`25`	`+#if CONFIG_ETH_ENABLED`
`25`	`26`	`#include "esp_system.h"`
`26`	`27`	`#include "esp_event.h"`
`27`	`28`	`#include "esp_eth.h"`
`@@ -1056,3 +1057,5 @@ size_t ETHClass::printDriverInfo(Print &out) const {`
`1056`	`1057`	`}`
`1057`	`1058`
`1058`	`1059`	`ETHClass ETH;`
	`1060`	`+`
	`1061`	`+#endif /* CONFIG_ETH_ENABLED */`

`‎libraries/Ethernet/src/ETH.h‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`19`	`19`	`*/`
`20`	`20`
	`21`	`+#include "sdkconfig.h"`
	`22`	`+#if CONFIG_ETH_ENABLED`
	`23`	`+`
`21`	`24`	`#ifndef _ETH_H_`
`22`	`25`	`#define _ETH_H_`
`23`	`26`
`@@ -249,3 +252,4 @@ class ETHClass : public NetworkInterface {`
`249`	`252`	`extern ETHClass ETH;`
`250`	`253`
`251`	`254`	`#endif /* _ETH_H_ */`
	`255`	`+#endif /* CONFIG_ETH_ENABLED */`

`‎libraries/Network/src/NetworkEvents.h‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,20 @@`
`5`	`5`	`*/`
`6`	`6`	`#pragma once`
`7`	`7`
	`8`	`+#include "sdkconfig.h"`
`8`	`9`	`#include "soc/soc_caps.h"`
`9`	`10`	`#include "esp_err.h"`
`10`	`11`	`#include "esp_event.h"`
`11`	`12`	`#include "esp_netif_types.h"`
	`13`	`+#if CONFIG_ETH_ENABLED`
`12`	`14`	`#include "esp_eth_driver.h"`
	`15`	`+#endif`
`13`	`16`	`#include <functional>`
`14`	`17`	`#include "freertos/FreeRTOS.h"`
`15`	`18`	`#include "freertos/task.h"`
`16`	`19`	`#include "freertos/queue.h"`
`17`	`20`	`#include "freertos/semphr.h"`
`18`	`21`	`#include "freertos/event_groups.h"`
`19`		`-#include "sdkconfig.h"`
`20`	`22`	`#if defined NETWORK_EVENTS_MUTEX && SOC_CPU_CORES_NUM > 1`
`21`	`23`	`#include <mutex>`
`22`	`24`	`#endif // defined NETWORK_EVENTS_MUTEX && SOC_CPU_CORES_NUM > 1`
`@@ -98,7 +100,9 @@ typedef union {`
`98`	`100`	`ip_event_ap_staipassigned_t wifi_ap_staipassigned;`
`99`	`101`	`ip_event_got_ip_t got_ip;`
`100`	`102`	`ip_event_got_ip6_t got_ip6;`
	`103`	`+#if CONFIG_ETH_ENABLED`
`101`	`104`	`esp_eth_handle_t eth_connected;`
	`105`	`+#endif`
`102`	`106`	`#if SOC_WIFI_SUPPORTED \|\| CONFIG_ESP_WIFI_REMOTE_ENABLED`
`103`	`107`	`wifi_event_sta_scan_done_t wifi_scan_done;`
`104`	`108`	`wifi_event_sta_authmode_change_t wifi_sta_authmode_change;`

`‎libraries/WiFi/src/WiFiGeneric.h‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,9 @@`
`33`	`33`	`#include "IPAddress.h"`
`34`	`34`	`#include "esp_smartconfig.h"`
`35`	`35`	`#include "esp_netif_types.h"`
	`36`	`+#if CONFIG_ETH_ENABLED`
`36`	`37`	`#include "esp_eth_driver.h"`
	`38`	`+#endif`
`37`	`39`	`#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI`
`38`	`40`	`#include "network_provisioning/manager.h"`
`39`	`41`	`#endif`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f5ce3f7

File tree

4 files changed

4 files changed

`‎libraries/Ethernet/src/ETH.cpp‎`

`‎libraries/Ethernet/src/ETH.h‎`

`‎libraries/Network/src/NetworkEvents.h‎`

`‎libraries/WiFi/src/WiFiGeneric.h‎`

0 commit comments