mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-27 06:50:21 +00:00
Fix merge issues
This commit is contained in:
parent
3d36105142
commit
60cd7b8b32
1 changed files with 6 additions and 6 deletions
|
@ -24,7 +24,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
|
||||||
&I_Power_hvr_25x27,
|
&I_Power_hvr_25x27,
|
||||||
infrared_scene_universal_common_item_callback,
|
infrared_scene_universal_common_item_callback,
|
||||||
context);
|
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_add_item(
|
||||||
button_panel,
|
button_panel,
|
||||||
i,
|
i,
|
||||||
|
@ -36,7 +36,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
|
||||||
&I_Mute_hvr_25x27,
|
&I_Mute_hvr_25x27,
|
||||||
infrared_scene_universal_common_item_callback,
|
infrared_scene_universal_common_item_callback,
|
||||||
context);
|
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_add_item(
|
||||||
button_panel,
|
button_panel,
|
||||||
i,
|
i,
|
||||||
|
@ -48,7 +48,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
|
||||||
&I_Vol_up_hvr_25x27,
|
&I_Vol_up_hvr_25x27,
|
||||||
infrared_scene_universal_common_item_callback,
|
infrared_scene_universal_common_item_callback,
|
||||||
context);
|
context);
|
||||||
infrared_brute_force_add_record(brute_force, i++, "Vol_up");
|
infrared_brute_force_add_record(brute_force, i++, "VOL+");
|
||||||
button_panel_add_item(
|
button_panel_add_item(
|
||||||
button_panel,
|
button_panel,
|
||||||
i,
|
i,
|
||||||
|
@ -60,7 +60,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
|
||||||
&I_Up_hvr_25x27,
|
&I_Up_hvr_25x27,
|
||||||
infrared_scene_universal_common_item_callback,
|
infrared_scene_universal_common_item_callback,
|
||||||
context);
|
context);
|
||||||
infrared_brute_force_add_record(brute_force, i++, "Ch_next");
|
infrared_brute_force_add_record(brute_force, i++, "CH+");
|
||||||
button_panel_add_item(
|
button_panel_add_item(
|
||||||
button_panel,
|
button_panel,
|
||||||
i,
|
i,
|
||||||
|
@ -72,7 +72,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
|
||||||
&I_Vol_down_hvr_25x27,
|
&I_Vol_down_hvr_25x27,
|
||||||
infrared_scene_universal_common_item_callback,
|
infrared_scene_universal_common_item_callback,
|
||||||
context);
|
context);
|
||||||
infrared_brute_force_add_record(brute_force, i++, "Vol_dn");
|
infrared_brute_force_add_record(brute_force, i++, "VOL-");
|
||||||
button_panel_add_item(
|
button_panel_add_item(
|
||||||
button_panel,
|
button_panel,
|
||||||
i,
|
i,
|
||||||
|
@ -84,7 +84,7 @@ void infrared_scene_universal_tv_on_enter(void* context) {
|
||||||
&I_Down_hvr_25x27,
|
&I_Down_hvr_25x27,
|
||||||
infrared_scene_universal_common_item_callback,
|
infrared_scene_universal_common_item_callback,
|
||||||
context);
|
context);
|
||||||
infrared_brute_force_add_record(brute_force, i++, "Ch_prev");
|
infrared_brute_force_add_record(brute_force, i++, "CH-");
|
||||||
|
|
||||||
button_panel_add_label(button_panel, 6, 11, FontPrimary, "TV remote");
|
button_panel_add_label(button_panel, 6, 11, FontPrimary, "TV remote");
|
||||||
button_panel_add_label(button_panel, 9, 64, FontSecondary, "Vol");
|
button_panel_add_label(button_panel, 9, 64, FontSecondary, "Vol");
|
||||||
|
|
Loading…
Reference in a new issue