Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

applications/main/infrared/scenes/infrared_scene_config.h

@@ -23,7 +23,7 @@ ADD_SCENE(infrared, universal_audio, UniversalAudio)
 ADD_SCENE(infrared, universal_led, UniversalLED)
 ADD_SCENE(infrared, universal_ac, UniversalAC)
 ADD_SCENE(infrared, universal_fan, UniversalFan)
+ADD_SCENE(infrared, gpio_settings, GpioSettings)
 ADD_SCENE(infrared, debug, Debug)
 ADD_SCENE(infrared, error_databases, ErrorDatabases)
-ADD_SCENE(infrared, debug_settings, DebugSettings)
 ADD_SCENE(infrared, rpc, Rpc)

applications/main/infrared/scenes/infrared_scene_debug_settings.c

@@ -1,141 +0,0 @@
-#include "../infrared_app_i.h"
-
-#include <furi_hal_infrared.h>
-
-uint8_t value_index_ir;
-
-#define DEB_PINS_COUNT (sizeof(infrared_debug_cfg_variables_text) / sizeof(char* const))
-const char* const infrared_debug_cfg_variables_text[] = {
-    "Internal",
-    "2 (A7)",
-};
-
-static void infrared_scene_debug_settings_auto_detect_changed(VariableItem* item) {
-    InfraredApp* infrared = variable_item_get_context(item);
-    bool value = variable_item_get_current_value_index(item);
-
-    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
-
-    // enable/disable other list items
-    VariableItemList* var_item_list = infrared->variable_item_list;
-    variable_item_set_locked(variable_item_list_get(var_item_list, 1), value, NULL);
-    variable_item_set_locked(variable_item_list_get(var_item_list, 2), value, NULL);
-
-    infrared->last_settings->auto_detect = value;
-    infrared_last_settings_save(infrared->last_settings);
-
-    furi_hal_infrared_set_auto_detect(infrared->last_settings->auto_detect);
-    if(!infrared->last_settings->auto_detect) {
-        furi_hal_infrared_set_debug_out(infrared->last_settings->ext_out);
-        if(infrared->last_settings->ext_5v) {
-            uint8_t attempts = 0;
-            while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
-                furi_hal_power_enable_otg();
-                furi_delay_ms(10);
-            }
-        } else if(furi_hal_power_is_otg_enabled()) {
-            furi_hal_power_disable_otg();
-        }
-    } else if(furi_hal_power_is_otg_enabled()) {
-        furi_hal_power_disable_otg();
-    }
-}
-
-static void infrared_scene_debug_settings_pin_changed(VariableItem* item) {
-    InfraredApp* infrared = variable_item_get_context(item);
-    value_index_ir = variable_item_get_current_value_index(item);
-
-    variable_item_set_current_value_text(item, infrared_debug_cfg_variables_text[value_index_ir]);
-
-    furi_hal_infrared_set_debug_out(value_index_ir);
-
-    infrared->last_settings->ext_out = value_index_ir == 1;
-    infrared_last_settings_save(infrared->last_settings);
-}
-
-static void infrared_scene_debug_settings_power_changed(VariableItem* item) {
-    InfraredApp* infrared = variable_item_get_context(item);
-    bool value = variable_item_get_current_value_index(item);
-    if(value) {
-        uint8_t attempts = 0;
-        while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
-            furi_hal_power_enable_otg();
-            furi_delay_ms(10);
-        }
-    } else {
-        if(furi_hal_power_is_otg_enabled()) {
-            furi_hal_power_disable_otg();
-        }
-    }
-    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
-
-    infrared->last_settings->ext_5v = value;
-    infrared_last_settings_save(infrared->last_settings);
-}
-
-static void infrared_debug_settings_start_var_list_enter_callback(void* context, uint32_t index) {
-    InfraredApp* infrared = context;
-    view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
-}
-
-void infrared_scene_debug_settings_on_enter(void* context) {
-    InfraredApp* infrared = context;
-
-    VariableItemList* variable_item_list = infrared->variable_item_list;
-    variable_item_list_set_enter_callback(
-        variable_item_list, infrared_debug_settings_start_var_list_enter_callback, infrared);
-
-    VariableItem* item = variable_item_list_add(
-        variable_item_list,
-        "Auto detect",
-        2,
-        infrared_scene_debug_settings_auto_detect_changed,
-        infrared);
-
-    bool auto_detect = infrared->last_settings->auto_detect;
-
-    variable_item_set_current_value_index(item, auto_detect);
-    variable_item_set_current_value_text(item, auto_detect ? "ON" : "OFF");
-
-    item = variable_item_list_add(
-        variable_item_list,
-        "Send signal to",
-        DEB_PINS_COUNT,
-        infrared_scene_debug_settings_pin_changed,
-        infrared);
-
-    value_index_ir = infrared->last_settings->ext_out;
-
-    variable_item_list_set_enter_callback(
-        variable_item_list, infrared_debug_settings_start_var_list_enter_callback, infrared);
-
-    variable_item_set_current_value_index(item, value_index_ir);
-    variable_item_set_current_value_text(item, infrared_debug_cfg_variables_text[value_index_ir]);
-    variable_item_set_locked(item, auto_detect, "Disable auto detect");
-
-    item = variable_item_list_add(
-        variable_item_list,
-        "Ext Module 5v",
-        2,
-        infrared_scene_debug_settings_power_changed,
-        infrared);
-    bool enabled = infrared->last_settings->ext_5v;
-    variable_item_set_current_value_index(item, enabled);
-    variable_item_set_current_value_text(item, enabled ? "ON" : "OFF");
-    variable_item_set_locked(item, auto_detect, "Disable auto detect");
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewVariableItemList);
-}
-
-bool infrared_scene_debug_settings_on_event(void* context, SceneManagerEvent event) {
-    InfraredApp* infrared = context;
-    UNUSED(infrared);
-    UNUSED(event);
-
-    return false;
-}
-
-void infrared_scene_debug_settings_on_exit(void* context) {
-    InfraredApp* infrared = context;
-    variable_item_list_reset(infrared->variable_item_list);
-}

