diff options
| author | Mirko Vogt <mirko.vogt@sensorberg.com> | 2020-09-16 23:57:40 +0000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2020-09-18 15:57:21 +1000 |
| commit | ecb36d243915958e118a2c1d6b4bef8b490f0bc0 (patch) | |
| tree | 913d4c9b0ec77c444584a613537d8d80f9acb04e | |
| parent | 52d6eeb409e0d4ff3a1fd6811f75b4953912eb38 (diff) | |
| download | micropython-ecb36d243915958e118a2c1d6b4bef8b490f0bc0.tar.gz micropython-ecb36d243915958e118a2c1d6b4bef8b490f0bc0.zip | |
esp32/modnetwork: Re-enable PPP support for IDF-SDK >=v4.
PPP support was disabled in 96008ff59a8af9883af17d01b951029d9d02eec9 -
marked as "unsupported" due to an early IDF v4 release. With the currently
supported IDF v4.x version - 4c81978a - it appears to be working just fine.
| -rw-r--r-- | ports/esp32/modnetwork.c | 2 | ||||
| -rw-r--r-- | ports/esp32/network_ppp.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c index 325b27f74b..029a8d1431 100644 --- a/ports/esp32/modnetwork.c +++ b/ports/esp32/modnetwork.c @@ -755,8 +755,8 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) }, #if !MICROPY_ESP_IDF_4 { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&get_lan_obj) }, - { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) }, #endif + { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) }, { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_phy_mode_obj) }, #if MODNETWORK_INCLUDE_CONSTANTS diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c index c3046c9fc7..df57b81725 100644 --- a/ports/esp32/network_ppp.c +++ b/ports/esp32/network_ppp.c @@ -26,7 +26,6 @@ * THE SOFTWARE. */ -#if !MICROPY_ESP_IDF_4 #include "py/runtime.h" #include "py/mphal.h" #include "py/objtype.h" @@ -284,5 +283,3 @@ const mp_obj_type_t ppp_if_type = { .name = MP_QSTR_PPP, .locals_dict = (mp_obj_dict_t *)&ppp_if_locals_dict, }; - -#endif // !MICROPY_ESP_IDF_4 |