riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13004 from gschorcht/cpu/esp/lwip_default_esp_wifi

Browse Source 
cpu/esp*: esp_wifi used as default netdev for lwip
This commit is contained in:
benpicco 2020-01-11 13:16:40 +01:00 committed by GitHub
commit ab246a853d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpu/esp32/Makefile.include
View File

@ -42,10 +42,17 @@ ifneq (,$(filter esp_gdbstub,$(USEMODULE)))
endif endif
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
# use esp_now as default netdev if no other netdev module is enabled ifneq (,$(filter lwip,$(USEMODULE)))
# for lwip, use esp_wifi as default netdev if no other netdev is enabled
ifeq (,$(filter esp_eth,$(USEMODULE)))
USEMODULE += esp_wifi
endif
else
# otherwise use esp_now as default netdev if no other netdev is enabled
ifeq (,$(filter esp_wifi esp_eth,$(USEMODULE))) ifeq (,$(filter esp_wifi esp_eth,$(USEMODULE)))
USEMODULE += esp_now USEMODULE += esp_now
endif endif
endif
endif endif
ifneq (,$(filter esp_now,$(USEMODULE))) ifneq (,$(filter esp_now,$(USEMODULE)))

7
cpu/esp8266/Makefile.include
View File

@ -20,10 +20,15 @@ endif
# cannot be done in Makefile.dep since Makefile.dep is included too late # cannot be done in Makefile.dep since Makefile.dep is included too late
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
# use esp_now as default netdev if no other netdev module is enabled ifneq (,$(filter lwip,$(USEMODULE)))
# for lwip, use esp_wifi as default netdev if no other netdev is enabled
USEMODULE += esp_wifi
else
# otherwise use esp_now as default netdev if no other netdev is enabled
ifeq (,$(filter esp_wifi esp_eth,$(USEMODULE))) ifeq (,$(filter esp_wifi esp_eth,$(USEMODULE)))
USEMODULE += esp_now USEMODULE += esp_now
endif endif
endif
endif endif
ifneq (, $(filter esp_wifi, $(USEMODULE))) ifneq (, $(filter esp_wifi, $(USEMODULE)))