Skip to content
Snippets Groups Projects
Commit c7be3eec authored by schneider's avatar schneider
Browse files

ble: Don't panic when initializing BLE from mpy if ble is off

parent b238f9e0
Branches
No related tags found
No related merge requests found
...@@ -97,6 +97,10 @@ void ble_epic_ble_api_trigger_event(enum epic_ble_event_type type, void *data) ...@@ -97,6 +97,10 @@ void ble_epic_ble_api_trigger_event(enum epic_ble_event_type type, void *data)
int epic_ble_get_event(struct epic_ble_event *e) int epic_ble_get_event(struct epic_ble_event *e)
{ {
if (!ble_is_enabled()) {
return -EIO;
}
if (xQueueReceive(ble_event_queue, e, 0) != pdTRUE) { if (xQueueReceive(ble_event_queue, e, 0) != pdTRUE) {
return -ENOENT; return -ENOENT;
} }
...@@ -162,6 +166,10 @@ void vDmTimerCallback() ...@@ -162,6 +166,10 @@ void vDmTimerCallback()
int epic_ble_init(void) int epic_ble_init(void)
{ {
if (!ble_is_enabled()) {
return -EIO;
}
if (dm_timer == NULL) { if (dm_timer == NULL) {
dm_timer = xTimerCreateStatic( dm_timer = xTimerCreateStatic(
"dmtimer", "dmtimer",
......
...@@ -474,9 +474,14 @@ int mp_bluetooth_init(void) ...@@ -474,9 +474,14 @@ int mp_bluetooth_init(void)
MP_ROM_INT(EPIC_INT_BLE), (mp_obj_t *)&ble_event_obj MP_ROM_INT(EPIC_INT_BLE), (mp_obj_t *)&ble_event_obj
); );
clear_events(); clear_events();
epic_ble_init(); int ret = epic_ble_init();
if (ret == 0) {
active = true; active = true;
return 0; } else {
active = false;
}
return ret;
} }
// Disables the Bluetooth stack. Is a no-op when not enabled. // Disables the Bluetooth stack. Is a no-op when not enabled.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment