mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-04-24 03:29:57 -07:00
Merge branch 'UNLEASHED' into 420
This commit is contained in:
@@ -75,10 +75,18 @@ bool subghz_scene_more_raw_on_event(void* context, SceneManagerEvent event) {
|
||||
}
|
||||
}
|
||||
} else if(event.event == SubmenuIndexDecode) {
|
||||
scene_manager_set_scene_state(
|
||||
subghz->scene_manager, SubGhzSceneMoreRAW, SubmenuIndexDecode);
|
||||
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneDecodeRAW);
|
||||
return true;
|
||||
if(subghz_file_available(subghz)) {
|
||||
scene_manager_set_scene_state(
|
||||
subghz->scene_manager, SubGhzSceneMoreRAW, SubmenuIndexDecode);
|
||||
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneDecodeRAW);
|
||||
return true;
|
||||
} else {
|
||||
if(!scene_manager_search_and_switch_to_previous_scene(
|
||||
subghz->scene_manager, SubGhzSceneStart)) {
|
||||
scene_manager_stop(subghz->scene_manager);
|
||||
view_dispatcher_stop(subghz->view_dispatcher);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -77,13 +77,28 @@ FIRMWARE_APPS = {
|
||||
# Debug
|
||||
# "debug_apps",
|
||||
],
|
||||
"debug_pack": [
|
||||
# Svc
|
||||
"unit_tests": [
|
||||
"basic_services",
|
||||
"updater_app",
|
||||
"unit_tests",
|
||||
"nfc",
|
||||
],
|
||||
"debug_pack": [
|
||||
# Svc
|
||||
"basic_services",
|
||||
# Apps
|
||||
"main_apps_default",
|
||||
"system_apps",
|
||||
# Settings
|
||||
"settings_apps",
|
||||
# Plugins
|
||||
# "basic_plugins",
|
||||
# Debug
|
||||
# "debug_apps",
|
||||
# "updater_app",
|
||||
# "unit_tests",
|
||||
# "nfc",
|
||||
],
|
||||
}
|
||||
|
||||
FIRMWARE_APP_SET = "default"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
entry,status,name,type,params
|
||||
Version,+,7.4,,
|
||||
Version,+,7.41,,
|
||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||
Header,+,applications/services/cli/cli.h,,
|
||||
Header,+,applications/services/cli/cli_vcp.h,,
|
||||
|
||||
|
Reference in New Issue
Block a user