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

Merge branch 'dev' of https://github.com/claracrazy/flipper-xtreme into dev

Browse Source
This commit is contained in:
ClaraCrazy
2023-07-19 18:25:23 +02:00
parent 64cbdf3077 4e056c8d95
commit 166c9a58ad
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/loader/loader_cli.c
+4 -1
View File
@@ -18,6 +18,9 @@ static void loader_cli_list() {
for(size_t i = 0; i < FLIPPER_APPS_COUNT; i++) {
printf("\t%s\r\n", FLIPPER_APPS[i].name);
}
for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
printf("\t%s\r\n", FLIPPER_EXTERNAL_APPS[i].name);
}
printf("Settings:\r\n");
for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) {
printf("\t%s\r\n", FLIPPER_SETTINGS_APPS[i].name);
@@ -104,4 +107,4 @@ void loader_on_system_start() {
#else
UNUSED(loader_cli);
#endif
}
}
applications/settings/desktop_settings/scenes/desktop_settings_scene_keybinds_action.c
+13 -13
View File
@@ -25,19 +25,6 @@ void desktop_settings_scene_keybinds_action_on_enter(void* context) {
app->scene_manager, DesktopSettingsAppSceneKeybindsActionType);
if(action_type == DesktopSettingsAppKeybindActionTypeMainApp) {
for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
submenu_add_item(
submenu,
FLIPPER_EXTERNAL_APPS[i].name,
(uint32_t)FLIPPER_EXTERNAL_APPS[i].name,
desktop_settings_scene_keybinds_action_submenu_callback,
app);
// Select keybind item in submenu
if(!strncmp(FLIPPER_EXTERNAL_APPS[i].name, keybind, MAX_KEYBIND_LENGTH)) {
pre_select_item = (uint32_t)FLIPPER_EXTERNAL_APPS[i].name;
}
}
for(size_t i = 0; i < FLIPPER_APPS_COUNT; i++) {
submenu_add_item(
submenu,
@@ -51,6 +38,19 @@ void desktop_settings_scene_keybinds_action_on_enter(void* context) {
pre_select_item = (uint32_t)FLIPPER_APPS[i].name;
}
}
for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
submenu_add_item(
submenu,
FLIPPER_EXTERNAL_APPS[i].name,
(uint32_t)FLIPPER_EXTERNAL_APPS[i].name,
desktop_settings_scene_keybinds_action_submenu_callback,
app);
// Select keybind item in submenu
if(!strncmp(FLIPPER_EXTERNAL_APPS[i].name, keybind, MAX_KEYBIND_LENGTH)) {
pre_select_item = (uint32_t)FLIPPER_EXTERNAL_APPS[i].name;
}
}
} else if(action_type == DesktopSettingsAppKeybindActionTypeMoreActions) {
for(size_t i = 0; i < EXTRA_KEYBINDS_COUNT; i++) {
submenu_add_item(
applications/settings/desktop_settings/scenes/desktop_settings_scene_keybinds_action_type.c
+5
View File
@@ -107,6 +107,11 @@ void desktop_settings_scene_keybinds_action_type_on_enter(void* context) {
selected = DesktopSettingsAppKeybindActionTypeMainApp;
}
}
for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
if(!strncmp(FLIPPER_EXTERNAL_APPS[i].name, keybind, MAX_KEYBIND_LENGTH)) {
selected = DesktopSettingsAppKeybindActionTypeMainApp;
}
}
if(storage_file_exists(furi_record_open(RECORD_STORAGE), keybind)) {
selected = DesktopSettingsAppKeybindActionTypeExternalApp;