From c9ee09b1f6705289a5c2c680df82076e36b0c937 Mon Sep 17 00:00:00 2001
From: Federico Amedeo Izzo <federico@izzo.pro>
Date: Fri, 29 Jan 2021 22:41:42 +0100
Subject: [PATCH] UI: Add Brightness/Contrast change

---
 openrtx/src/ui/ui.c      | 40 ++++++++++++++++++++++++++++++++++++----
 openrtx/src/ui/ui_menu.c |  4 ++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c
index f3ed7919..c4ce14aa 100644
--- a/openrtx/src/ui/ui.c
+++ b/openrtx/src/ui/ui.c
@@ -494,6 +494,24 @@ void _ui_fsm_insertVFONumber(kbd_msg_t msg, bool *sync_rtx) {
     }
 }
 
+void _ui_changeBrightness(int variation)
+{
+    if(variation >= 0)
+        settings.brightness = (255 - settings.brightness < variation) ? 255 : settings.brightness + variation;
+    else
+        settings.brightness = (settings.brightness < -variation) ? 0 : settings.brightness + variation;
+    platform_setBacklightLevel(settings.brightness);
+}
+
+void _ui_changeContrast(int variation)
+{
+    if(variation >= 0)
+        settings.contrast = (255 - settings.contrast < variation) ? 255 : settings.contrast + variation;
+    else
+        settings.contrast = (settings.contrast < -variation) ? 0 : settings.contrast + variation;
+    display_setContrast(settings.contrast);
+}
+
 void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) {
     ui_state.input_number = input_getPressedNumber(msg);
     // CTCSS Encode/Decode Selection
@@ -537,12 +555,10 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) {
             *sync_rtx = true;
             break;
         case 7:
-            settings.brightness = (settings.brightness + 25 > 255) ? 255 : settings.brightness + 25;
-            platform_setBacklightLevel(settings.brightness);
+            _ui_changeBrightness(+25);
             break;
         case 8:
-            settings.brightness = (settings.brightness - 25 < 0) ? 0 : settings.brightness - 25;
-            platform_setBacklightLevel(settings.brightness);
+            _ui_changeBrightness(-25);
             break;
     }
 
@@ -941,9 +957,25 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
                 }
                 if(msg.keys & KEY_LEFT)
                 {
+                    if(strcmp(display_items[ui_state.menu_selected], "Brightness") == 0)
+                    {
+                        _ui_changeBrightness(-25);
+                    }
+                    else if(strcmp(display_items[ui_state.menu_selected], "Contrast") == 0)
+                    {
+                        _ui_changeContrast(-25);
+                    }
                 }
                 else if(msg.keys & KEY_RIGHT)
                 {
+                    if(strcmp(display_items[ui_state.menu_selected], "Brightness") == 0)
+                    {
+                        _ui_changeBrightness(+25);
+                    }
+                    else if(strcmp(display_items[ui_state.menu_selected], "Contrast") == 0)
+                    {
+                        _ui_changeContrast(+25);
+                    }
                 }
                 else if(msg.keys & KEY_ESC)
                 {
diff --git a/openrtx/src/ui/ui_menu.c b/openrtx/src/ui/ui_menu.c
index d9cb1250..654d1697 100644
--- a/openrtx/src/ui/ui_menu.c
+++ b/openrtx/src/ui/ui_menu.c
@@ -117,9 +117,9 @@ int _ui_getDisplayValueName(char *buf, uint8_t max_len, uint8_t index)
 {
     if(index >= display_num) return -1;
     uint8_t value = 0;
-    if(strcmp(display_items[index], "Brightness"))
+    if(strcmp(display_items[index], "Brightness") == 0)
         value = settings.brightness;
-    else if(strcmp(display_items[index], "Contrast"))
+    else if(strcmp(display_items[index], "Contrast") == 0)
         value = settings.contrast;
     snprintf(buf, max_len, "%d", value);
     return 0;