Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove too optimistic furi_check, replace with condition

Browse Source
This commit is contained in:
Georgii Surkov
2024-02-08 14:50:14 +03:00
parent 3cbc68f07a
commit 534fe2fb26
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/services/expansion/expansion.c
View File

@@ -144,10 +144,8 @@ static void expansion_control_handler_set_listen_serial(
static void expansion_control_handler_module_connected( static void expansion_control_handler_module_connected(
Expansion* instance, Expansion* instance,
const ExpansionMessageData* data) { const ExpansionMessageData* data) {
furi_check(instance->state != ExpansionStateDisabled);
UNUSED(data); UNUSED(data);
if(instance->state != ExpansionStateEnabled) {
if(instance->state == ExpansionStateRunning) {
return; return;
} }
@@ -164,15 +162,14 @@ static void expansion_control_handler_module_disconnected(
Expansion* instance, Expansion* instance,
const ExpansionMessageData* data) { const ExpansionMessageData* data) {
UNUSED(data); UNUSED(data);
// This condition should be always true, but in some rare edge cases if(instance->state != ExpansionStateRunning) {
// it is possible to change the settings while the module was being return;
// disconnected, hence the additional check.
if(instance->state == ExpansionStateRunning) {
instance->state = ExpansionStateEnabled;
expansion_worker_free(instance->worker);
furi_hal_serial_control_set_expansion_callback(
instance->serial_id, expansion_detect_callback, instance);
} }
instance->state = ExpansionStateEnabled;
expansion_worker_free(instance->worker);
furi_hal_serial_control_set_expansion_callback(
instance->serial_id, expansion_detect_callback, instance);
} }
typedef void (*ExpansionControlHandler)(Expansion*, const ExpansionMessageData*); typedef void (*ExpansionControlHandler)(Expansion*, const ExpansionMessageData*);