applications/main/infrared/scenes/infrared_scene_gpio_settings.c

@@ -0,0 +1,102 @@
+#include "../infrared_app_i.h"
+
+static const char* infrared_scene_gpio_settings_pin_text[] = {
+    "Flipper",
+    "2 (A7)",
+    "Detect",
+};
+
+static const char* infrared_scene_gpio_settings_otg_text[] = {
+    "OFF",
+    "ON",
+};
+
+static void infrared_scene_gpio_settings_pin_change_callback(VariableItem* item) {
+    InfraredApp* infrared = variable_item_get_context(item);
+    const uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, infrared_scene_gpio_settings_pin_text[index]);
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher,
+        infrared_custom_event_pack(InfraredCustomEventTypeGpioTxPinChanged, index));
+}
+
+static void infrared_scene_gpio_settings_otg_change_callback(VariableItem* item) {
+    InfraredApp* infrared = variable_item_get_context(item);
+    const uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, infrared_scene_gpio_settings_otg_text[index]);
+    view_dispatcher_send_custom_event(
+        infrared->view_dispatcher,
+        infrared_custom_event_pack(InfraredCustomEventTypeGpioOtgChanged, index));
+}
+
+static void infrared_scene_gpio_settings_init(InfraredApp* infrared) {
+    VariableItemList* var_item_list = infrared->var_item_list;
+    VariableItem* item;
+    uint8_t value_index;
+
+    item = variable_item_list_add(
+        var_item_list,
+        "Signal Output",
+        COUNT_OF(infrared_scene_gpio_settings_pin_text),
+        infrared_scene_gpio_settings_pin_change_callback,
+        infrared);
+
+    value_index = infrared->app_state.tx_pin;
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, infrared_scene_gpio_settings_pin_text[value_index]);
+
+    item = variable_item_list_add(
+        var_item_list,
+        "5V on GPIO",
+        COUNT_OF(infrared_scene_gpio_settings_otg_text),
+        infrared_scene_gpio_settings_otg_change_callback,
+        infrared);
+
+    if(infrared->app_state.tx_pin < FuriHalInfraredTxPinMax) {
+        value_index = infrared->app_state.is_otg_enabled;
+        variable_item_set_current_value_index(item, value_index);
+        variable_item_set_current_value_text(
+            item, infrared_scene_gpio_settings_otg_text[value_index]);
+    } else {
+        variable_item_set_values_count(item, 1);
+        variable_item_set_current_value_index(item, 0);
+        variable_item_set_current_value_text(item, "Auto");
+    }
+}
+
+void infrared_scene_gpio_settings_on_enter(void* context) {
+    InfraredApp* infrared = context;
+    infrared_scene_gpio_settings_init(infrared);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewVariableList);
+}
+
+bool infrared_scene_gpio_settings_on_event(void* context, SceneManagerEvent event) {
+    bool consumed = false;
+
+    InfraredApp* infrared = context;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        const uint16_t custom_event_type = infrared_custom_event_get_type(event.event);
+        const uint16_t custom_event_value = infrared_custom_event_get_value(event.event);
+
+        if(custom_event_type == InfraredCustomEventTypeGpioTxPinChanged) {
+            infrared_set_tx_pin(infrared, custom_event_value);
+            variable_item_list_reset(infrared->var_item_list);
+            infrared_scene_gpio_settings_init(infrared);
+        } else if(custom_event_type == InfraredCustomEventTypeGpioOtgChanged) {
+            infrared_enable_otg(infrared, custom_event_value);
+        }
+
+        consumed = true;
+    }
+
+    return consumed;
+}
+
+void infrared_scene_gpio_settings_on_exit(void* context) {
+    InfraredApp* infrared = context;
+    variable_item_list_reset(infrared->var_item_list);
+    infrared_save_settings(infrared);
+}

