|
|
@@ -346,162 +346,6 @@ STATIC mp_obj_t wlan_ifconfig(size_t n_args, const mp_obj_t *args) {
|
|
|
}
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_ifconfig_obj, 1, 2, wlan_ifconfig);
|
|
|
|
|
|
-//STATIC mp_obj_t wlan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
|
|
-// if (n_args != 1 && kwargs->used != 0) {
|
|
|
-// mp_raise_TypeError("either pos or kw args are allowed");
|
|
|
-// }
|
|
|
-
|
|
|
-// wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
|
|
|
-// union {
|
|
|
-// struct station_config sta;
|
|
|
-// struct softap_config ap;
|
|
|
-// } cfg;
|
|
|
-
|
|
|
-// if (self->if_id == STATION_IF) {
|
|
|
-// error_check(wifi_station_get_config(&cfg.sta), "can't get STA config");
|
|
|
-// } else {
|
|
|
-// error_check(wifi_softap_get_config(&cfg.ap), "can't get AP config");
|
|
|
-// }
|
|
|
-
|
|
|
-// int req_if = -1;
|
|
|
-
|
|
|
-// if (kwargs->used != 0) {
|
|
|
-
|
|
|
-// for (mp_uint_t i = 0; i < kwargs->alloc; i++) {
|
|
|
-// if (mp_map_slot_is_filled(kwargs, i)) {
|
|
|
-// #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
|
|
|
-// switch ((uintptr_t)kwargs->table[i].key) {
|
|
|
-// case QS(MP_QSTR_mac): {
|
|
|
-// mp_buffer_info_t bufinfo;
|
|
|
-// mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
|
|
|
-// if (bufinfo.len != 6) {
|
|
|
-// mp_raise_ValueError("invalid buffer length");
|
|
|
-// }
|
|
|
-// wifi_set_macaddr(self->if_id, bufinfo.buf);
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// case QS(MP_QSTR_essid): {
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// size_t len;
|
|
|
-// const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
|
|
|
-// len = MIN(len, sizeof(cfg.ap.ssid));
|
|
|
-// memcpy(cfg.ap.ssid, s, len);
|
|
|
-// cfg.ap.ssid_len = len;
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// case QS(MP_QSTR_hidden): {
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// case QS(MP_QSTR_authmode): {
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// case QS(MP_QSTR_password): {
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// size_t len;
|
|
|
-// const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
|
|
|
-// len = MIN(len, sizeof(cfg.ap.password) - 1);
|
|
|
-// memcpy(cfg.ap.password, s, len);
|
|
|
-// cfg.ap.password[len] = 0;
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// case QS(MP_QSTR_channel): {
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// case QS(MP_QSTR_dhcp_hostname): {
|
|
|
-// req_if = STATION_IF;
|
|
|
-// if (self->if_id == STATION_IF) {
|
|
|
-// const char *s = mp_obj_str_get_str(kwargs->table[i].value);
|
|
|
-// wifi_station_set_hostname((char*)s);
|
|
|
-// }
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// default:
|
|
|
-// goto unknown;
|
|
|
-// }
|
|
|
-// #undef QS
|
|
|
-// }
|
|
|
-// }
|
|
|
-
|
|
|
-// // We post-check interface requirements to save on code size
|
|
|
-// if (req_if >= 0) {
|
|
|
-// require_if(args[0], req_if);
|
|
|
-// }
|
|
|
-
|
|
|
-// if (self->if_id == STATION_IF) {
|
|
|
-// error_check(wifi_station_set_config(&cfg.sta), "can't set STA config");
|
|
|
-// } else {
|
|
|
-// error_check(wifi_softap_set_config(&cfg.ap), "can't set AP config");
|
|
|
-// }
|
|
|
-
|
|
|
-// return mp_const_none;
|
|
|
-// }
|
|
|
-
|
|
|
-// // Get config
|
|
|
-
|
|
|
-// if (n_args != 2) {
|
|
|
-// mp_raise_TypeError("can query only one param");
|
|
|
-// }
|
|
|
-
|
|
|
-// mp_obj_t val;
|
|
|
-
|
|
|
-// qstr key = mp_obj_str_get_qstr(args[1]);
|
|
|
-// switch (key) {
|
|
|
-// case MP_QSTR_mac: {
|
|
|
-// uint8_t mac[6];
|
|
|
-// wifi_get_macaddr(self->if_id, mac);
|
|
|
-// return mp_obj_new_bytes(mac, sizeof(mac));
|
|
|
-// }
|
|
|
-// case MP_QSTR_essid:
|
|
|
-// if (self->if_id == STATION_IF) {
|
|
|
-// val = mp_obj_new_str((char*)cfg.sta.ssid, strlen((char*)cfg.sta.ssid));
|
|
|
-// } else {
|
|
|
-// val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len);
|
|
|
-// }
|
|
|
-// break;
|
|
|
-// case MP_QSTR_hidden:
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// val = mp_obj_new_bool(cfg.ap.ssid_hidden);
|
|
|
-// break;
|
|
|
-// case MP_QSTR_authmode:
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
|
|
|
-// break;
|
|
|
-// case MP_QSTR_channel:
|
|
|
-// req_if = SOFTAP_IF;
|
|
|
-// val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
|
|
|
-// break;
|
|
|
-// case MP_QSTR_dhcp_hostname: {
|
|
|
-// req_if = STATION_IF;
|
|
|
-// char* s = wifi_station_get_hostname();
|
|
|
-// if (s == NULL) {
|
|
|
-// val = MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
-// } else {
|
|
|
-// val = mp_obj_new_str(s, strlen(s));
|
|
|
-// }
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// default:
|
|
|
-// goto unknown;
|
|
|
-// }
|
|
|
-
|
|
|
-// // We post-check interface requirements to save on code size
|
|
|
-// if (req_if >= 0) {
|
|
|
-// require_if(args[0], req_if);
|
|
|
-// }
|
|
|
-
|
|
|
-// return val;
|
|
|
-
|
|
|
-//unknown:
|
|
|
-// mp_raise_ValueError("unknown config param");
|
|
|
-//}
|
|
|
-//STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_config_obj, 1, wlan_config);
|
|
|
-
|
|
|
STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
|
|
|
{ MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&wlan_active_obj) },
|
|
|
{ MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&wlan_connect_obj) },
|
|
|
@@ -509,7 +353,6 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
|
|
|
{ MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&wlan_status_obj) },
|
|
|
{ MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&wlan_scan_obj) },
|
|
|
{ MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&wlan_isconnected_obj) },
|
|
|
-// { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&wlan_config_obj) },
|
|
|
{ MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wlan_ifconfig_obj) },
|
|
|
|
|
|
#if MODNETWORK_INCLUDE_CONSTANTS
|
SummerGift