8000 nrf/drivers: Use mp_raise_msg where appropriate, and shorten exc msgs. · jeremyherbert/micropython@580fd63 · GitHub
[go: up one dir, main page]
Skip to content

Commit 580fd63

Browse files
dpgeorgedpgeorge
committed
nrf/drivers: Use mp_raise_msg where appropriate, and shorten exc msgs.
If the exception doesn't need printf-style formatting then calling mp_raise_msg is more efficient. Also shorten exception messages to match style in core and other ports.
1 parent 6a3ca96 commit 580fd63

File tree

1 file changed

+13
-27
lines changed

1 file changed

+13
-27
lines changed

‎ports/nrf/drivers/bluetooth/ble_drv.c

Lines changed: 13 additions & 27 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,7 @@ uint32_t ble_drv_stack_enable(void) {
223223
if ((err_code = sd_ble_gap_device_name_set(&sec_mode,
224224
(const uint8_t *)device_name,
225225
strlen(device_name))) != 0) {
226-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
227-
"Cannot apply GAP parameters."));
226+
mp_raise_msg(&mp_type_OSError, "can't apply GAP parameters");
228227
}
229228

230229
// set connection parameters
@@ -236,9 +235,7 @@ uint32_t ble_drv_stack_enable(void) {
236235
gap_conn_params.conn_sup_timeout = BLE_CONN_SUP_TIMEOUT;
237236

238237
if (sd_ble_gap_ppcp_set(&gap_conn_params) != 0) {
239-
240-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
241-
"Cannot set PPCP parameters."));
238+
mp_raise_msg(&mp_type_OSError, "can't set PPCP parameters");
242239
}
243240

244241
return err_code;
@@ -269,8 +266,7 @@ void ble_drv_address_get(ble_drv_addr_t * p_addr) {
269266
#endif
270267

271268
if (err_code != 0) {
272-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
273-
"Can not query for the device address."));
269+
mp_raise_msg(&mp_type_OSError, "can't query for the device address");
274270
}
275271

276272
BLE_DRIVER_LOG("ble address, type: " HEX2_FMT ", " \
@@ -288,8 +284,7 @@ bool ble_drv_uuid_add_vs(uint8_t * p_uuid, uint8_t * idx) {
288284
SD_TEST_OR_ENABLE();
289285

290286
if (sd_ble_uuid_vs_add((ble_uuid128_t const *)p_uuid, idx) != 0) {
291-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
292-
"Can not add Vendor Specific 128-bit UUID."));
287+
mp_raise_msg(&mp_type_OSError, "can't add Vendor Specific 128-bit UUID");
293288
}
294289

295290
return true;
@@ -308,8 +303,7 @@ bool ble_drv_service_add(ubluepy_service_obj_t * p_service_obj) {
308303
if (sd_ble_gatts_service_add(p_service_obj->type,
309304
&uuid,
310305
&p_service_obj->handle) < 10000 span class=pl-c1>!= 0) {
311-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
312-
"Can not add Service."));
306+
mp_raise_msg(&mp_type_OSError, "can't add Service");
313307
}
314308
} else if (p_service_obj->p_uuid->type == BLE_UUID_TYPE_BLE) {
315309
BLE_DRIVER_LOG("adding service\n");
@@ -322,8 +316,7 @@ bool ble_drv_service_add(ubluepy_service_obj_t * p_service_obj) {
322316
if (sd_ble_gatts_service_add(p_service_obj->type,
323317
&uuid,
324318
&p_service_obj->handle) != 0) {
325-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
326-
"Can not add Service."));
319+
mp_raise_msg(&mp_type_OSError, "can't add Service");
327320
}
328321
}
329322
return true;
@@ -393,8 +386,7 @@ bool ble_drv_characteristic_add(ubluepy_characteristic_obj_t * p_char_obj) {
393386
&char_md,
394387
&attr_char_value,
395388
&handles) != 0) {
396-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
397-
"Can not add Characteristic."));
389+
mp_raise_msg(&mp_type_OSError, "can't add Characteristic");
398390
}
399391

400392
// apply handles to object instance
@@ -421,8 +413,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
421413
if (sd_ble_gap_device_name_set(&sec_mode,
422414
p_adv_params->p_device_name,
423415
p_adv_params->device_name_len) != 0) {
424-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
425-
"Can not apply device name in the stack."));
416+
mp_raise_msg(&mp_type_OSError, "can't apply device name in the stack");
426417
}
427418

428419
BLE_DRIVER_LOG("Device name applied\n");
@@ -485,14 +476,12 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
485476
uuid.uuid += p_service->p_uuid->value[1] << 8;
486477
// calculate total size of uuids
487478
if (sd_ble_uuid_encode(&uuid, &encoded_size, NULL) != 0) {
488-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
489-
"Can not encode UUID, to check length."));
479+
mp_raise_msg(&mp_type_OSError, "can't encode UUID, to check length");
490480
}
491481

492482
// do encoding into the adv buffer
493483
if (sd_ble_uuid_encode(&uuid, &encoded_size, &adv_data[byte_pos]) != 0) {
494-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
495-
"Can encode UUID into the advertisment packet."));
484+
mp_raise_msg(&mp_type_OSError, "can't encode UUID into advertisment packet");
496485
}
497486

498487
BLE_DRIVER_LOG("encoded uuid for service %u: ", 0);
@@ -535,14 +524,12 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
535524

536525
// calculate total size of uuids
537526
if (sd_ble_uuid_encode(&uuid, &encoded_size, NULL) != 0) {
538-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
539-
"Can not encode UUID, to check length."));
527+
mp_raise_msg(&mp_type_OSError, "can't encode UUID, to check length");
540528
}
541529

542530
// do encoding into the adv buffer
543531
if (sd_ble_uuid_encode(&uuid, &encoded_size, &adv_data[byte_pos]) != 0) {
544-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
545-
"Can encode UUID into the advertisment packet."));
532+
mp_raise_msg(&mp_type_OSError, "can't encode UUID into advertisment packet");
546533
}
547534

548535
BLE_DRIVER_LOG("encoded uuid for service %u: ", 0);
@@ -566,8 +553,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
566553

567554
if ((p_adv_params->data_len > 0) && (p_adv_params->p_data != NULL)) {
568555
if (p_adv_params->data_len + byte_pos > BLE_GAP_ADV_MAX_SIZE) {
569-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
570-
"Can not fit data into the advertisment packet."));
556+
mp_raise_msg(&mp_type_OSError, "can't fit data into advertisment packet");
571557
}
572558

573559
memcpy(adv_data, p_adv_params->p_data, p_adv_params->data_len);

0 commit comments

Comments
 (0)
0