Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

applications/main/infrared/infrared.c

@@ -247,6 +247,11 @@ static void infrared_free(Infrared* infrared) {
 
     furi_string_free(infrared->file_path);
 
+    // Disable 5v power if was enabled for external module
+    if(furi_hal_power_is_otg_enabled()) {
+        furi_hal_power_disable_otg();
+    }
+
     free(infrared);
 }
 
@@ -480,10 +485,6 @@ int32_t infrared_app(char* p) {
 
     view_dispatcher_run(infrared->view_dispatcher);
 
-    if(furi_hal_power_is_otg_enabled()) {
-        furi_hal_power_disable_otg();
-    }
-
     infrared_free(infrared);
     return 0;
 }

applications/main/infrared/scenes/infrared_scene_start.c

@@ -3,10 +3,10 @@
 enum SubmenuIndex {
     SubmenuIndexUniversalRemotes,
     SubmenuIndexLearnNewRemote,
-    SubmenuIndexLearnNewRemoteRaw,
     SubmenuIndexSavedRemotes,
-    SubmenuIndexDebug,
-    SubmenuIndexDebugSettings
+    SubmenuIndexDebugSettings,
+    SubmenuIndexLearnNewRemoteRaw,
+    SubmenuIndexDebug
 };
 
 static void infrared_scene_start_submenu_callback(void* context, uint32_t index) {
@@ -37,6 +37,12 @@ void infrared_scene_start_on_enter(void* context) {
         SubmenuIndexSavedRemotes,
         infrared_scene_start_submenu_callback,
         infrared);
+    submenu_add_item(
+        submenu,
+        "GPIO Settings",
+        SubmenuIndexDebugSettings,
+        infrared_scene_start_submenu_callback,
+        infrared);
 
     submenu_add_lockable_item(
         submenu,
@@ -54,14 +60,6 @@ void infrared_scene_start_on_enter(void* context) {
         infrared,
         !infrared->app_state.is_debug_enabled,
         "Enable\nDebug!");
-    submenu_add_lockable_item(
-        submenu,
-        "Debug Settings",
-        SubmenuIndexDebugSettings,
-        infrared_scene_start_submenu_callback,
-        infrared,
-        !infrared->app_state.is_debug_enabled,
-        "Enable\nDebug!");
 
     const uint32_t submenu_index =
         scene_manager_get_scene_state(scene_manager, InfraredSceneStart);