nrf5/modules/ubluepy: Turn all attributes (addr, addr_type and rssi) to method calls instead of using common .attr callback. Adding getScanData implementation, which parses the advertisment data and returns a list of tuples containing (ad_type, desc, value). Description is generated by peeking into the ad_types local dicts map table, and do a reverse lookup on the value to find the QSTR.

nrf5/modules/ubluepy/ubluepy_scan_entry.c

@@ -29,6 +29,9 @@
 #include "py/runtime.h"
 #include "py/objstr.h"
 #include "py/objlist.h"
+#include "py/objarray.h"
+#include "py/objtuple.h"
+#include "py/qstr.h"
 
 #if MICROPY_PY_UBLUEPY_CENTRAL
 
@@ -40,46 +43,104 @@ STATIC void ubluepy_scan_entry_print(const mp_print_t *print, mp_obj_t o, mp_pri
     mp_printf(print, "ScanEntry");
 }
 
-STATIC void ubluepy_scan_entry_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    if (dest[0] != MP_OBJ_NULL) {
-        // not load attribute
-        return;
-    }
+/// \method addr()
+/// Return address as text string.
+///
+STATIC mp_obj_t scan_entry_get_addr(mp_obj_t self_in) {
     ubluepy_scan_entry_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (attr == MP_QSTR_addr) {
-        dest[0] = self->addr;
-    } else if (attr == MP_QSTR_addr_type) {
-        dest[0] = mp_obj_new_int(self->addr_type);
-    } else if (attr == MP_QSTR_rssi) {
-        dest[0] = mp_obj_new_int(self->rssi);
-    }
-
+    return self->addr;
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_addr_obj, scan_entry_get_addr);
+
+/// \method addr_type()
+/// Return address type value.
+///
+STATIC mp_obj_t scan_entry_get_addr_type(mp_obj_t self_in) {
+    ubluepy_scan_entry_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int(self->addr_type);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_addr_type_obj, scan_entry_get_addr_type);
+
+/// \method rssi()
+/// Return RSSI value.
+///
+STATIC mp_obj_t scan_entry_get_rssi(mp_obj_t self_in) {
+    ubluepy_scan_entry_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int(self->rssi);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scan_entry_get_rssi_obj, scan_entry_get_rssi);
 
 /// \method getScanData()
-/// Return list of the scan data tupples.
+/// Return list of the scan data tupples (ad_type, description, value)
 ///
-STATIC mp_obj_t scan_entry_get_scan_data(mp_obj_t self_in, mp_obj_t type_in) {
+STATIC mp_obj_t scan_entry_get_scan_data(mp_obj_t self_in) {
     ubluepy_scan_entry_obj_t * self = MP_OBJ_TO_PTR(self_in);
-    (void)self;
 
-    return mp_const_none;
+    mp_obj_t retval_list = mp_obj_new_list(0, NULL);
+
+    // TODO: check if self->data is set
+    mp_obj_array_t * data = MP_OBJ_TO_PTR(self->data);
+
+    uint16_t byte_index = 0;
+
+    while (byte_index < data->len) {
+        mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
+
+        uint8_t adv_item_len  = ((uint8_t * )data->items)[byte_index];
+        uint8_t adv_item_type = ((uint8_t * )data->items)[byte_index + 1];
+
+        mp_obj_t description = mp_const_none;
+
+        mp_map_t *constant_map = mp_obj_dict_get_map(ubluepy_constants_ad_types_type.locals_dict);
+        mp_map_elem_t *ad_types_table = MP_OBJ_TO_PTR(constant_map->table);
+
+        uint16_t num_of_elements = constant_map->used;
+
+        for (uint16_t i = 0; i < num_of_elements; i++) {
+            mp_map_elem_t element = (mp_map_elem_t)*ad_types_table;
+            ad_types_table++;
+            uint16_t element_value = mp_obj_get_int(element.value);
+
+            if (adv_item_type == element_value) {
+                qstr key_qstr = MP_OBJ_QSTR_VALUE(element.key);
+                const char * text = qstr_str(key_qstr);
+                size_t len = qstr_len(key_qstr);
+
+                vstr_t vstr;
+                vstr_init(&vstr, len);
+                vstr_printf(&vstr, "%s", text);
+                description = mp_obj_new_str(vstr.buf, vstr.len, false);
+                vstr_clear(&vstr);
+            }
+        }
+
+        t->items[0] = MP_OBJ_NEW_SMALL_INT(adv_item_type);
+        t->items[1] = description;
+        t->items[2] = mp_obj_new_bytearray(adv_item_len - 1,
+                                           &((uint8_t * )data->items)[byte_index + 2]);
+        mp_obj_list_append(retval_list, MP_OBJ_FROM_PTR(t));
+
+        byte_index += adv_item_len + 1;
+    }
+
+    return retval_list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_scan_entry_get_scan_data_obj, scan_entry_get_scan_data);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_scan_entry_get_scan_data_obj, scan_entry_get_scan_data);
 
 STATIC const mp_map_elem_t ubluepy_scan_entry_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_addr),                  (mp_obj_t)(&bluepy_scan_entry_get_addr_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_addr_type),             (mp_obj_t)(&bluepy_scan_entry_get_addr_type_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_rssi),                  (mp_obj_t)(&bluepy_scan_entry_get_rssi_obj) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_getScanData),           (mp_obj_t)(&ubluepy_scan_entry_get_scan_data_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_scan_entry_locals_dict, ubluepy_scan_entry_locals_dict_table);
 
-
 const mp_obj_type_t ubluepy_scan_entry_type = {
     { &mp_type_type },
     .name = MP_QSTR_ScanEntry,
     .print = ubluepy_scan_entry_print,
-    .locals_dict = (mp_obj_t)&ubluepy_scan_entry_locals_dict,
-    .attr = ubluepy_scan_entry_attr
+    .locals_dict = (mp_obj_t)&ubluepy_scan_entry_locals_dict
 };
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL