diff options
| author | Carlosgg <carlosgilglez@gmail.com> | 2023-06-25 22:48:39 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-07-11 15:58:15 +1000 |
| commit | 1f35576a69e626bd9801f0e9ca6aa117405a39fc (patch) | |
| tree | d06fadc29037dca60bb530ce2fde00cdaa800f0f | |
| parent | 7bced2eaece1033cde8d6169555956214e92b542 (diff) | |
esp32: Re-enable mDNS after move to IDF v5.0.2.
mDNS was disabled in e4650125b88a35f074097f16d84a8f49bd22ac06. This commit
re-enables it.
For reference see:
https://docs.espressif.com/projects/esp-idf/en/latest/esp32/migration-guides/release-5.x/5.0/removed-components.html
Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
| -rw-r--r-- | ports/esp32/main_esp32/idf_component.yml | 5 | ||||
| -rw-r--r-- | ports/esp32/main_esp32c3/idf_component.yml | 5 | ||||
| -rw-r--r-- | ports/esp32/main_esp32s2/idf_component.yml | 3 | ||||
| -rw-r--r-- | ports/esp32/main_esp32s3/idf_component.yml | 3 | ||||
| -rw-r--r-- | ports/esp32/modsocket.c | 4 | ||||
| -rw-r--r-- | ports/esp32/mpconfigport.h | 4 | ||||
| -rw-r--r-- | ports/esp32/network_wlan.c | 4 |
7 files changed, 24 insertions, 4 deletions
diff --git a/ports/esp32/main_esp32/idf_component.yml b/ports/esp32/main_esp32/idf_component.yml new file mode 100644 index 000000000..8be21ed2f --- /dev/null +++ b/ports/esp32/main_esp32/idf_component.yml @@ -0,0 +1,5 @@ +## IDF Component Manager Manifest File +dependencies: + espressif/mdns: "~1.1.0" + idf: + version: ">=5.0.2" diff --git a/ports/esp32/main_esp32c3/idf_component.yml b/ports/esp32/main_esp32c3/idf_component.yml new file mode 100644 index 000000000..8be21ed2f --- /dev/null +++ b/ports/esp32/main_esp32c3/idf_component.yml @@ -0,0 +1,5 @@ +## IDF Component Manager Manifest File +dependencies: + espressif/mdns: "~1.1.0" + idf: + version: ">=5.0.2" diff --git a/ports/esp32/main_esp32s2/idf_component.yml b/ports/esp32/main_esp32s2/idf_component.yml index fe3213bd2..69e27bf8b 100644 --- a/ports/esp32/main_esp32s2/idf_component.yml +++ b/ports/esp32/main_esp32s2/idf_component.yml @@ -1,5 +1,6 @@ ## IDF Component Manager Manifest File dependencies: + espressif/mdns: "~1.1.0" + espressif/esp_tinyusb: "~1.0.0" idf: version: ">=5.0.2" - espressif/esp_tinyusb: "~1.0.0" diff --git a/ports/esp32/main_esp32s3/idf_component.yml b/ports/esp32/main_esp32s3/idf_component.yml index fe3213bd2..69e27bf8b 100644 --- a/ports/esp32/main_esp32s3/idf_component.yml +++ b/ports/esp32/main_esp32s3/idf_component.yml @@ -1,5 +1,6 @@ ## IDF Component Manager Manifest File dependencies: + espressif/mdns: "~1.1.0" + espressif/esp_tinyusb: "~1.0.0" idf: version: ">=5.0.2" - espressif/esp_tinyusb: "~1.0.0" diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c index 7484fce78..ba1fe096f 100644 --- a/ports/esp32/modsocket.c +++ b/ports/esp32/modsocket.c @@ -58,6 +58,10 @@ #define MDNS_QUERY_TIMEOUT_MS (5000) #define MDNS_LOCAL_SUFFIX ".local" +#ifndef NO_QSTR +#include "mdns.h" +#endif + enum { SOCKET_STATE_NEW, SOCKET_STATE_CONNECTED, diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index b18681bb5..e97980c36 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -221,11 +221,11 @@ typedef long mp_off_t; #endif #ifndef MICROPY_HW_ENABLE_MDNS_QUERIES -#define MICROPY_HW_ENABLE_MDNS_QUERIES (0) +#define MICROPY_HW_ENABLE_MDNS_QUERIES (1) #endif #ifndef MICROPY_HW_ENABLE_MDNS_RESPONDER -#define MICROPY_HW_ENABLE_MDNS_RESPONDER (0) +#define MICROPY_HW_ENABLE_MDNS_RESPONDER (1) #endif #ifndef MICROPY_BOARD_STARTUP diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c index cfedd898c..3c88f8db8 100644 --- a/ports/esp32/network_wlan.c +++ b/ports/esp32/network_wlan.c @@ -42,6 +42,10 @@ #include "esp_wifi.h" #include "esp_log.h" +#ifndef NO_QSTR +#include "mdns.h" +#endif + #if MICROPY_PY_NETWORK_WLAN #if (WIFI_MODE_STA & WIFI_MODE_AP != WIFI_MODE_NULL || WIFI_MODE_STA | WIFI_MODE_AP != WIFI_MODE_APSTA) |