From 3c1efda1dbf0f5ff6fa97f837390291a3b5d808e Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Mon, 3 Oct 2022 18:36:06 +0300 Subject: [PATCH] return carrier test included with non debug builds --- .../main/subghz/scenes/subghz_scene_config.h | 4 ++-- .../subghz/scenes/subghz_scene_receiver.c | 2 ++ .../main/subghz/scenes/subghz_scene_start.c | 7 +----- .../main/subghz/scenes/subghz_scene_test.c | 10 +++++---- .../subghz/scenes/subghz_scene_test_carrier.c | 4 +--- applications/main/subghz/subghz.c | 22 +++++++++---------- applications/main/subghz/subghz_i.h | 4 ++-- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/applications/main/subghz/scenes/subghz_scene_config.h b/applications/main/subghz/scenes/subghz_scene_config.h index fcc579d93..f265644b7 100644 --- a/applications/main/subghz/scenes/subghz_scene_config.h +++ b/applications/main/subghz/scenes/subghz_scene_config.h @@ -12,10 +12,10 @@ ADD_SCENE(subghz, show_only_rx, ShowOnlyRx) ADD_SCENE(subghz, saved_menu, SavedMenu) ADD_SCENE(subghz, delete, Delete) ADD_SCENE(subghz, delete_success, DeleteSuccess) -#if FURI_DEBUG ADD_SCENE(subghz, test, Test) -ADD_SCENE(subghz, test_static, TestStatic) ADD_SCENE(subghz, test_carrier, TestCarrier) +#if FURI_DEBUG +ADD_SCENE(subghz, test_static, TestStatic) ADD_SCENE(subghz, test_packet, TestPacket) #endif ADD_SCENE(subghz, set_type, SetType) diff --git a/applications/main/subghz/scenes/subghz_scene_receiver.c b/applications/main/subghz/scenes/subghz_scene_receiver.c index 4fb79a8f1..7cdc55a22 100644 --- a/applications/main/subghz/scenes/subghz_scene_receiver.c +++ b/applications/main/subghz/scenes/subghz_scene_receiver.c @@ -6,6 +6,8 @@ const NotificationSequence subghz_sequence_rx = { &message_green_255, + &message_display_backlight_on, + &message_vibro_on, &message_note_c6, &message_delay_50, diff --git a/applications/main/subghz/scenes/subghz_scene_start.c b/applications/main/subghz/scenes/subghz_scene_start.c index 752fb8a92..cf8cd2499 100644 --- a/applications/main/subghz/scenes/subghz_scene_start.c +++ b/applications/main/subghz/scenes/subghz_scene_start.c @@ -53,12 +53,10 @@ void subghz_scene_start_on_enter(void* context) { SubmenuIndexFrequencyAnalyzer, subghz_scene_start_submenu_callback, subghz); -#if FURI_DEBUG if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { submenu_add_item( subghz->submenu, "Test", SubmenuIndexTest, subghz_scene_start_submenu_callback, subghz); } -#endif submenu_set_selected_item( subghz->submenu, scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneStart)); @@ -100,15 +98,12 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneFrequencyAnalyzer); return true; - } -#if FURI_DEBUG - else if(event.event == SubmenuIndexTest) { + } else if(event.event == SubmenuIndexTest) { scene_manager_set_scene_state( subghz->scene_manager, SubGhzSceneStart, SubmenuIndexTest); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTest); return true; } -#endif } return false; } diff --git a/applications/main/subghz/scenes/subghz_scene_test.c b/applications/main/subghz/scenes/subghz_scene_test.c index 64473015b..fa333edca 100644 --- a/applications/main/subghz/scenes/subghz_scene_test.c +++ b/applications/main/subghz/scenes/subghz_scene_test.c @@ -1,4 +1,3 @@ -#if FURI_DEBUG #include "../subghz_i.h" enum SubmenuIndex { @@ -21,11 +20,12 @@ void subghz_scene_test_on_enter(void* context) { SubmenuIndexCarrier, subghz_scene_test_submenu_callback, subghz); +#if FURI_DEBUG submenu_add_item( subghz->submenu, "Packet", SubmenuIndexPacket, subghz_scene_test_submenu_callback, subghz); submenu_add_item( subghz->submenu, "Static", SubmenuIndexStatic, subghz_scene_test_submenu_callback, subghz); - +#endif submenu_set_selected_item( subghz->submenu, scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneTest)); @@ -41,7 +41,9 @@ bool subghz_scene_test_on_event(void* context, SceneManagerEvent event) { subghz->scene_manager, SubGhzSceneTest, SubmenuIndexCarrier); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTestCarrier); return true; - } else if(event.event == SubmenuIndexPacket) { + } +#if FURI_DEBUG + else if(event.event == SubmenuIndexPacket) { scene_manager_set_scene_state( subghz->scene_manager, SubGhzSceneTest, SubmenuIndexPacket); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTestPacket); @@ -52,6 +54,7 @@ bool subghz_scene_test_on_event(void* context, SceneManagerEvent event) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneTestStatic); return true; } +#endif } return false; } @@ -60,4 +63,3 @@ void subghz_scene_test_on_exit(void* context) { SubGhz* subghz = context; submenu_reset(subghz->submenu); } -#endif \ No newline at end of file diff --git a/applications/main/subghz/scenes/subghz_scene_test_carrier.c b/applications/main/subghz/scenes/subghz_scene_test_carrier.c index 4682a627c..2e1ec4d9c 100644 --- a/applications/main/subghz/scenes/subghz_scene_test_carrier.c +++ b/applications/main/subghz/scenes/subghz_scene_test_carrier.c @@ -1,4 +1,3 @@ -#if FURI_DEBUG #include "../subghz_i.h" #include "../views/subghz_test_carrier.h" @@ -28,5 +27,4 @@ bool subghz_scene_test_carrier_on_event(void* context, SceneManagerEvent event) void subghz_scene_test_carrier_on_exit(void* context) { UNUSED(context); -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c index 176e9079e..37701372f 100644 --- a/applications/main/subghz/subghz.c +++ b/applications/main/subghz/subghz.c @@ -148,6 +148,13 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) { subghz->view_dispatcher, SubGhzViewIdFrequencyAnalyzer, subghz_frequency_analyzer_get_view(subghz->subghz_frequency_analyzer)); + + // Carrier Test Module + subghz->subghz_test_carrier = subghz_test_carrier_alloc(); + view_dispatcher_add_view( + subghz->view_dispatcher, + SubGhzViewIdTestCarrier, + subghz_test_carrier_get_view(subghz->subghz_test_carrier)); } // Read RAW subghz->subghz_read_raw = subghz_read_raw_alloc(alloc_for_tx_only); @@ -157,13 +164,6 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) { subghz_read_raw_get_view(subghz->subghz_read_raw)); #if FURI_DEBUG - // Carrier Test Module - subghz->subghz_test_carrier = subghz_test_carrier_alloc(); - view_dispatcher_add_view( - subghz->view_dispatcher, - SubGhzViewIdTestCarrier, - subghz_test_carrier_get_view(subghz->subghz_test_carrier)); - // Packet Test subghz->subghz_test_packet = subghz_test_packet_alloc(); view_dispatcher_add_view( @@ -278,16 +278,16 @@ void subghz_free(SubGhz* subghz, bool alloc_for_tx_only) { view_dispatcher_remove_view(subghz->view_dispatcher, SubGhzViewIdTestPacket); subghz_test_packet_free(subghz->subghz_test_packet); - // Carrier Test - view_dispatcher_remove_view(subghz->view_dispatcher, SubGhzViewIdTestCarrier); - subghz_test_carrier_free(subghz->subghz_test_carrier); - // Static view_dispatcher_remove_view(subghz->view_dispatcher, SubGhzViewIdStatic); subghz_test_static_free(subghz->subghz_test_static); #endif if(!alloc_for_tx_only) { + // Carrier Test + view_dispatcher_remove_view(subghz->view_dispatcher, SubGhzViewIdTestCarrier); + subghz_test_carrier_free(subghz->subghz_test_carrier); + // Receiver view_dispatcher_remove_view(subghz->view_dispatcher, SubGhzViewIdReceiver); subghz_view_receiver_free(subghz->subghz_receiver); diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h index b177c1ba7..47715db5a 100644 --- a/applications/main/subghz/subghz_i.h +++ b/applications/main/subghz/subghz_i.h @@ -7,9 +7,9 @@ #include "views/subghz_frequency_analyzer.h" #include "views/subghz_read_raw.h" +#include "views/subghz_test_carrier.h" #if FURI_DEBUG #include "views/subghz_test_static.h" -#include "views/subghz_test_carrier.h" #include "views/subghz_test_packet.h" #endif // #include @@ -98,9 +98,9 @@ struct SubGhz { SubGhzFrequencyAnalyzer* subghz_frequency_analyzer; SubGhzReadRAW* subghz_read_raw; bool raw_send_only; + SubGhzTestCarrier* subghz_test_carrier; #if FURI_DEBUG SubGhzTestStatic* subghz_test_static; - SubGhzTestCarrier* subghz_test_carrier; SubGhzTestPacket* subghz_test_packet; #endif string_t error_str;