From 277ca45b1972838ba5dffdcca87ce24cd2b72ddb Mon Sep 17 00:00:00 2001 From: Nick Moore Date: Sun, 1 Oct 2017 13:34:33 +1100 Subject: [PATCH 1/2] ports/esp32/modnetwork.c: Add protocol to network.WLAN().config and MODE_LR constant. The config function still needs some work --- ports/esp32/modnetwork.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c index 59af7aea0..aef41ce55 100644 --- a/ports/esp32/modnetwork.c +++ b/ports/esp32/modnetwork.c @@ -402,6 +402,10 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs ESP_EXCEPTIONS(esp_wifi_set_mac(self->if_id, bufinfo.buf)); break; } + case QS(MP_QSTR_protocol): { + esp_wifi_set_protocol(self->if_id, mp_obj_get_int(kwargs->table[i].value)); + break; + } case QS(MP_QSTR_essid): { req_if = WIFI_IF_AP; mp_uint_t len; @@ -545,6 +549,8 @@ STATIC const mp_map_elem_t mp_module_network_globals_table[] = { MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11G) }, { MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11N), MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11N) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_MODE_LR), + MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_LR) }, { MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_OPEN), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_OPEN) }, From 68a470133add185a8170e48ab029ae151cc804be Mon Sep 17 00:00:00 2001 From: Nick Moore Date: Sat, 7 Oct 2017 17:44:59 +1100 Subject: [PATCH 2/2] ports/esp32/modnetwork.c: Add config('protocol') getter and exception handler --- ports/esp32/modnetwork.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c index aef41ce55..735e7d275 100644 --- a/ports/esp32/modnetwork.c +++ b/ports/esp32/modnetwork.c @@ -403,7 +403,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs break; } case QS(MP_QSTR_protocol): { - esp_wifi_set_protocol(self->if_id, mp_obj_get_int(kwargs->table[i].value)); + ESP_EXCEPTIONS(esp_wifi_set_protocol(self->if_id, mp_obj_get_int(kwargs->table[i].value))); break; } case QS(MP_QSTR_essid): { @@ -472,6 +472,11 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs ESP_EXCEPTIONS(esp_wifi_get_mac(self->if_id, mac)); return mp_obj_new_bytes(mac, sizeof(mac)); } + case QS(MP_QSTR_protocol): { + uint8_t protocol_bitmap; + ESP_EXCEPTIONS(esp_wifi_get_protocol(self->if_id, &protocol_bitmap)); + return mp_obj_new_int(protocol_bitmap); + } case QS(MP_QSTR_essid): req_if = WIFI_IF_AP; val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len, false);