Cleaned up and now testing

2 files changed, 1 insertions, 55 deletions

diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index d75532769..450331009 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -163,54 +163,6 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect);
 
-//|     ap_rssi: int
-//|     """RSSI of the currently connected AP. Returns none if not connected"""
-//|
-STATIC mp_obj_t wifi_radio_get_ap_rssi(mp_obj_t self) {
-    return common_hal_wifi_radio_get_ap_rssi(self);
-
-}
-MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_rssi_obj, wifi_radio_get_ap_rssi);
-
-const mp_obj_property_t wifi_radio_ap_rssi_obj = {
-    .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&wifi_radio_get_ap_rssi_obj,
-               (mp_obj_t)&mp_const_none_obj,
-               (mp_obj_t)&mp_const_none_obj },
-};
-
-// //|     ap_ssid: int
-// //|     """SSID of the currently connected AP. Returns none if not connected"""
-// //|
-// STATIC mp_obj_t wifi_radio_get_ap_ssid(mp_obj_t self) {
-//     return common_hal_wifi_radio_get_ap_ssid(self);
-
-// }
-// MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_ssid_obj, wifi_radio_get_ap_ssid);
-
-// const mp_obj_property_t wifi_radio_ap_ssid_obj = {
-//     .base.type = &mp_type_property,
-//     .proxy = { (mp_obj_t)&wifi_radio_get_ap_ssid_obj,
-//                (mp_obj_t)&mp_const_none_obj,
-//                (mp_obj_t)&mp_const_none_obj },
-// };
-
-// //|     ap_bssid: int
-// //|     """BSSID (usually MAC) of the currently connected AP. Returns none if not connected"""
-// //|
-// STATIC mp_obj_t wifi_radio_get_ap_bssid(mp_obj_t self) {
-//     return common_hal_wifi_radio_get_ap_bssid(self);
-
-// }
-// MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_bssid_obj, wifi_radio_get_ap_bssid);
-
-// const mp_obj_property_t wifi_radio_ap_bssid_obj = {
-//     .base.type = &mp_type_property,
-//     .proxy = { (mp_obj_t)&wifi_radio_get_ap_bssid_obj,
-//                (mp_obj_t)&mp_const_none_obj,
-//                (mp_obj_t)&mp_const_none_obj },
-// };
-
 //|     ipv4_gateway: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the gateway when connected to an access point. None otherwise."""
 //|
@@ -276,7 +228,7 @@ const mp_obj_property_t wifi_radio_ipv4_dns_obj = {
 };
 
 //|     ap_info: Optional[Network]
-//|     """None otherwise."""
+//|     """Network object containing BSSID, SSID, channel, and RSSI when connected to an access point. None otherwise."""
 //|
 STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) {
     return common_hal_wifi_radio_get_ap_info(self);
@@ -332,9 +284,6 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise),    MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ap_info),    MP_ROM_PTR(&wifi_radio_ap_info_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ap_rssi),    MP_ROM_PTR(&wifi_radio_ap_rssi_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_ap_ssid),    MP_ROM_PTR(&wifi_radio_ap_ssid_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_ap_bssid),    MP_ROM_PTR(&wifi_radio_ap_bssid_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_dns),    MP_ROM_PTR(&wifi_radio_ipv4_dns_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_gateway),    MP_ROM_PTR(&wifi_radio_ipv4_gateway_obj) },
     { MP_ROM_QSTR(MP_QSTR_ipv4_subnet),    MP_ROM_PTR(&wifi_radio_ipv4_subnet_obj) },
diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h
index 6dca40c56..38cc93337 100644
--- a/shared-bindings/wifi/Radio.h
+++ b/shared-bindings/wifi/Radio.h
@@ -54,9 +54,6 @@ extern void common_hal_wifi_radio_stop_scanning_networks(wifi_radio_obj_t *self)
 extern wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t* ssid, size_t ssid_len, uint8_t* password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t* bssid, size_t bssid_len);
 
 extern mp_obj_t common_hal_wifi_radio_get_ap_info(wifi_radio_obj_t *self);
-extern mp_obj_t common_hal_wifi_radio_get_ap_rssi(wifi_radio_obj_t *self);
-// extern mp_obj_t common_hal_wifi_radio_get_ap_ssid(wifi_radio_obj_t *self);
-// extern mp_obj_t common_hal_wifi_radio_get_ap_bssid(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_gateway(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_ipv4_subnet(wifi_radio_obj_t *self);