Skip to content

Commit 9fcf96c

Browse files
tannewttannewt
committed
Replace _bleio.ConnectionError with the native version
Replace uses of _bleio.ConnectionError with regular ConnectionError Fixes adafruit#3008
1 parent 66c2566 commit 9fcf96c

6 files changed

Lines changed: 6 additions & 21 deletions

File tree

‎ports/nrf/common-hal/_bleio/__init__.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void check_nrf_error(uint32_t err_code) {
5050
mp_raise_msg(&mp_type_TimeoutError, NULL);
5151
return;
5252
case BLE_ERROR_INVALID_CONN_HANDLE:
53-
mp_raise_bleio_ConnectionError(translate("Not connected"));
53+
mp_raise_ConnectionError(translate("Not connected"));
5454
return;
5555
default:
5656
mp_raise_bleio_BluetoothError(translate("Unknown soft device error: %04x"), err_code);
@@ -115,7 +115,7 @@ bleio_adapter_obj_t common_hal_bleio_adapter_obj = {
115115

116116
void common_hal_bleio_check_connected(uint16_t conn_handle) {
117117
if (conn_handle == BLE_CONN_HANDLE_INVALID) {
118-
mp_raise_bleio_ConnectionError(translate("Not connected"));
118+
mp_raise_ConnectionError(translate("Not connected"));
119119
}
120120
}
121121

‎shared-bindings/_bleio/CharacteristicBuffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self) {
3939
if (!common_hal_bleio_characteristic_buffer_connected(self)) {
40-
mp_raise_bleio_ConnectionError(translate("Not connected"));
40+
mp_raise_ConnectionError(translate("Not connected"));
4141
}
4242
}
4343

‎shared-bindings/_bleio/Connection.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
void bleio_connection_ensure_connected(bleio_connection_obj_t *self) {
6565
if (!common_hal_bleio_connection_get_connected(self)) {
66-
mp_raise_bleio_ConnectionError(translate("Connection has been disconnected and can no longer be used. Create a new connection."));
66+
mp_raise_ConnectionError(translate("Connection has been disconnected and can no longer be used. Create a new connection."));
6767
}
6868
}
6969

‎shared-bindings/_bleio/PacketBuffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ STATIC mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_
161161
// gatts write events, which may not have been sent yet.
162162
//
163163
// IDEAL:
164-
// mp_raise_bleio_ConnectionError(translate("Not connected"));
164+
// mp_raise_ConnectionError(translate("Not connected"));
165165
// TEMPORARY:
166166
num_bytes_written = 0;
167167
}

‎shared-bindings/_bleio/__init__.c‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,13 @@
6363
//| """Catchall exception for Bluetooth related errors."""
6464
//| ...
6565
MP_DEFINE_BLEIO_EXCEPTION(BluetoothError, Exception)
66-
6766
NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t* fmt, ...) {
6867
va_list argptr;
6968
va_start(argptr,fmt);
7069
mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_bleio_BluetoothError, fmt, argptr);
7170
va_end(argptr);
7271
nlr_raise(exception);
7372
}
74-
//| class ConnectionError(BluetoothError):
75-
//| """Raised when a connection is unavailable."""
76-
//| ...
77-
//|
78-
MP_DEFINE_BLEIO_EXCEPTION(ConnectionError, bleio_BluetoothError)
79-
NORETURN void mp_raise_bleio_ConnectionError(const compressed_string_t* fmt, ...) {
80-
va_list argptr;
81-
va_start(argptr,fmt);
82-
mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_bleio_ConnectionError, fmt, argptr);
83-
va_end(argptr);
84-
nlr_raise(exception);
85-
}
8673

8774
//| class RoleError(BluetoothError):
8875
//| """Raised when a resource is used as the mismatched role. For example, if a local CCCD is
@@ -93,6 +80,7 @@ MP_DEFINE_BLEIO_EXCEPTION(RoleError, bleio_BluetoothError)
9380
NORETURN void mp_raise_bleio_RoleError(const compressed_string_t* msg) {
9481
mp_raise_msg(&mp_type_bleio_RoleError, msg);
9582
}
83+
9684
//| class SecurityError(BluetoothError):
9785
//| """Raised when a security related error occurs."""
9886
//| ...
@@ -183,7 +171,6 @@ STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = {
183171

184172
// Errors
185173
{ MP_ROM_QSTR(MP_QSTR_BluetoothError), OBJ_FROM_PTR(&mp_type_bleio_BluetoothError) },
186-
{ MP_ROM_QSTR(MP_QSTR_ConnectionError), OBJ_FROM_PTR(&mp_type_bleio_ConnectionError) },
187174
{ MP_ROM_QSTR(MP_QSTR_RoleError), OBJ_FROM_PTR(&mp_type_bleio_RoleError) },
188175
{ MP_ROM_QSTR(MP_QSTR_SecurityError), OBJ_FROM_PTR(&mp_type_bleio_SecurityError) },
189176

‎shared-bindings/_bleio/__init__.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ const mp_obj_type_t mp_type_bleio_ ## exc_name = { \
5151
};
5252

5353
extern const mp_obj_type_t mp_type_bleio_BluetoothError;
54-
extern const mp_obj_type_t mp_type_bleio_ConnectionError;
5554
extern const mp_obj_type_t mp_type_bleio_RoleError;
5655
extern const mp_obj_type_t mp_type_bleio_SecurityError;
5756

5857
extern mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj);
5958

6059
NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t* msg, ...);
61-
NORETURN void mp_raise_bleio_ConnectionError(const compressed_string_t* msg, ...);
6260
NORETURN void mp_raise_bleio_RoleError(const compressed_string_t* msg);
6361
NORETURN void mp_raise_bleio_SecurityError(const compressed_string_t* msg, ...);
6462

0 commit comments

Comments
 (0)