Address feedback

tannewt · tannewt · commit 7150f82c9d86 · 2026-03-04T11:00:16.000-08:00
diff --git a/devices/ble_hci/common-hal/_bleio/Characteristic.c b/devices/ble_hci/common-hal/_bleio/Characteristic.c
@@ -180,7 +180,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
     }
 
     const uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
-    common_hal_bleio_check_connected(conn_handle);
+    bleio_check_connected(conn_handle);
 
     uint16_t cccd_value =
         (notify ? CCCD_NOTIFY : 0) |
diff --git a/devices/ble_hci/common-hal/_bleio/Connection.h b/devices/ble_hci/common-hal/_bleio/Connection.h
@@ -61,7 +61,7 @@ typedef struct {
     uint8_t disconnect_reason;
 } bleio_connection_obj_t;
 
-void common_hal_bleio_check_connected(uint16_t conn_handle);
+void bleio_check_connected(uint16_t conn_handle);
 uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
 mp_obj_t bleio_connection_new_from_internal(bleio_connection_internal_t *connection);
 bleio_connection_internal_t *bleio_conn_handle_to_connection(uint16_t conn_handle);
diff --git a/devices/ble_hci/common-hal/_bleio/__init__.c b/devices/ble_hci/common-hal/_bleio/__init__.c
@@ -84,7 +84,7 @@ bleio_adapter_obj_t *common_hal_bleio_allocate_adapter_or_raise(void) {
     return &common_hal_bleio_adapter_obj;
 }
 
-void common_hal_bleio_check_connected(uint16_t conn_handle) {
+void bleio_check_connected(uint16_t conn_handle) {
     if (conn_handle == BLE_CONN_HANDLE_INVALID) {
         mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));
     }
diff --git a/ports/espressif/common-hal/_bleio/Characteristic.c b/ports/espressif/common-hal/_bleio/Characteristic.c
@@ -320,7 +320,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
     }
 
     const uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
-    common_hal_bleio_check_connected(conn_handle);
+    bleio_check_connected(conn_handle);
 
     uint16_t cccd_value =
         (notify ? 1 << 0 : 0) |
diff --git a/ports/espressif/common-hal/_bleio/Connection.h b/ports/espressif/common-hal/_bleio/Connection.h
@@ -64,7 +64,7 @@ void bleio_connection_clear(bleio_connection_internal_t *self);
 
 int bleio_connection_event_cb(struct ble_gap_event *event, void *connection_in);
 
-void common_hal_bleio_check_connected(uint16_t conn_handle);
+void bleio_check_connected(uint16_t conn_handle);
 uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
 mp_obj_t bleio_connection_new_from_internal(bleio_connection_internal_t *connection);
 bleio_connection_internal_t *bleio_conn_handle_to_connection(uint16_t conn_handle);
diff --git a/ports/espressif/common-hal/_bleio/__init__.c b/ports/espressif/common-hal/_bleio/__init__.c
@@ -155,7 +155,7 @@ void check_notify(BaseType_t result) {
     mp_raise_msg(&mp_type_TimeoutError, NULL);
 }
 
-void common_hal_bleio_check_connected(uint16_t conn_handle) {
+void bleio_check_connected(uint16_t conn_handle) {
     if (conn_handle == BLEIO_HANDLE_INVALID) {
         mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));
     }
diff --git a/ports/nordic/common-hal/_bleio/Attribute.h b/ports/nordic/common-hal/_bleio/Attribute.h
@@ -14,7 +14,7 @@
 
 extern void bleio_attribute_gatts_set_security_mode(ble_gap_conn_sec_mode_t *perm, bleio_attribute_security_mode_t security_mode);
 
