characteristic/cccd r/w; not tested

Author: dhalbert

devices/ble_hci/common-hal/_bleio/Attribute.h

@@ -30,21 +30,6 @@
 #include "shared-module/_bleio/Attribute.h"
 #include "shared-bindings/_bleio/UUID.h"
 
-// Types returned by attribute table lookups. These are UUIDs.
-typedef enum {
-  BLE_TYPE_UNKNOWN               = 0x0000,
-  BLE_TYPE_SERVICE_PRIMARY       = 0x2800,
-  BLE_TYPE_SERVICE_SECONDARY     = 0x2801,
-  BLE_TYPE_SERVICE_INCLUDE       = 0x2802,  // not yet implemented by us
-  BLE_TYPE_CHARACTERISTIC        = 0x2803,
-  BLE_TYPE_CHAR_EXTENDED_PROPS   = 0x2900,  // not yet implemented by us
-  BLE_TYPE_CHAR_USER_DESC        = 0x2901,  // not yet implemented by us
-  BLE_TYPE_CCCD                  = 0x2902,
-  BLE_TYPE_SCCD                  = 0x2903,  // not yet implemented by us
-  BLE_TYPE_CHAR_PRESENTATION_FMT = 0x2904,  // not yet implemented by us
-  BLE_TYPE_CHAR_AGGREGATE_FMT    = 0x2905,  // not yet implemented by us
-} ble_attribute_type_uuid;
-
 bleio_uuid_obj_t *bleio_attribute_get_uuid(mp_obj_t *attribute);
 
 #endif // MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_ATTRIBUTE_H

devices/ble_hci/common-hal/_bleio/Service.c

@@ -104,7 +104,7 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
         cccd->base.type = &bleio_descriptor_type;
 
         uint16_t zero = 0;
-        mp_buffer_info_t zero_cccd = {
+        mp_buffer_info_t zero_cccd_value = {
             .buf = &zero,
             .len = sizeof(zero),
         };
@@ -117,7 +117,7 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
             characteristic->read_perm, // Make CCCD write perm match characteristic read perm.
             2,                         // 2 bytes
             true,                      // fixed length
-            &zero_cccd                 // Initial value is 0.
+            &zero_cccd_value           // Initial value is 0.
             );
 
         // Adds CCCD to attribute table, and also extends self->end_handle to include the CCCD.

devices/ble_hci/common-hal/_bleio/UUID.c

@@ -68,3 +68,8 @@ void common_hal_bleio_uuid_pack_into(bleio_uuid_obj_t *self, uint8_t* buf) {
         common_hal_bleio_uuid_get_uuid128(self, buf);
     }
 }
+
+// Return a uui16 only if this is a standard uuid. Otherwise return BLE_UUID_UNKNOWN.
+uint16_t bleio_uuid_get_uuid16_or_unknown(bleio_uuid_obj_t *uuid) {
+    return uuid->size == 16 ? uuid->uuid16 : BLE_UUID_UNKNOWN;
+}

devices/ble_hci/common-hal/_bleio/UUID.h

@@ -31,11 +31,28 @@
 
 #include "py/obj.h"
 
+// Types returned by attribute table lookups. These are UUIDs.
+typedef enum {
+  BLE_UUID_UNKNOWN               = 0x0000,
+  BLE_UUID_SERVICE_PRIMARY       = 0x2800,
+  BLE_UUID_SERVICE_SECONDARY     = 0x2801,
+  BLE_UUID_SERVICE_INCLUDE       = 0x2802,  // not yet implemented by us
+  BLE_UUID_CHARACTERISTIC        = 0x2803,
+  BLE_UUID_CHAR_EXTENDED_PROPS   = 0x2900,  // not yet implemented by us
+  BLE_UUID_CHAR_USER_DESC        = 0x2901,  // not yet implemented by us
+  BLE_UUID_CCCD                  = 0x2902,
+  BLE_UUID_SCCD                  = 0x2903,  // not yet implemented by us
+  BLE_UUID_CHAR_PRESENTATION_FMT = 0x2904,  // not yet implemented by us
+  BLE_UUID_CHAR_AGGREGATE_FMT    = 0x2905,  // not yet implemented by us
+} ble_standard_uuid;
+
 typedef struct {
     mp_obj_base_t base;
     uint8_t size;
     uint16_t uuid16;
     uint8_t uuid128[16];
 } bleio_uuid_obj_t;
 
+uint16_t bleio_uuid_get_uuid16_or_unknown(bleio_uuid_obj_t *uuid);
+
 #endif // MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_UUID_H

devices/ble_hci/common-hal/_bleio/__init__.c

@@ -117,7 +117,7 @@ void check_hci_error(hci_result_t result) {
 void bleio_reset() {
     // Create a UUID object for all CCCD's.
     cccd_uuid.base.type = &bleio_uuid_type;
-    common_hal_bleio_uuid_construct(&cccd_uuid, BLE_TYPE_CCCD, NULL);
+    common_hal_bleio_uuid_construct(&cccd_uuid, BLE_UUID_CCCD, NULL);
 
     bleio_hci_reset();