1 files changed, 27 insertions, 30 deletions

diff --git a/ports/nrf/common-hal/bleio/Scanner.c b/ports/nrf/common-hal/bleio/Scanner.c
index d2e19b5f9..57ce940ab 100644
--- a/ports/nrf/common-hal/bleio/Scanner.c
+++ b/ports/nrf/common-hal/bleio/Scanner.c
@@ -3,8 +3,9 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Glenn Ruben Bakke
+ * Copyright (c) 2019 Dan Halbert for Adafruit Industries
  * Copyright (c) 2018 Artur Pacholec
+ * Copyright (c) 2016 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
@@ -30,22 +31,21 @@
 #include "ble_drv.h"
 #include "ble_gap.h"
 #include "py/mphal.h"
+#include "py/objlist.h"
 #include "py/runtime.h"
 #include "shared-bindings/bleio/Adapter.h"
 #include "shared-bindings/bleio/ScanEntry.h"
 #include "shared-bindings/bleio/Scanner.h"
 #include "shared-module/bleio/ScanEntry.h"
 
-#if (BLUETOOTH_SD == 140)
 static uint8_t m_scan_buffer_data[BLE_GAP_SCAN_BUFFER_MIN];
 
 static ble_data_t m_scan_buffer = {
     m_scan_buffer_data,
     BLE_GAP_SCAN_BUFFER_MIN
 };
-#endif
 
-STATIC void on_ble_evt(ble_evt_t *ble_evt, void *scanner_in) {
+STATIC void scanner_on_ble_evt(ble_evt_t *ble_evt, void *scanner_in) {
     bleio_scanner_obj_t *scanner = (bleio_scanner_obj_t*)scanner_in;
     ble_gap_evt_adv_report_t *report = &ble_evt->evt.gap_evt.params.adv_report;
 
@@ -53,56 +53,53 @@ STATIC void on_ble_evt(ble_evt_t *ble_evt, void *scanner_in) {
         return;
     }
 
-    // TODO: Don't add new entry for each item, group by address and update
     bleio_scanentry_obj_t *entry = m_new_obj(bleio_scanentry_obj_t);
     entry->base.type = &bleio_scanentry_type;
     entry->rssi = report->rssi;
 
-    entry->address.type = report->peer_addr.addr_type;
-    memcpy(entry->address.value, report->peer_addr.addr, BLEIO_ADDRESS_BYTES);
+    bleio_address_obj_t *address = m_new_obj(bleio_address_obj_t);
+    address->base.type = &bleio_address_type;
+    common_hal_bleio_address_construct(MP_OBJ_TO_PTR(address),
+                                       report->peer_addr.addr, report->peer_addr.addr_type);
+    entry->address = address;
 
-#if (BLUETOOTH_SD == 140)
-    entry->data = mp_obj_new_bytearray(report->data.len, report->data.p_data);
-#else
-    entry->data = mp_obj_new_bytearray(report->dlen, report->data);
-#endif
+    entry->data = mp_obj_new_bytes(report->data.p_data, report->data.len);
 
-    mp_obj_list_append(scanner->adv_reports, entry);
+    mp_obj_list_append(scanner->scan_entries, MP_OBJ_FROM_PTR(entry));
 
-#if (BLUETOOTH_SD == 140)
     const uint32_t err_code = sd_ble_gap_scan_start(NULL, &m_scan_buffer);
     if (err_code != NRF_SUCCESS) {
         mp_raise_OSError_msg_varg(translate("Failed to continue scanning, err 0x%04x"), err_code);
     }
-#endif
 }
 
-void common_hal_bleio_scanner_scan(bleio_scanner_obj_t *self, mp_int_t timeout) {
-    ble_drv_add_event_handler(on_ble_evt, self);
+void common_hal_bleio_scanner_construct(bleio_scanner_obj_t *self) {
+}
+
+mp_obj_t common_hal_bleio_scanner_scan(bleio_scanner_obj_t *self, mp_float_t timeout, mp_float_t interval, mp_float_t window) {
+    common_hal_bleio_adapter_set_enabled(true);
+    ble_drv_add_event_handler(scanner_on_ble_evt, self);
 
     ble_gap_scan_params_t scan_params = {
-        .interval = MSEC_TO_UNITS(self->interval, UNIT_0_625_MS),
-        .window = MSEC_TO_UNITS(self->window, UNIT_0_625_MS),
-#if (BLUETOOTH_SD == 140)
+        .interval = SEC_TO_UNITS(interval, UNIT_0_625_MS),
+        .window = SEC_TO_UNITS(window, UNIT_0_625_MS),
         .scan_phys = BLE_GAP_PHY_1MBPS,
-#endif
     };
 
-    common_hal_bleio_adapter_set_enabled(true);
+    self->scan_entries = mp_obj_new_list(0, NULL);
 
     uint32_t err_code;
-#if (BLUETOOTH_SD == 140)
     err_code = sd_ble_gap_scan_start(&scan_params, &m_scan_buffer);
-#else
-    err_code = sd_ble_gap_scan_start(&scan_params);
-#endif
 
     if (err_code != NRF_SUCCESS) {
         mp_raise_OSError_msg_varg(translate("Failed to start scanning, err 0x%04x"), err_code);
     }
 
-    if (timeout > 0) {
-        mp_hal_delay_ms(timeout);
-        sd_ble_gap_scan_stop();
-    }
+    mp_hal_delay_ms(timeout * 1000);
+    sd_ble_gap_scan_stop();
+
+    // Return list, and don't hang on to it, so it can be GC'd.
+    mp_obj_t entries = self->scan_entries;
+    self->scan_entries = MP_OBJ_NULL;
+    return entries;
 }