applications/main/infrared/scenes/infrared_scene_learn_done.c

@@ -6,7 +6,7 @@ void infrared_scene_learn_done_on_enter(void* context) {
 
     if(infrared->app_state.is_learning_new_remote) {
         popup_set_icon(popup, 48, 6, &I_DolphinDone_80x58);
-        popup_set_header(popup, "New remote\ncreated!", 0, 0, AlignLeft, AlignTop);
+        popup_set_header(popup, "Success!", 10, 12, AlignLeft, AlignTop);
     } else {
         popup_set_icon(popup, 36, 5, &I_DolphinSaved_92x58);
         popup_set_header(popup, "Saved", 15, 19, AlignLeft, AlignBottom);

applications/main/infrared/scenes/infrared_scene_start.c

@@ -4,7 +4,7 @@ enum SubmenuIndex {
     SubmenuIndexUniversalRemotes,
     SubmenuIndexLearnNewRemote,
     SubmenuIndexSavedRemotes,
-    SubmenuIndexDebugSettings,
+    SubmenuIndexGpioSettings,
     SubmenuIndexLearnNewRemoteRaw,
     SubmenuIndexDebug
 };
@@ -40,7 +40,7 @@ void infrared_scene_start_on_enter(void* context) {
     submenu_add_item(
         submenu,
         "GPIO Settings",
-        SubmenuIndexDebugSettings,
+        SubmenuIndexGpioSettings,
         infrared_scene_start_submenu_callback,
         infrared);
 
@@ -80,7 +80,6 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
         scene_manager_set_scene_state(scene_manager, InfraredSceneStart, submenu_index);
         if(submenu_index == SubmenuIndexUniversalRemotes) {
             scene_manager_next_scene(scene_manager, InfraredSceneUniversal);
-            consumed = true;
         } else if(
             submenu_index == SubmenuIndexLearnNewRemote ||
             submenu_index == SubmenuIndexLearnNewRemoteRaw) {
@@ -90,18 +89,16 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
                 infrared->worker, submenu_index == SubmenuIndexLearnNewRemote);
             infrared->app_state.is_learning_new_remote = true;
             scene_manager_next_scene(scene_manager, InfraredSceneLearn);
-            consumed = true;
         } else if(submenu_index == SubmenuIndexSavedRemotes) {
             furi_string_set(infrared->file_path, INFRARED_APP_FOLDER);
             scene_manager_next_scene(scene_manager, InfraredSceneRemoteList);
-            consumed = true;
+        } else if(submenu_index == SubmenuIndexGpioSettings) {
+            scene_manager_next_scene(scene_manager, InfraredSceneGpioSettings);
         } else if(submenu_index == SubmenuIndexDebug) {
             scene_manager_next_scene(scene_manager, InfraredSceneDebug);
-            consumed = true;
-        } else if(submenu_index == SubmenuIndexDebugSettings) {
-            scene_manager_next_scene(scene_manager, InfraredSceneDebugSettings);
-            consumed = true;
         }
+
+        consumed = true;
     }
 
     return consumed;