diff --git a/applications/subghz/scenes/subghz_scene_set_cnt.c b/applications/subghz/scenes/subghz_scene_set_cnt.c index a58ddb475..92c6d6ccc 100644 --- a/applications/subghz/scenes/subghz_scene_set_cnt.c +++ b/applications/subghz/scenes/subghz_scene_set_cnt.c @@ -1,13 +1,13 @@ #include "../subghz_i.h" void subghz_scene_set_cnt_byte_input_callback(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventByteInputDone); } void subghz_scene_set_cnt_on_enter(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; // Setup view ByteInput* byte_input = subghz->byte_input; @@ -23,19 +23,20 @@ void subghz_scene_set_cnt_on_enter(void* context) { } bool subghz_scene_set_cnt_on_event(void* context, SceneManagerEvent event) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; + bool consumed = false; if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetSeed); - return true; + consumed = true; } } - return false; + return consumed; } void subghz_scene_set_cnt_on_exit(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0); diff --git a/applications/subghz/scenes/subghz_scene_set_fix.c b/applications/subghz/scenes/subghz_scene_set_fix.c index bafa2686c..d8e5bb7e1 100644 --- a/applications/subghz/scenes/subghz_scene_set_fix.c +++ b/applications/subghz/scenes/subghz_scene_set_fix.c @@ -1,13 +1,13 @@ #include "../subghz_i.h" void subghz_scene_set_fix_byte_input_callback(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventByteInputDone); } void subghz_scene_set_fix_on_enter(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; // Setup view ByteInput* byte_input = subghz->byte_input; @@ -23,19 +23,20 @@ void subghz_scene_set_fix_on_enter(void* context) { } bool subghz_scene_set_fix_on_event(void* context, SceneManagerEvent event) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; + bool consumed = false; if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetCnt); - return true; + consumed = true; } } - return false; + return consumed; } void subghz_scene_set_fix_on_exit(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0); diff --git a/applications/subghz/scenes/subghz_scene_set_seed.c b/applications/subghz/scenes/subghz_scene_set_seed.c index bc5c94750..89c4c11bc 100644 --- a/applications/subghz/scenes/subghz_scene_set_seed.c +++ b/applications/subghz/scenes/subghz_scene_set_seed.c @@ -1,13 +1,13 @@ #include "../subghz_i.h" void subghz_scene_set_seed_byte_input_callback(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; view_dispatcher_send_custom_event(subghz->view_dispatcher, SubGhzCustomEventByteInputDone); } void subghz_scene_set_seed_on_enter(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; // Setup view ByteInput* byte_input = subghz->byte_input; @@ -23,19 +23,20 @@ void subghz_scene_set_seed_on_enter(void* context) { } bool subghz_scene_set_seed_on_event(void* context, SceneManagerEvent event) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; + bool consumed = false; if(event.type == SceneManagerEventTypeCustom) { if(event.event == SubGhzCustomEventByteInputDone) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName); - return true; + consumed = true; } } - return false; + return consumed;; } void subghz_scene_set_seed_on_exit(void* context) { - SubGhz* subghz = (SubGhz*)context; + SubGhz* subghz = context; // Clear view byte_input_set_result_callback(subghz->byte_input, NULL, NULL, NULL, NULL, 0);