Cleaned up and now testing

2 files changed, 6 insertions, 63 deletions

diff --git a/ports/esp32s2/common-hal/wifi/Radio.c b/ports/esp32s2/common-hal/wifi/Radio.c
index b1f9e67e0..6203a151b 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.c
+++ b/ports/esp32s2/common-hal/wifi/Radio.c
@@ -160,76 +160,20 @@ mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self) {
         return mp_const_none;
     }
 
-    wifi_network_obj_t *apnet = m_new_obj(wifi_network_obj_t);
-    apnet->base.type = &wifi_network_type;
+    wifi_network_obj_t *ap_info = m_new_obj(wifi_network_obj_t);
+    ap_info->base.type = &wifi_network_type;
     // From esp_wifi.h, the possible return values (typos theirs):
     //    ESP_OK: succeed
     //    ESP_ERR_WIFI_CONN: The station interface don't initialized
     //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
-    if (esp_wifi_sta_get_ap_info(&self->apnet.record) != ESP_OK){
+    if (esp_wifi_sta_get_ap_info(&self->ap_info.record) != ESP_OK){
         return mp_const_none;
     } else {
-        memcpy(&apnet->record, &self->apnet.record, sizeof(wifi_ap_record_t));
-        return MP_OBJ_FROM_PTR(apnet);
+        memcpy(&ap_info->record, &self->ap_info.record, sizeof(wifi_ap_record_t));
+        return MP_OBJ_FROM_PTR(ap_info);
     }
 }
 
-mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self) {
-    if (!esp_netif_is_netif_up(self->netif)) {
-        return mp_const_none;
-    }
-
-    // Make sure the interface is in STA mode
-    if (self->sta_mode){
-        return mp_const_none;
-    }
-
-    // From esp_wifi.h, the possible return values (typos theirs):
-    //    ESP_OK: succeed
-    //    ESP_ERR_WIFI_CONN: The station interface don't initialized
-    //    ESP_ERR_WIFI_NOT_CONNECT: The station is in disconnect status
-    if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-        return mp_const_none;
-    } else {
-        return mp_obj_new_int(self->ap_info.rssi);
-    }
-}
-
-// mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self) {
-//     if (!esp_netif_is_netif_up(self->netif)) {
-//         return mp_const_none;
-//     }
-
-//     // Make sure the interface is in STA mode
-//     if (self->sta_mode){
-//         return mp_const_none;
-//     }
-
-//     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-//         return mp_const_none;
-//     } else {
-//         const char* cstr = (const char*) self->ap_info.ssid;
-//         return mp_obj_new_str(cstr, strlen(cstr));
-//     }
-// }
-
-// mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self) {
-//     if (!esp_netif_is_netif_up(self->netif)) {
-//         return mp_const_none;
-//     }
-
-//     // Make sure the interface is in STA mode
-//     if (self->sta_mode){
-//         return mp_const_none;
-//     }
-
-//     if (esp_wifi_sta_get_ap_info(&self->ap_info) != ESP_OK){
-//         return mp_const_none;
-//     } else {
-//         return mp_obj_new_bytes(self->ap_info.bssid, MAC_ADDRESS_LENGTH);
-//     }
-// }
-
 mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self) {
     if (!esp_netif_is_netif_up(self->netif)) {
         return mp_const_none;
diff --git a/ports/esp32s2/common-hal/wifi/Radio.h b/ports/esp32s2/common-hal/wifi/Radio.h
index f441096f7..c7f484eaf 100644
--- a/ports/esp32s2/common-hal/wifi/Radio.h
+++ b/ports/esp32s2/common-hal/wifi/Radio.h
@@ -47,8 +47,7 @@ typedef struct {
     StaticEventGroup_t event_group;
     EventGroupHandle_t event_group_handle;
     wifi_config_t sta_config;
-    wifi_ap_record_t ap_info;
-    wifi_network_obj_t apnet;
+    wifi_network_obj_t ap_info;
     esp_netif_ip_info_t ip_info;
     esp_netif_dns_info_t dns_info;
     esp_netif_t *netif;