Skip to content

Commit cd3f252

Browse files
author
Daniel Campora
committed
cc3200: Disable WLAN.urn() by default.
Can be enabled by defining MICROPY_PORT_WLAN_URN=1 in mpconfigport.h.
1 parent a379b6e commit cd3f252

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎cc3200/mods/modwlan.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ typedef struct _wlan_obj_t {
124124

125125
#define MODWLAN_TIMEOUT_MS 5000
126126
#define MODWLAN_MAX_NETWORKS 20
127-
#define MODWLAN_SCAN_PERIOD_S 300 // 5 minutes
127+
#define MODWLAN_SCAN_PERIOD_S 3600 // 1 hour
128128
#define MODWLAN_WAIT_FOR_SCAN_MS 1050
129129

130130
#define ASSERT_ON_ERROR( x ) ASSERT((x) >= 0 )
@@ -850,6 +850,7 @@ STATIC mp_obj_t wlan_ifconfig (mp_obj_t self_in) {
850850
}
851851
STATIC MP_DEFINE_CONST_FUN_OBJ_1(wlan_ifconfig_obj, wlan_ifconfig);
852852

853+
#if MICROPY_PORT_WLAN_URN
853854
STATIC mp_obj_t wlan_urn (uint n_args, const mp_obj_t *args) {
854855
char urn[MAX_DEVICE_URN_LEN];
855856
uint8_t len = MAX_DEVICE_URN_LEN;
@@ -880,6 +881,7 @@ STATIC mp_obj_t wlan_urn (uint n_args, const mp_obj_t *args) {
880881
return mp_const_none;
881882
}
882883
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_urn_obj, 1, 2, wlan_urn);
884+
#endif
883885

884886
/// \method wlan_netlist()
885887
/// Return a list of tuples with all the acces points within range
@@ -1037,7 +1039,9 @@ STATIC const mp_map_elem_t wlan_locals_dict_table[] = {
10371039
{ MP_OBJ_NEW_QSTR(MP_QSTR_disconnect), (mp_obj_t)&wlan_disconnect_obj },
10381040
{ MP_OBJ_NEW_QSTR(MP_QSTR_isconnected), (mp_obj_t)&wlan_isconnected_obj },
10391041
{ MP_OBJ_NEW_QSTR(MP_QSTR_ifconfig), (mp_obj_t)&wlan_ifconfig_obj },
1042+
#if MICROPY_PORT_WLAN_URN
10401043
{ MP_OBJ_NEW_QSTR(MP_QSTR_urn), (mp_obj_t)&wlan_urn_obj },
1044+
#endif
10411045
{ MP_OBJ_NEW_QSTR(MP_QSTR_callback), (mp_obj_t)&wlan_callback_obj },
10421046
{ MP_OBJ_NEW_QSTR(MP_QSTR_config_ip), (mp_obj_t)&wlan_config_ip_obj },
10431047

‎cc3200/mods/pybpin.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ STATIC void EXTI_Handler(uint port) {
754754
uint32_t bits = MAP_GPIOIntStatus(port, true);
755755
MAP_GPIOIntClear(port, bits);
756756

757-
// might be that we have more than one Pin interrupt triggered at the same time
757+
// might be that we have more than one Pin interrupt pending
758758
// therefore we must loop through all of the 8 possible bits
759759
for (int i = 0; i < 8; i++) {
760760
uint32_t bit = (1 << i);

‎cc3200/mpconfigport.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len);
183183
#define MICROPY_HAL_H "cc3200_hal.h"
184184
#define MICROPY_PORT_HAS_TELNET (1)
185185
#define MICROPY_PORT_HAS_FTP (1)
186+
#define MICROPY_PORT_WLAN_URN (0)
186187
#define MICROPY_PY_SYS_PLATFORM "WiPy"
187188

188189
#define MICROPY_PORT_WLAN_AP_SSID "wipy-wlan"

0 commit comments

Comments
 (0)