Skip to content

Commit 2f2c0a1

Browse files
author
Daniel Campora
committed
cc3200: Clean up WLAN API. Make WLAN.info() an attrtuple.
1 parent 622f241 commit 2f2c0a1

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

cc3200/mods/modwlan.c

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,11 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) {
227227
}
228228
break;
229229
case SL_WLAN_DISCONNECT_EVENT:
230-
{
231230
CLR_STATUS_BIT(wlan_obj.status, STATUS_BIT_CONNECTION);
232231
CLR_STATUS_BIT(wlan_obj.status, STATUS_BIT_IP_ACQUIRED);
232+
#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
233233
servers_reset();
234-
}
234+
#endif
235235
break;
236236
case SL_WLAN_STA_CONNECTED_EVENT:
237237
{
@@ -245,7 +245,9 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) {
245245
break;
246246
case SL_WLAN_STA_DISCONNECTED_EVENT:
247247
wlan_obj.staconnected = false;
248+
#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
248249
servers_reset();
250+
#endif
249251
break;
250252
case SL_WLAN_P2P_DEV_FOUND_EVENT:
251253
// TODO
@@ -1002,15 +1004,20 @@ STATIC mp_obj_t wlan_callback (mp_uint_t n_args, const mp_obj_t *pos_args, mp_ma
10021004
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wlan_callback_obj, 1, wlan_callback);
10031005

10041006
/// \method info()
1005-
/// returns (mode, security, ssid/name, mac)
1007+
/// returns (mode, ssid, security, mac)
10061008
STATIC mp_obj_t wlan_info (mp_obj_t self_in) {
1007-
mp_obj_t info[4];
1008-
info[0] = mp_obj_new_int(wlan_obj.mode);
1009-
info[1] = mp_obj_new_int(wlan_obj.security);
1010-
info[2] = wlan_obj.mode != ROLE_STA ?
1009+
STATIC const qstr wlan_info_fields[] = {
1010+
MP_QSTR_mode, MP_QSTR_ssid,
1011+
MP_QSTR_security, MP_QSTR_mac
1012+
};
1013+
1014+
mp_obj_t wlan_info[4];
1015+
wlan_info[0] = mp_obj_new_int(wlan_obj.mode);
1016+
wlan_info[1] = wlan_obj.mode != ROLE_STA ?
10111017
mp_obj_new_str((const char *)wlan_obj.ssid, strlen((const char *)wlan_obj.ssid), false) : MP_OBJ_NEW_QSTR(MP_QSTR_);
1012-
info[3] = mp_obj_new_bytes((const byte *)wlan_obj.mac, SL_BSSID_LENGTH);
1013-
return mp_obj_new_tuple(MP_ARRAY_SIZE(info), info);
1018+
wlan_info[2] = mp_obj_new_int(wlan_obj.security);
1019+
wlan_info[3] = mp_obj_new_bytes((const byte *)wlan_obj.mac, SL_BSSID_LENGTH);
1020+
return mp_obj_new_attrtuple(wlan_info_fields, MP_ARRAY_SIZE(wlan_info), wlan_info);
10141021
}
10151022
STATIC MP_DEFINE_CONST_FUN_OBJ_1(wlan_info_obj, wlan_info);
10161023

0 commit comments

Comments
 (0)