Use AC Remote from OFW, same for Audio remote

ASSETS update needed, will be done soon

applications/main/infrared/scenes/infrared_scene_universal_ac.c

@@ -11,7 +11,6 @@ void infrared_scene_universal_ac_on_enter(void* context) {
 
     infrared_brute_force_set_db_filename(brute_force, EXT_PATH("infrared/assets/ac.ir"));
 
-    //TODO Improve A/C universal remote
     button_panel_reserve(button_panel, 2, 3);
     uint32_t i = 0;
     button_panel_add_item(
@@ -20,77 +19,74 @@ void infrared_scene_universal_ac_on_enter(void* context) {
         0,
         0,
         3,
-        24,
+        22,
-        &I_Power_25x27,
+        &I_Off_25x27,
-        &I_Power_hvr_25x27,
+        &I_Off_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "POWER");
+    infrared_brute_force_add_record(brute_force, i++, "Off");
     button_panel_add_item(
         button_panel,
         i,
         1,
         0,
         36,
-        24,
+        22,
-        &I_Mode_25x27,
+        &I_Dehumidify_25x27,
-        &I_Mode_hvr_25x27,
+        &I_Dehumidify_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "MODE");
+    infrared_brute_force_add_record(brute_force, i++, "Dh");
     button_panel_add_item(
         button_panel,
         i,
         0,
         1,
         3,
-        66,
+        59,
-        &I_Vol_up_25x27,
+        &I_CoolHi_25x27,
-        &I_Vol_up_hvr_25x27,
+        &I_CoolHi_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "TEMP+");
+    infrared_brute_force_add_record(brute_force, i++, "Cool_hi");
     button_panel_add_item(
         button_panel,
         i,
         1,
         1,
         36,
-        66,
+        59,
-        &I_Vol_down_25x27,
+        &I_HeatHi_25x27,
-        &I_Vol_down_hvr_25x27,
+        &I_HeatHi_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "TEMP-");
+    infrared_brute_force_add_record(brute_force, i++, "Heat_hi");
     button_panel_add_item(
         button_panel,
         i,
         0,
         2,
         3,
-        98,
+        91,
-        &I_Swing_25x27,
+        &I_CoolLo_25x27,
-        &I_Swing_hvr_25x27,
+        &I_CoolLo_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "SWING");
+    infrared_brute_force_add_record(brute_force, i++, "Cool_lo");
     button_panel_add_item(
         button_panel,
         i,
         1,
         2,
         36,
-        98,
+        91,
-        &I_Timer_25x27,
+        &I_HeatLo_25x27,
-        &I_Timer_hvr_25x27,
+        &I_HeatLo_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "TIMER");
+    infrared_brute_force_add_record(brute_force, i++, "Heat_lo");
 
-    button_panel_add_label(button_panel, 6, 11, FontPrimary, "AC remote");
+    button_panel_add_label(button_panel, 6, 10, FontPrimary, "AC remote");
-    button_panel_add_label(button_panel, 20, 63, FontSecondary, "Temp");
-    button_panel_add_label(button_panel, 8, 23, FontSecondary, "Pwr");
-    button_panel_add_label(button_panel, 40, 23, FontSecondary, "Mod");
 
     view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);

applications/main/infrared/scenes/infrared_scene_universal_audio.c

@@ -10,8 +10,8 @@ void infrared_scene_universal_audio_on_enter(void* context) {
     InfraredBruteForce* brute_force = infrared->brute_force;
 
     infrared_brute_force_set_db_filename(brute_force, EXT_PATH("infrared/assets/audio.ir"));
-    //TODO Improve Audio universal remote
+
-    button_panel_reserve(button_panel, 2, 2);
+    button_panel_reserve(button_panel, 2, 4);
     uint32_t i = 0;
     button_panel_add_item(
         button_panel,
@@ -19,51 +19,98 @@ void infrared_scene_universal_audio_on_enter(void* context) {
         0,
         0,
         3,
-        19,
+        11,
         &I_Power_25x27,
         &I_Power_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "POWER");
+    infrared_brute_force_add_record(brute_force, i++, "Power");
     button_panel_add_item(
         button_panel,
         i,
         1,
         0,
         36,
-        19,
+        11,
         &I_Mute_25x27,
         &I_Mute_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "MUTE");
+    infrared_brute_force_add_record(brute_force, i++, "Mute");
     button_panel_add_item(
         button_panel,
         i,
         0,
         1,
         3,
-        64,
+        41,
-        &I_Vol_up_25x27,
+        &I_Play_25x27,
-        &I_Vol_up_hvr_25x27,
+        &I_Play_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "VOL+");
+    infrared_brute_force_add_record(brute_force, i++, "Play");
     button_panel_add_item(
         button_panel,
         i,
         1,
         1,
         36,
-        64,
+        41,
+        &I_Pause_25x27,
+        &I_Pause_hvr_25x27,
+        infrared_scene_universal_common_item_callback,
+        context);
+    infrared_brute_force_add_record(brute_force, i++, "Pause");
+    button_panel_add_item(
+        button_panel,
+        i,
+        0,
+        2,
+        3,
+        71,
+        &I_TrackPrev_25x27,
+        &I_TrackPrev_hvr_25x27,
+        infrared_scene_universal_common_item_callback,
+        context);
+    infrared_brute_force_add_record(brute_force, i++, "Prev");
+    button_panel_add_item(
+        button_panel,
+        i,
+        1,
+        2,
+        36,
+        71,
+        &I_TrackNext_25x27,
+        &I_TrackNext_hvr_25x27,
+        infrared_scene_universal_common_item_callback,
+        context);
+    infrared_brute_force_add_record(brute_force, i++, "Next");
+    button_panel_add_item(
+        button_panel,
+        i,
+        0,
+        3,
+        3,
+        101,
         &I_Vol_down_25x27,
         &I_Vol_down_hvr_25x27,
         infrared_scene_universal_common_item_callback,
         context);
-    infrared_brute_force_add_record(brute_force, i++, "VOL-");
+    infrared_brute_force_add_record(brute_force, i++, "Vol_dn");
+    button_panel_add_item(
+        button_panel,
+        i,
+        1,
+        3,
+        36,
+        101,
+        &I_Vol_up_25x27,
+        &I_Vol_up_hvr_25x27,
+        infrared_scene_universal_common_item_callback,
+        context);
+    infrared_brute_force_add_record(brute_force, i++, "Vol_up");
 
-    button_panel_add_label(button_panel, 5, 11, FontSecondary, "Audio remote");
+    button_panel_add_label(button_panel, 1, 8, FontPrimary, "Mus. remote");
-    button_panel_add_label(button_panel, 17, 60, FontSecondary, "Volume");
 
     view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);