Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

esp32/modnetwork.c: Report SSID values as strings. #50

Closed
wants to merge 3 commits into from
Closed

esp32/modnetwork.c: Report SSID values as strings. #50

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7daf649
esp32/modnetwork.c: Report SSID names as strings
StopHacking Mar 16, 2017
bcdf355
esp32/modnetwork.c: Report SSID names as strings.
StopHacking Mar 16, 2017
edd936b
Merge branch 'esp32' of https://github.com/StopHacking/micropython-es…
StopHacking Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions esp32/modnetwork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
mp_obj_tuple_t *t = mp_obj_new_tuple(6, NULL);
uint8_t *x = memchr(wifi_ap_records[i].ssid, 0, sizeof(wifi_ap_records[i].ssid));
int ssid_len = x ? x - wifi_ap_records[i].ssid : sizeof(wifi_ap_records[i].ssid);
t->items[0] = mp_obj_new_bytes(wifi_ap_records[i].ssid, ssid_len);
t->items[0] = mp_obj_new_str((char*)wifi_ap_records[i].ssid, ssid_len, false);
t->items[1] = mp_obj_new_bytes(wifi_ap_records[i].bssid, sizeof(wifi_ap_records[i].bssid));
t->items[2] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].primary);
t->items[3] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].rssi);
Expand Down Expand Up @@ -455,8 +455,14 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
return mp_obj_new_bytes(mac, sizeof(mac));
}
case QS(MP_QSTR_essid):
req_if = WIFI_IF_AP;
val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len, false);
if (self->if_id == WIFI_IF_STA) {
uint8_t *x = memchr(wifi_sta_config.sta.ssid, 0, sizeof(wifi_sta_config.sta.ssid));
int ssid_len = x ? x - wifi_sta_config.sta.ssid : sizeof(wifi_sta_config.sta.ssid);
val = mp_obj_new_str((char*)wifi_sta_config.sta.ssid, ssid_len, false);
} else {
req_if = WIFI_IF_AP;
val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len, false);
}
break;
case QS(MP_QSTR_hidden):
req_if = WIFI_IF_AP;
Expand Down