bleio: Move the Scanner class to a shared module

ports/nrf/Makefile

@@ -134,7 +134,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	ubluepy/ubluepy_characteristic.c \
 	ubluepy/ubluepy_delegate.c \
 	ubluepy/ubluepy_constants.c \
-	ubluepy/ubluepy_scanner.c \
 	)
 
 SRC_COMMON_HAL += \
@@ -167,6 +166,7 @@ SRC_COMMON_HAL += \
 	bleio/__init__.c \
 	bleio/Adapter.c \
 	bleio/Descriptor.c \
+	bleio/Scanner.c \
 	bleio/UUID.c
 endif
 

ports/nrf/common-hal/bleio/Scanner.c

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ * Copyright (c) 2018 Artur Pacholec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "ble_drv.h"
+#include "py/mphal.h"
+#include "shared-bindings/bleio/Scanner.h"
+#include "shared-bindings/bleio/ScanEntry.h"
+
+STATIC void adv_event_handler(bleio_scanner_obj_t *self, ble_drv_adv_data_t *data) {
+    // TODO: Don't add new entry for each item, group by address and update
+    bleio_scanentry_obj_t *item = m_new_obj(bleio_scanentry_obj_t);
+    item->base.type = &bleio_scanentry_type;
+
+    item->rssi = data->rssi;
+    item->data = mp_obj_new_bytearray(data->data_len, data->p_data);
+
+    item->address.type = data->addr_type;
+    memcpy(item->address.value, data->p_peer_addr, BLEIO_ADDRESS_BYTES);
+
+    mp_obj_list_append(self->adv_reports, item);
+
+    ble_drv_scan_continue();
+}
+
+void common_hal_bleio_scanner_scan(bleio_scanner_obj_t *self, mp_int_t timeout) {
+    ble_drv_adv_report_handler_set(self, adv_event_handler);
+
+    ble_drv_scan_start(self->interval, self->window);
+
+    mp_hal_delay_ms(timeout);
+
+    ble_drv_scan_stop();
+}

ports/nrf/drivers/bluetooth/ble_drv.c

@@ -94,7 +94,7 @@ static volatile ble_drv_disc_add_service_callback_t disc_add_service_handler;
 static volatile ble_drv_disc_add_char_callback_t    disc_add_char_handler;
 static volatile ble_drv_gattc_char_data_callback_t  gattc_char_data_handle;
 
-static mp_obj_t mp_adv_observer;
+static bleio_scanner_obj_t *mp_adv_observer;
 static mp_obj_t mp_gattc_observer;
 static mp_obj_t mp_gattc_disc_service_observer;
 static mp_obj_t mp_gattc_disc_char_observer;
@@ -707,8 +707,8 @@ void ble_drv_gattc_event_handler_set(mp_obj_t obj, ble_drv_gattc_evt_callback_t
     gattc_event_handler = evt_handler;
 }
 
-void ble_drv_adv_report_handler_set(mp_obj_t obj, ble_drv_adv_evt_callback_t evt_handler) {
+void ble_drv_adv_report_handler_set(bleio_scanner_obj_t *self, ble_drv_adv_evt_callback_t evt_handler) {
-    mp_adv_observer = obj;
+    mp_adv_observer = self;
     adv_event_handler = evt_handler;
 }
 
@@ -760,15 +760,15 @@ void ble_drv_attr_c_write(uint16_t conn_handle, uint16_t handle, uint16_t len, u
         ;
     }
 }
-void ble_drv_scan_start(void) {
+void ble_drv_scan_start(uint16_t interval, uint16_t window) {
     SD_TEST_OR_ENABLE();
 
     ble_gap_scan_params_t scan_params;
     memset(&scan_params, 0, sizeof(ble_gap_scan_params_t));
 
     scan_params.active   = 1;
-    scan_params.interval = MSEC_TO_UNITS(100, UNIT_0_625_MS);
+    scan_params.interval = MSEC_TO_UNITS(interval, UNIT_0_625_MS);
-    scan_params.window   = MSEC_TO_UNITS(100, UNIT_0_625_MS);
+    scan_params.window   = MSEC_TO_UNITS(window, UNIT_0_625_MS);
 #if (BLUETOOTH_SD == 140)
     scan_params.scan_phys          = BLE_GAP_PHY_1MBPS;
 #endif
@@ -1003,10 +1003,9 @@ static void ble_evt_handler(ble_evt_t * p_ble_evt) {
 #endif
             };
 
-            // TODO: Fix unsafe callback to possible undefined callback...
+            if (adv_event_handler != NULL) {
-            adv_event_handler(mp_adv_observer,
+                adv_event_handler(mp_adv_observer, &adv_data);
-                              p_ble_evt->header.evt_id,
+            }
-                              &adv_data);
             break;
 
         case BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST:

ports/nrf/drivers/bluetooth/ble_drv.h

@@ -32,6 +32,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "shared-module/bleio/Scanner.h"
+
 #include "modubluepy.h"
 
 typedef struct {
@@ -67,7 +69,7 @@ typedef struct {
 typedef void (*ble_drv_gap_evt_callback_t)(mp_obj_t self, uint16_t event_id, uint16_t conn_handle, uint16_t length, uint8_t * data);
 typedef void (*ble_drv_gatts_evt_callback_t)(mp_obj_t self, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data);
 typedef void (*ble_drv_gattc_evt_callback_t)(mp_obj_t self, uint16_t event_id, uint16_t attr_handle, uint16_t length, uint8_t * data);
-typedef void (*ble_drv_adv_evt_callback_t)(mp_obj_t self, uint16_t event_id, ble_drv_adv_data_t * data);
+typedef void (*ble_drv_adv_evt_callback_t)(bleio_scanner_obj_t *self, ble_drv_adv_data_t *data);
 typedef void (*ble_drv_disc_add_service_callback_t)(mp_obj_t self, ble_drv_service_data_t * p_service_data);
 typedef void (*ble_drv_disc_add_char_callback_t)(mp_obj_t self, ble_drv_char_data_t * p_desc_data);
 typedef void (*ble_drv_gattc_char_data_callback_t)(mp_obj_t self, uint16_t length, uint8_t * p_data);
@@ -106,13 +108,13 @@ void ble_drv_attr_s_notify(uint16_t conn_handle, uint16_t handle, uint16_t len,
 
 void ble_drv_attr_c_write(uint16_t conn_handle, uint16_t handle, uint16_t len, uint8_t * p_data, bool w_response);
 
-void ble_drv_scan_start(void);
+void ble_drv_scan_start(uint16_t interval, uint16_t window);
 
 void ble_drv_scan_continue(void);
 
 void ble_drv_scan_stop(void);
 
-void ble_drv_adv_report_handler_set(mp_obj_t obj, ble_drv_adv_evt_callback_t evt_handler);
+void ble_drv_adv_report_handler_set(bleio_scanner_obj_t *self, ble_drv_adv_evt_callback_t evt_handler);
 
 void ble_drv_connect(uint8_t * p_addr, uint8_t addr_type);
 

ports/nrf/modules/ubluepy/modubluepy.c

@@ -33,7 +33,6 @@ extern const mp_obj_type_t ubluepy_service_type;
 extern const mp_obj_type_t ubluepy_characteristic_type;
 extern const mp_obj_type_t ubluepy_delegate_type;
 extern const mp_obj_type_t ubluepy_constants_type;
-extern const mp_obj_type_t ubluepy_scanner_type;
 
 STATIC const mp_rom_map_elem_t mp_module_ubluepy_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_ubluepy) },
@@ -42,9 +41,6 @@ STATIC const mp_rom_map_elem_t mp_module_ubluepy_globals_table[] = {
 #endif
 #if 0 // MICROPY_PY_UBLUEPY_CENTRAL
     { MP_ROM_QSTR(MP_QSTR_Central),         MP_ROM_PTR(&ubluepy_central_type) },
-#endif
-#if MICROPY_PY_UBLUEPY_CENTRAL
-    { MP_ROM_QSTR(MP_QSTR_Scanner),         MP_ROM_PTR(&ubluepy_scanner_type) },
 #endif
     { MP_ROM_QSTR(MP_QSTR_DefaultDelegate), MP_ROM_PTR(&ubluepy_delegate_type) },
     { MP_ROM_QSTR(MP_QSTR_Service),         MP_ROM_PTR(&ubluepy_service_type) },

ports/nrf/modules/ubluepy/modubluepy.h

@@ -77,7 +77,6 @@ p.advertise(device_name="micr", services=[s])
 extern const mp_obj_type_t ubluepy_service_type;
 extern const mp_obj_type_t ubluepy_characteristic_type;
 extern const mp_obj_type_t ubluepy_peripheral_type;
-extern const mp_obj_type_t ubluepy_scanner_type;
 extern const mp_obj_type_t ubluepy_constants_type;
 extern const mp_obj_type_t ubluepy_constants_ad_types_type;
 
@@ -147,11 +146,6 @@ typedef struct _ubluepy_advertise_data_t {
     bool       connectable;
 } ubluepy_advertise_data_t;
 
-typedef struct _ubluepy_scanner_obj_t {
-    mp_obj_base_t base;
-    mp_obj_t      adv_reports;
-} ubluepy_scanner_obj_t;
-
 typedef enum _ubluepy_prop_t {
     UBLUEPY_PROP_BROADCAST      = 0x01,
     UBLUEPY_PROP_READ           = 0x02,

ports/nrf/modules/ubluepy/ubluepy_scanner.c

@@ -1,118 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Glenn Ruben Bakke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <string.h>
-#include "py/obj.h"
-#include "py/runtime.h"
-#include "py/objstr.h"
-#include "py/objlist.h"
-#include "py/mphal.h"
-
-#if MICROPY_PY_UBLUEPY_CENTRAL
-
-#include "shared-bindings/bleio/ScanEntry.h"
-#include "ble_drv.h"
-
-STATIC void adv_event_handler(mp_obj_t self_in, uint16_t event_id, ble_drv_adv_data_t * data) {
-    ubluepy_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    // TODO: Don't add new entry for each item, group by address and update
-    bleio_scanentry_obj_t *item = m_new_obj(bleio_scanentry_obj_t);
-    item->base.type = &bleio_scanentry_type;
-
-    item->rssi = data->rssi;
-    item->data = mp_obj_new_bytearray(data->data_len, data->p_data);
-
-    item->address.type = data->addr_type;
-    memcpy(item->address.value, data->p_peer_addr, BLEIO_ADDRESS_BYTES);
-
-    mp_obj_list_append(self->adv_reports, item);
-
-    ble_drv_scan_continue();
-}
-
-STATIC void ubluepy_scanner_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
-    ubluepy_scanner_obj_t * self = (ubluepy_scanner_obj_t *)o;
-    (void)self;
-    mp_printf(print, "Scanner");
-}
-
-STATIC mp_obj_t ubluepy_scanner_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    static const mp_arg_t allowed_args[] = {
-
-    };
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    ubluepy_scanner_obj_t * s = m_new_obj(ubluepy_scanner_obj_t);
-    s->base.type = type;
-
-    return MP_OBJ_FROM_PTR(s);
-}
-
-/// \method scan(timeout)
-/// Scan for devices. Timeout is in milliseconds and will set the duration
-/// of the scanning.
-///
-STATIC mp_obj_t scanner_scan(mp_obj_t self_in, mp_obj_t timeout_in) {
-    ubluepy_scanner_obj_t * self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t timeout = mp_obj_get_int(timeout_in);
-
-    self->adv_reports = mp_obj_new_list(0, NULL);
-
-    ble_drv_adv_report_handler_set(MP_OBJ_FROM_PTR(self), adv_event_handler);
-
-    // start
-    ble_drv_scan_start();
-
-    // sleep
-    mp_hal_delay_ms(timeout);
-
-    // stop
-    ble_drv_scan_stop();
-
-    return self->adv_reports;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_scanner_scan_obj, scanner_scan);
-
-STATIC const mp_rom_map_elem_t ubluepy_scanner_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&ubluepy_scanner_scan_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(ubluepy_scanner_locals_dict, ubluepy_scanner_locals_dict_table);
-
-
-const mp_obj_type_t ubluepy_scanner_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Scanner,
-    .print = ubluepy_scanner_print,
-    .make_new = ubluepy_scanner_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_scanner_locals_dict
-};
-
-#endif // MICROPY_PY_UBLUEPY_CENTRAL

shared-bindings/bleio/ScanEntry.c

@@ -48,7 +48,7 @@
 //|   .. attribute:: address
 //|
 //|   The address of the device. (read-only)
-//|   This attribute is of type `bleio:Address`.
+//|   This attribute is of type `bleio.Address`.
 //|
 
 //|   .. attribute:: manufacturer_specific_data
@@ -75,7 +75,7 @@
 //|   .. attribute:: service_uuids
 //|
 //|   The address of the device. (read-only)
-//|   This attribute is a list of `bleio:UUID`.
+//|   This attribute is a list of `bleio.UUID`.
 //|   This attribute might be empty or incomplete, depending on the advertisement packet.
 //|   Currently only 16-bit UUIDS are listed.
 //|

shared-bindings/bleio/Scanner.c

@@ -0,0 +1,161 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Artur Pacholec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/objproperty.h"
+#include "shared-bindings/bleio/ScanEntry.h"
+#include "shared-bindings/bleio/Scanner.h"
+
+#define DEFAULT_INTERVAL 100
+#define DEFAULT_WINDOW 100
+
+//| .. currentmodule:: bleio
+//|
+//| :class:`Scanner` -- scan for nearby BLE devices
+//| =========================================================
+//|
+//| Allows scanning for nearby BLE devices.
+//|
+//| Usage::
+//|
+//|    import bleio
+//|    scanner = bleio.Scanner()
+//|    entries = scanner.scan(2500)
+//|    print(entries)
+//|
+
+//| .. class:: Scanner()
+//|
+//|   Create a new Scanner object.
+//|
+
+//|   .. attribute:: interval
+//|
+//|     The interval (in ms) between the start of two consecutive scan windows.
+//|     Allowed values are between 10ms and 10.24 sec.
+//|
+
+//|   .. attribute:: window
+//|
+//|     The duration (in ms) in which a single BLE channel is scanned.
+//|     Allowed values are between 10ms and 10.24 sec.
+//|
+
+//|   .. method:: scan(timeout)
+//|
+//|     Performs a BLE scan lasting :py:data:`timeout` ms.
+//|
+//|     :returns: advertising packets found
+//|     :rtype: list of :py:class:`bleio.ScanEntry`
+//|
+STATIC void bleio_scanner_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    bleio_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    mp_printf(print, "Scanner(interval: %d window: %d)", self->interval, self->window);
+}
+
+STATIC mp_obj_t bleio_scanner_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    bleio_scanner_obj_t *self = m_new_obj(bleio_scanner_obj_t);
+    self->base.type = type;
+
+    self->interval = DEFAULT_INTERVAL;
+    self->window = DEFAULT_WINDOW;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t bleio_scanner_get_interval(mp_obj_t self_in) {
+    bleio_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return mp_obj_new_int(self->interval);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanner_get_interval_obj, bleio_scanner_get_interval);
+
+static mp_obj_t bleio_scanner_set_interval(mp_obj_t self_in, mp_obj_t value) {
+    bleio_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    self->interval = mp_obj_get_int(value);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_scanner_set_interval_obj, bleio_scanner_set_interval);
+
+const mp_obj_property_t bleio_scanner_interval_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&bleio_scanner_get_interval_obj,
+               (mp_obj_t)&bleio_scanner_set_interval_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
+STATIC mp_obj_t scanner_scan(mp_obj_t self_in, mp_obj_t timeout_in) {
+    bleio_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const mp_int_t timeout = mp_obj_get_int(timeout_in);
+
+    self->adv_reports = mp_obj_new_list(0, NULL);
+
+    common_hal_bleio_scanner_scan(self, timeout);
+
+    return self->adv_reports;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_scanner_scan_obj, scanner_scan);
+
+STATIC mp_obj_t bleio_scanner_get_window(mp_obj_t self_in) {
+    bleio_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return mp_obj_new_int(self->window);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanner_get_window_obj, bleio_scanner_get_window);
+
+static mp_obj_t bleio_scanner_set_window(mp_obj_t self_in, mp_obj_t value) {
+    bleio_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    self->window = mp_obj_get_int(value);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_scanner_set_window_obj, bleio_scanner_set_window);
+
+const mp_obj_property_t bleio_scanner_window_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&bleio_scanner_get_window_obj,
+               (mp_obj_t)&bleio_scanner_set_window_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
+STATIC const mp_rom_map_elem_t bleio_scanner_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_interval), MP_ROM_PTR(&bleio_scanner_interval_obj) },
+    { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&bleio_scanner_scan_obj) },
+    { MP_ROM_QSTR(MP_QSTR_window), MP_ROM_PTR(&bleio_scanner_window_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(bleio_scanner_locals_dict, bleio_scanner_locals_dict_table);
+
+const mp_obj_type_t bleio_scanner_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Scanner,
+    .print = bleio_scanner_print,
+    .make_new = bleio_scanner_make_new,
+    .locals_dict = (mp_obj_dict_t*)&bleio_scanner_locals_dict
+};

shared-bindings/bleio/Scanner.h

@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Glenn Ruben Bakke
+ * Copyright (c) 2018 Artur Pacholec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_SCANNER_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_SCANNER_H
+
+#include "py/objtype.h"
+#include "shared-module/bleio/Scanner.h"
+
+extern const mp_obj_type_t bleio_scanner_type;
+
+extern void common_hal_bleio_scanner_scan(bleio_scanner_obj_t *self, mp_int_t timeout);
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_SCANNER_H

shared-bindings/bleio/__init__.c

@@ -32,6 +32,7 @@
 #include "shared-bindings/bleio/AdvertisementData.h"
 #include "shared-bindings/bleio/Descriptor.h"
 #include "shared-bindings/bleio/ScanEntry.h"
+#include "shared-bindings/bleio/Scanner.h"
 #include "shared-bindings/bleio/UUID.h"
 #include "shared-bindings/bleio/UUIDType.h"
 
@@ -55,6 +56,7 @@
 //|     Adapter
 //|     Descriptor
 //|     ScanEntry
+//|     Scanner
 //|     UUID
 //|     UUIDType
 //|
@@ -71,6 +73,7 @@ STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AdvertisementData), MP_ROM_PTR(&bleio_advertisementdata_type) },
     { MP_ROM_QSTR(MP_QSTR_Descriptor),        MP_ROM_PTR(&bleio_descriptor_type) },
     { MP_ROM_QSTR(MP_QSTR_ScanEntry),         MP_ROM_PTR(&bleio_scanentry_type) },
+    { MP_ROM_QSTR(MP_QSTR_Scanner),           MP_ROM_PTR(&bleio_scanner_type) },
     { MP_ROM_QSTR(MP_QSTR_UUID),              MP_ROM_PTR(&bleio_uuid_type) },
 
     // Properties

shared-module/bleio/Scanner.h

@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Artur Pacholec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BLEIO_SCANNER_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BLEIO_SCANNER_H
+
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t adv_reports;
+    uint16_t interval;
+    uint16_t window;
+} bleio_scanner_obj_t;
+
+#endif // MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BLEIO_SCANNER_H