-size_t common_hal_bleio_gatts_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len);
-void common_hal_bleio_gatts_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo);
-size_t common_hal_bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len);
-void common_hal_bleio_gattc_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo, bool write_no_response);
+size_t bleio_gatts_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len);
+void bleio_gatts_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo);
+size_t bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len);
+void bleio_gattc_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo, bool write_no_response);
diff --git a/ports/nordic/common-hal/_bleio/Characteristic.c b/ports/nordic/common-hal/_bleio/Characteristic.c
@@ -138,10 +138,10 @@ size_t common_hal_bleio_characteristic_get_value(bleio_characteristic_obj_t *sel
     if (self->handle != BLE_GATT_HANDLE_INVALID) {
         uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
         if (common_hal_bleio_service_get_is_remote(self->service)) {
-            return common_hal_bleio_gattc_read(self->handle, conn_handle, buf, len);
+            return bleio_gattc_read(self->handle, conn_handle, buf, len);
         } else {
             // conn_handle is ignored for non-system attributes.
-            return common_hal_bleio_gatts_read(self->handle, conn_handle, buf, len);
+            return bleio_gatts_read(self->handle, conn_handle, buf, len);
         }
     }
 
@@ -159,7 +159,7 @@ void common_hal_bleio_characteristic_set_value(bleio_characteristic_obj_t *self,
         if (common_hal_bleio_service_get_is_remote(self->service)) {
             uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
             // Last argument is true if write-no-reponse desired.
-            common_hal_bleio_gattc_write(self->handle, conn_handle, bufinfo,
+            bleio_gattc_write(self->handle, conn_handle, bufinfo,
                 (self->props & CHAR_PROP_WRITE_NO_RESPONSE));
         } else {
             // Validate data length for local characteristics only.
@@ -172,7 +172,7 @@ void common_hal_bleio_characteristic_set_value(bleio_characteristic_obj_t *self,
 
             // Always write the value locally even if no connections are active.
             // conn_handle is ignored for non-system attributes, so we use BLE_CONN_HANDLE_INVALID.
-            common_hal_bleio_gatts_write(self->handle, BLE_CONN_HANDLE_INVALID, bufinfo);
+            bleio_gatts_write(self->handle, BLE_CONN_HANDLE_INVALID, bufinfo);
             // Check to see if we need to notify or indicate any active connections.
             for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) {
                 bleio_connection_internal_t *connection = &bleio_connections[i];
@@ -255,7 +255,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
     }
 
     const uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
-    common_hal_bleio_check_connected(conn_handle);
+    bleio_check_connected(conn_handle);
 
     uint16_t cccd_value =
         (notify ? BLE_GATT_HVX_NOTIFICATION : 0) |
diff --git a/ports/nordic/common-hal/_bleio/Connection.h b/ports/nordic/common-hal/_bleio/Connection.h
@@ -65,7 +65,7 @@ typedef struct {
 void bleio_connection_clear(bleio_connection_internal_t *self);
 bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in);
 
-void common_hal_bleio_check_connected(uint16_t conn_handle);
+void bleio_check_connected(uint16_t conn_handle);
 uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
 mp_obj_t bleio_connection_new_from_internal(bleio_connection_internal_t *connection);
 bleio_connection_internal_t *bleio_conn_handle_to_connection(uint16_t conn_handle);
diff --git a/ports/nordic/common-hal/_bleio/Descriptor.c b/ports/nordic/common-hal/_bleio/Descriptor.c
@@ -43,9 +43,9 @@ size_t common_hal_bleio_descriptor_get_value(bleio_descriptor_obj_t *self, uint8
     if (self->handle != BLE_GATT_HANDLE_INVALID) {
         uint16_t conn_handle = bleio_connection_get_conn_handle(self->characteristic->service->connection);
         if (common_hal_bleio_service_get_is_remote(self->characteristic->service)) {
-            return common_hal_bleio_gattc_read(self->handle, conn_handle, buf, len);
+            return bleio_gattc_read(self->handle, conn_handle, buf, len);
         } else {
-            return common_hal_bleio_gatts_read(self->handle, conn_handle, buf, len);
+            return bleio_gatts_read(self->handle, conn_handle, buf, len);
         }
     }
 
@@ -58,7 +58,7 @@ void common_hal_bleio_descriptor_set_value(bleio_descriptor_obj_t *self, mp_buff
         uint16_t conn_handle = bleio_connection_get_conn_handle(self->characteristic->service->connection);
         if (common_hal_bleio_service_get_is_remote(self->characteristic->service)) {
             // false means WRITE_REQ, not write-no-response
-            common_hal_bleio_gattc_write(self->handle, conn_handle, bufinfo, false);
+            bleio_gattc_write(self->handle, conn_handle, bufinfo, false);
         } else {
             // Validate data length for local descriptors only.
             if (self->fixed_length && bufinfo->len != self->max_length) {
@@ -68,7 +68,7 @@ void common_hal_bleio_descriptor_set_value(bleio_descriptor_obj_t *self, mp_buff
                 mp_raise_ValueError(MP_ERROR_TEXT("Value length > max_length"));
             }
 
-            common_hal_bleio_gatts_write(self->handle, conn_handle, bufinfo);
+            bleio_gatts_write(self->handle, conn_handle, bufinfo);
         }
     }
 
diff --git a/ports/nordic/common-hal/_bleio/__init__.c b/ports/nordic/common-hal/_bleio/__init__.c
@@ -112,14 +112,14 @@ void bleio_reset(void) {
 // It currently only has properties and no state. Inited by bleio_reset
 bleio_adapter_obj_t common_hal_bleio_adapter_obj;
 
-void common_hal_bleio_check_connected(uint16_t conn_handle) {
+void bleio_check_connected(uint16_t conn_handle) {
     if (conn_handle == BLE_CONN_HANDLE_INVALID) {
         mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));
     }
 }
 
 // GATTS read of a Characteristic or Descriptor.
-size_t common_hal_bleio_gatts_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len) {
+size_t bleio_gatts_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len) {
     // conn_handle is ignored unless this is a system attribute.
     // If we're not connected, that's OK, because we can still read and write the local value.
 
@@ -133,7 +133,7 @@ size_t common_hal_bleio_gatts_read(uint16_t handle, uint16_t conn_handle, uint8_
     return gatts_value.len;
 }
 
-void common_hal_bleio_gatts_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo) {
+void bleio_gatts_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo) {
     // conn_handle is ignored unless this is a system attribute.
     // If we're not connected, that's OK, because we can still read and write the local value.
 
@@ -188,8 +188,8 @@ static bool _on_gattc_read_rsp_evt(ble_evt_t *ble_evt, void *param) {
     return true;
 }
 
-size_t common_hal_bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len) {
-    common_hal_bleio_check_connected(conn_handle);
+size_t bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_t *buf, size_t len) {
+    bleio_check_connected(conn_handle);
 
     read_info_t read_info;
     read_info.buf = buf;
@@ -213,15 +213,15 @@ size_t common_hal_bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_
         RUN_BACKGROUND_TASKS;
     }
     // Test if we were disconnected while reading
-    common_hal_bleio_check_connected(read_info.conn_handle);
+    bleio_check_connected(read_info.conn_handle);
 
     ble_drv_remove_event_handler(_on_gattc_read_rsp_evt, &read_info);
     check_gatt_status(read_info.status);
     return read_info.final_len;
 }
 
-void common_hal_bleio_gattc_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo, bool write_no_response) {
-    common_hal_bleio_check_connected(conn_handle);
+void bleio_gattc_write(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo, bool write_no_response) {
+    bleio_check_connected(conn_handle);
 
     ble_gattc_write_params_t write_params = {
         .write_op = write_no_response ? BLE_GATT_OP_WRITE_CMD: BLE_GATT_OP_WRITE_REQ,
diff --git a/ports/silabs/common-hal/_bleio/Characteristic.c b/ports/silabs/common-hal/_bleio/Characteristic.c
@@ -395,7 +395,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
 
     const uint16_t conn_handle = bleio_connection_get_conn_handle(
         self->service->connection);
-    common_hal_bleio_check_connected(conn_handle);
+    bleio_check_connected(conn_handle);
     notify = 1;
     indicate = 0;
     if (notify) {
diff --git a/ports/silabs/common-hal/_bleio/Connection.h b/ports/silabs/common-hal/_bleio/Connection.h
@@ -85,7 +85,7 @@ typedef struct
 
 void bleio_connection_clear(bleio_connection_internal_t *self);
 
-void common_hal_bleio_check_connected(uint16_t conn_handle);
+void bleio_check_connected(uint16_t conn_handle);
 uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
 
 mp_obj_t bleio_connection_new_from_internal(
diff --git a/ports/silabs/common-hal/_bleio/__init__.c b/ports/silabs/common-hal/_bleio/__init__.c
@@ -102,7 +102,7 @@ void check_ble_error(int error_code) {
     }
 }
 
-void common_hal_bleio_check_connected(uint16_t conn_handle) {
+void bleio_check_connected(uint16_t conn_handle) {
     if (conn_handle == BLEIO_HANDLE_INVALID) {
         mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));
     }
diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
@@ -116,9 +116,10 @@ static mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_
     }
 
     mp_get_buffer_raise(initial_value, &initial_value_bufinfo, MP_BUFFER_READ);
-    mp_arg_validate_length_max(initial_value_bufinfo.len, max_length, MP_QSTR_initial_value);
     if (fixed_length) {
         mp_arg_validate_length(initial_value_bufinfo.len, max_length, MP_QSTR_initial_value);
+    } else {
+        mp_arg_validate_length_max(initial_value_bufinfo.len, max_length, MP_QSTR_initial_value);
     }
 
     const char *user_description = NULL;
diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c
@@ -99,9 +99,10 @@ static mp_obj_t bleio_descriptor_add_to_characteristic(size_t n_args, const mp_o
         }
     }
     mp_get_buffer_raise(initial_value, &initial_value_bufinfo, MP_BUFFER_READ);
-    mp_arg_validate_length_max(initial_value_bufinfo.len, max_length, MP_QSTR_initial_value);
     if (fixed_length) {
         mp_arg_validate_length(initial_value_bufinfo.len, max_length, MP_QSTR_initial_value);
+    } else {
+        mp_arg_validate_length_max(initial_value_bufinfo.len, max_length, MP_QSTR_initial_value);
     }
 
     bleio_descriptor_obj_t *descriptor = mp_obj_malloc(bleio_descriptor_obj_t, &bleio_descriptor_type);

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`const uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);`
`183`		`- common_hal_bleio_check_connected(conn_handle);`
	`183`	`+ bleio_check_connected(conn_handle);`
`184`	`184`
`185`	`185`	`uint16_t cccd_value =`
`186`	`186`	`(notify ? CCCD_NOTIFY : 0) \|`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ bleio_adapter_obj_t *common_hal_bleio_allocate_adapter_or_raise(void) {`
`84`	`84`	`return &common_hal_bleio_adapter_obj;`
`85`	`85`	`}`
`86`	`86`
`87`		`-void common_hal_bleio_check_connected(uint16_t conn_handle) {`
	`87`	`+void bleio_check_connected(uint16_t conn_handle) {`
`88`	`88`	`if (conn_handle == BLE_CONN_HANDLE_INVALID) {`
`89`	`89`	`mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`const uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);`
`323`		`- common_hal_bleio_check_connected(conn_handle);`
	`323`	`+ bleio_check_connected(conn_handle);`
`324`	`324`
`325`	`325`	`uint16_t cccd_value =`
`326`	`326`	`(notify ? 1 << 0 : 0) \|`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ void check_notify(BaseType_t result) {`
`155`	`155`	`mp_raise_msg(&mp_type_TimeoutError, NULL);`
`156`	`156`	`}`
`157`	`157`
`158`		`-void common_hal_bleio_check_connected(uint16_t conn_handle) {`
	`158`	`+void bleio_check_connected(uint16_t conn_handle) {`
`159`	`159`	`if (conn_handle == BLEIO_HANDLE_INVALID) {`
`160`	`160`	`mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ size_t common_hal_bleio_descriptor_get_value(bleio_descriptor_obj_t *self, uint8`
`43`	`43`	`if (self->handle != BLE_GATT_HANDLE_INVALID) {`
`44`	`44`	`uint16_t conn_handle = bleio_connection_get_conn_handle(self->characteristic->service->connection);`
`45`	`45`	`if (common_hal_bleio_service_get_is_remote(self->characteristic->service)) {`
`46`		`- return common_hal_bleio_gattc_read(self->handle, conn_handle, buf, len);`
	`46`	`+ return bleio_gattc_read(self->handle, conn_handle, buf, len);`
`47`	`47`	`} else {`
`48`		`- return common_hal_bleio_gatts_read(self->handle, conn_handle, buf, len);`
	`48`	`+ return bleio_gatts_read(self->handle, conn_handle, buf, len);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`@@ -58,7 +58,7 @@ void common_hal_bleio_descriptor_set_value(bleio_descriptor_obj_t *self, mp_buff`
`58`	`58`	`uint16_t conn_handle = bleio_connection_get_conn_handle(self->characteristic->service->connection);`
`59`	`59`	`if (common_hal_bleio_service_get_is_remote(self->characteristic->service)) {`
`60`	`60`	`// false means WRITE_REQ, not write-no-response`
`61`		`- common_hal_bleio_gattc_write(self->handle, conn_handle, bufinfo, false);`
	`61`	`+ bleio_gattc_write(self->handle, conn_handle, bufinfo, false);`
`62`	`62`	`} else {`
`63`	`63`	`// Validate data length for local descriptors only.`
`64`	`64`	`if (self->fixed_length && bufinfo->len != self->max_length) {`
`@@ -68,7 +68,7 @@ void common_hal_bleio_descriptor_set_value(bleio_descriptor_obj_t *self, mp_buff`
`68`	`68`	`mp_raise_ValueError(MP_ERROR_TEXT("Value length > max_length"));`
`69`	`69`	`}`
`70`	`70`
`71`		`- common_hal_bleio_gatts_write(self->handle, conn_handle, bufinfo);`
	`71`	`+ bleio_gatts_write(self->handle, conn_handle, bufinfo);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`