8000 esp32/network_wlan: Rename WLAN keyword args to ssid/security/key. · micropython/micropython@a7c7feb · GitHub
[go: up one dir, main page]

Skip to content

Commit a7c7feb

Browse files
iabdalkaderdpgeorge
authored andcommitted
esp32/network_wlan: Rename WLAN keyword args to ssid/security/key.
The WLAN.config() method now supports "ssid", "security" and "key" as aliases to the existing "essid", "authmode" and "password", which are now deprecated. Addresses issue #8083.
1 parent efa73ca commit a7c7feb

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ports/esp32/network_wlan.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
218218
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_wlan_active_obj, 1, 2, network_wlan_active);
219219

220220
STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
221-
enum { ARG_ssid, ARG_password, ARG_bssid };
221+
enum { ARG_ssid, ARG_key, ARG_bssid };
222222
static const mp_arg_t allowed_args[] = {
223223
{ MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
224224
{ MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -239,8 +239,8 @@ STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp
239239
p = mp_obj_str_get_data(args[ARG_ssid].u_obj, &len);
240240
memcpy(wifi_sta_config.sta.ssid, p, MIN(len, sizeof(wifi_sta_config.sta.ssid)));
241241
}
242-
if (args[ARG_password].u_obj != mp_const_none) {
243-
p = mp_obj_str_get_data(args[ARG_password].u_obj, &len);
242+
if (args[ARG_key].u_obj != mp_const_none) {
243+
p = mp_obj_str_get_data(args[ARG_key].u_obj, &len);
244244
memcpy(wifi_sta_config.sta.password, p, MIN(len, sizeof(wifi_sta_config.sta.password)));
245245
}
246246
if (args[ARG_bssid].u_obj != mp_const_none) {
@@ -410,6 +410,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
410410
esp_exceptions(esp_wifi_set_mac(self->if_id, bufinfo.buf));
411411
break;
412412
}
413+
case MP_QSTR_ssid:
413414
case MP_QSTR_essid: {
414415
req_if = WIFI_IF_AP;
415416
size_t len;
@@ -424,11 +425,13 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
424425
cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
425426
break;
426427
}
428+
case MP_QSTR_security:
427429
case MP_QSTR_authmode: {
428430
req_if = WIFI_IF_AP;
429431
cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
430432
break;
431433
}
434+
case MP_QSTR_key:
432435
case MP_QSTR_password: {
433436
req_if = WIFI_IF_AP;
434437
size_t len;
@@ -503,6 +506,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
503506
goto unknown;
504507
}
505508
}
509+
case MP_QSTR_ssid:
506510
case MP_QSTR_essid:
507511
switch (self->if_id) {
508512
case WIFI_IF_STA:
@@ -519,6 +523,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
519523
req_if = WIFI_IF_AP;
520524
val = mp_obj_new_bool(cfg.ap.ssid_hidden);
521525
4E74 break;
526+
case MP_QSTR_security:
522527
case MP_QSTR_authmode:
523528
req_if = WIFI_IF_AP;
524529
val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);

0 commit comments

Comments
 (0)
0