djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266: Support synchronous wifi scanning.

Browse Source 
That is: aps = if0.scan()

TODO: make sure that returned list has tuple with values in "standard"
order (whatever that standard is).
This commit is contained in:
Damien George 2016-03-30 11:35:03 +03:00 committed by Paul Sokolovsky
parent 2599672384
commit 9475cc59e6
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esp8266/esp_mphal.h
View File

@ -44,5 +44,6 @@ uint32_t mp_hal_get_cpu_freq(void);
void uart_task_init(); void uart_task_init();
void ets_event_poll(void); void ets_event_poll(void);
#define ETS_POLL_WHILE(cond) { while (cond) ets_event_poll(); }
#endif // _INCLUDED_MPHAL_H_ #endif // _INCLUDED_MPHAL_H_

36
esp8266/modnetwork.c
View File

@ -32,12 +32,13 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/objlist.h" #include "py/objlist.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mphal.h"
#include "netutils.h" #include "netutils.h"
#include "queue.h" #include "queue.h"
#include "user_interface.h" #include "user_interface.h"
#include "espconn.h" #include "espconn.h"
#include "spi_flash.h" #include "spi_flash.h"
#include "utils.h" #include "ets_alt_task.h"
#define MODNETWORK_INCLUDE_CONSTANTS (1) #define MODNETWORK_INCLUDE_CONSTANTS (1)
@ -127,9 +128,15 @@ STATIC mp_obj_t esp_status(mp_obj_t self_in) {
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_status_obj, esp_status); STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_status_obj, esp_status);
STATIC mp_obj_t *esp_scan_list = NULL;
STATIC void esp_scan_cb(scaninfo *si, STATUS status) { STATIC void esp_scan_cb(scaninfo *si, STATUS status) {
struct bss_info *bs; if (esp_scan_list == NULL) {
if (si->pbss) { // called unexpectedly
return;
}
if (si->pbss && status == 0) {
struct bss_info *bs;
STAILQ_FOREACH(bs, si->pbss, next) { STAILQ_FOREACH(bs, si->pbss, next) {
mp_obj_tuple_t *t = mp_obj_new_tuple(6, NULL); mp_obj_tuple_t *t = mp_obj_new_tuple(6, NULL);
t->items[0] = mp_obj_new_bytes(bs->ssid, strlen((char*)bs->ssid)); t->items[0] = mp_obj_new_bytes(bs->ssid, strlen((char*)bs->ssid));
@ -138,21 +145,30 @@ STATIC void esp_scan_cb(scaninfo *si, STATUS status) {
t->items[3] = MP_OBJ_NEW_SMALL_INT(bs->rssi); t->items[3] = MP_OBJ_NEW_SMALL_INT(bs->rssi);
t->items[4] = MP_OBJ_NEW_SMALL_INT(bs->authmode); t->items[4] = MP_OBJ_NEW_SMALL_INT(bs->authmode);
t->items[5] = MP_OBJ_NEW_SMALL_INT(bs->is_hidden); t->items[5] = MP_OBJ_NEW_SMALL_INT(bs->is_hidden);
call_function_1_protected(MP_STATE_PORT(scan_cb_obj), t); mp_obj_list_append(*esp_scan_list, MP_OBJ_FROM_PTR(t));
} }
} else {
// indicate error
*esp_scan_list = MP_OBJ_NULL;
} }
esp_scan_list = NULL;
} }
STATIC mp_obj_t esp_scan(mp_obj_t self_in, mp_obj_t cb_in) { STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
MP_STATE_PORT(scan_cb_obj) = cb_in;
if (wifi_get_opmode() == SOFTAP_MODE) { if (wifi_get_opmode() == SOFTAP_MODE) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError,
"Scan not supported in AP mode")); "scan unsupported in AP mode"));
} }
mp_obj_t list = mp_obj_new_list(0, NULL);
esp_scan_list = &list;
wifi_station_scan(NULL, (scan_done_cb_t)esp_scan_cb); wifi_station_scan(NULL, (scan_done_cb_t)esp_scan_cb);
return mp_const_none; ETS_POLL_WHILE(esp_scan_list != NULL);
if (list == MP_OBJ_NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "scan failed"));
}
return list;
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_scan_obj, esp_scan); STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_scan_obj, esp_scan);
/// \method isconnected() /// \method isconnected()
/// Return True if connected to an AP and an IP address has been assigned, /// Return True if connected to an AP and an IP address has been assigned,

4
esp8266/mpconfigport.h
View File

@ -127,10 +127,6 @@ extern const struct _mp_obj_module_t onewire_module;
#define MICROPY_PORT_ROOT_POINTERS \ #define MICROPY_PORT_ROOT_POINTERS \
const char *readline_hist[8]; \ const char *readline_hist[8]; \
mp_obj_t mp_kbd_exception; \ mp_obj_t mp_kbd_exception; \
\
/* Singleton instance of scan callback, meaning that there can
be only one concurrent AP scan. */ \
mp_obj_t scan_cb_obj; \
// We need to provide a declaration/definition of alloca() // We need to provide a declaration/definition of alloca()
#include <alloca.h> #include <alloca.h>