Merge updates from branch main

lukolszewski · Nov 30, 2023 · 57925ce · 57925ce
2 parents 24bdf3b + 0f8cabf
commit 57925ce
Show file tree

Hide file tree

Showing 29 changed files with 739 additions and 96 deletions.
diff --git a/mkapp/app/setting.ini b/mkapp/app/setting.ini
@@ -46,6 +46,14 @@ enable=false
 [elrs]
 enable=false
 
+[inputs]
+roller=0
+left_click=0
+left_press=1
+right_click=2
+right_press=6
+right_double_click=3
+
 [wifi]
 enable=false
 ap_ssid=HDZero

diff --git a/src/core/common.hh b/src/core/common.hh
@@ -30,6 +30,8 @@ hw_revision_t getHwRevision();
 #define RIGHT_KEY_CLICK 5
 #define RIGHT_KEY_PRESS 6
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+
 extern atomic_int g_key;
 extern atomic_int g_init_done;
 extern pthread_mutex_t lvgl_mutex;

diff --git a/src/core/dvr.c b/src/core/dvr.c
@@ -87,6 +87,10 @@ void dvr_update_vi_conf(video_resolution_t fmt) {
     LOGI("update_record_vi_conf: fmt=%d", fmt);
 }
 
+void dvr_toggle() {
+    dvr_cmd(DVR_TOGGLE);
+}
+
 static void dvr_update_record_conf() {
     LOGI("CAM_MODE=%d", CAM_MODE);
     if (g_setting.record.format_ts)

diff --git a/src/core/dvr.h b/src/core/dvr.h
@@ -22,6 +22,7 @@ void dvr_select_audio_source(uint8_t audio_source);
 void dvr_enable_line_out(bool enable);
 void dvr_cmd(osd_dvr_cmd_t cmd);
 void dvr_update_vi_conf(video_resolution_t fmt);
+void dvr_toggle();
 
 #ifdef __cplusplus
 }

diff --git a/src/core/input_device.c b/src/core/input_device.c
@@ -85,12 +85,6 @@ void tune_channel(uint8_t action) {
             tune_timer = TUNER_TIMER_LEN;
             tune_state = 2;
             channel = g_setting.scan.channel;
-        } else if (action == DIAL_KEY_CLICK) {
-            g_setting.osd.is_visible = !g_setting.osd.is_visible;
-            if (g_setting.osd.is_visible)
-                channel_osd_mode = CHANNEL_SHOWTIME;
-
-            settings_put_bool("osd", "is_visible", g_setting.osd.is_visible);
         }
     }
 
@@ -136,6 +130,12 @@ void tune_channel(uint8_t action) {
     tune_timer = TUNER_TIMER_LEN;
 }
 
+void tune_channel_confirm() {
+    if (g_source_info.source == SOURCE_HDZERO) {
+        tune_channel(DIAL_KEY_CLICK);
+    }
+}
+
 void tune_channel_timer() {
     if (tune_state == 2) {
         if (!tune_timer)
@@ -157,6 +157,15 @@ void tune_channel_timer() {
 static int roller_up_acc = 0;
 static int roller_down_acc = 0;
 
+void (*btn_click_callback)() = &osd_toggle;
+void (*btn_press_callback)() = &app_switch_to_menu;
+
+void (*rbtn_click_callback)() = &dvr_toggle;
+void (*rbtn_press_callback)() = &step_topfan;
+void (*rbtn_double_click_callback)() = &ht_set_center_position;
+
+void (*roller_callback)(uint8_t key) = &tune_channel;
+
 static void btn_press(void) // long press left key
 {
     LOGI("btn_press (%d)", g_app_state);
@@ -177,7 +186,7 @@ static void btn_press(void) // long press left key
         if (tune_timer && g_source_info.source == SOURCE_HDZERO)
             tune_channel(DIAL_KEY_PRESS);
         else
-            app_switch_to_menu();
+            (*btn_press_callback)();
     } else if (g_app_state == APP_STATE_OSD_ELEMENT_PREV) {
         ui_osd_element_pos_cancel_and_hide();
         app_switch_to_menu();
@@ -204,7 +213,11 @@ static void btn_click(void) // short press enter key
 
     if (g_app_state == APP_STATE_VIDEO) {
         pthread_mutex_lock(&lvgl_mutex);
-        tune_channel(DIAL_KEY_CLICK);
+        if (tune_state == 2) {
+            tune_channel_confirm();
+        } else {
+            (*btn_click_callback)();
+        }
         pthread_mutex_unlock(&lvgl_mutex);
         return;
     } else if (g_app_state == APP_STATE_IMS) {
@@ -263,19 +276,15 @@ void rbtn_click(right_button_t click_type) {
         pthread_mutex_unlock(&lvgl_mutex);
         break;
     case APP_STATE_VIDEO:
+        pthread_mutex_lock(&lvgl_mutex);
         if (click_type == RIGHT_CLICK) {
-            dvr_cmd(DVR_TOGGLE);
+            (*rbtn_click_callback)();
         } else if (click_type == RIGHT_LONG_PRESS) {
-            pthread_mutex_lock(&lvgl_mutex);
-            step_topfan();
-            pthread_mutex_unlock(&lvgl_mutex);
+            (*rbtn_press_callback)();
         } else if (click_type == RIGHT_DOUBLE_CLICK) {
-            if (g_setting.ht.enable == true) {
-                ht_set_center_position();
-            } else {
-                go_sleep();
-            }
+            (*rbtn_double_click_callback)();
         }
+        pthread_mutex_unlock(&lvgl_mutex);
         break;
     case APP_STATE_SLEEP:
         wake_up();
@@ -307,8 +316,7 @@ static void roller_up(void) {
     } else if ((g_app_state == APP_STATE_SUBMENU_ITEM_FOCUSED)) {
         submenu_roller_no_selection_change(DIAL_KEY_UP);
     } else if (g_app_state == APP_STATE_VIDEO) {
-        if (g_source_info.source == SOURCE_HDZERO)
-            tune_channel(DIAL_KEY_UP);
+        (*roller_callback)(DIAL_KEY_UP);
     } else if (g_app_state == APP_STATE_IMS) {
         ims_key(DIAL_KEY_UP);
     } else if (g_app_state == APP_STATE_OSD_ELEMENT_PREV) {
@@ -342,8 +350,7 @@ static void roller_down(void) {
     } else if ((g_app_state == APP_STATE_SUBMENU_ITEM_FOCUSED)) {
         submenu_roller_no_selection_change(DIAL_KEY_DOWN);
     } else if (g_app_state == APP_STATE_VIDEO) {
-        if (g_source_info.source == SOURCE_HDZERO)
-            tune_channel(DIAL_KEY_DOWN);
+        (*roller_callback)(DIAL_KEY_DOWN);
     } else if (g_app_state == APP_STATE_IMS) {
         ims_key(DIAL_KEY_DOWN);
     } else if (g_app_state == APP_STATE_OSD_ELEMENT_PREV) {

diff --git a/src/core/input_device.h b/src/core/input_device.h
@@ -13,10 +13,22 @@ typedef enum {
 } right_button_t;
 
 void input_device_init();
+void tune_channel(uint8_t key);
 void tune_channel_timer();
+void tune_channel_confirm();
 void exit_tune_channel();
 void rbtn_click(right_button_t click_type);
 
+extern void (*btn_click_callback)();
+extern void (*btn_press_callback)();
+
+extern void (*rbtn_click_callback)();
+extern void (*rbtn_press_callback)();
+extern void (*rbtn_double_click_callback)();
+
+
+extern void (*roller_callback)(uint8_t key);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/core/osd.c b/src/core/osd.c
@@ -93,6 +93,15 @@ void osd_resource_path(char *buf, const char *fmt, osd_resource_t osd_resource_t
     buf[1] = ':';
 }
 
+void osd_toggle() {
+    g_setting.osd.is_visible = !g_setting.osd.is_visible;
+    if (g_setting.osd.is_visible) {
+        channel_osd_mode = CHANNEL_SHOWTIME;
+    }
+
+    settings_put_bool("osd", "is_visible", g_setting.osd.is_visible);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // these are local for OSD controlling
 static osd_hdzero_t g_osd_hdzero;

diff --git a/src/core/osd.h b/src/core/osd.h
@@ -100,6 +100,7 @@ char *channel2str(uint8_t band, uint8_t channel);
 void load_fc_osd_font(uint8_t);
 void *thread_osd(void *ptr);
 void osd_resource_path(char *buf, const char *fmt, osd_resource_t osd_resource_type, ...);
+void osd_toggle();
 
 #ifdef __cplusplus
 }

diff --git a/src/core/settings.c b/src/core/settings.c
@@ -179,6 +179,15 @@ const setting_t g_setting_defaults = {
         .sec = 30,
         .format = 0,
     },
+    // Refer to `page_input.c`'s arrays `rollerFunctionPointers` and `btnFunctionPointers`
+    .inputs = {
+        .roller = 0,
+        .left_click = 0,
+        .left_press = 1,
+        .right_click = 2,
+        .right_press = 6,
+        .right_double_click = 3,
+    },
     .wifi = {
         .enable = false,
         .mode = 0,
@@ -407,6 +416,14 @@ void settings_load(void) {
     g_setting.clock.sec = ini_getl("clock", "sec", g_setting_defaults.clock.sec, SETTING_INI);
     g_setting.clock.format = ini_getl("clock", "format", g_setting_defaults.clock.format, SETTING_INI);
 
+    // inputs
+    g_setting.inputs.roller = ini_getl("inputs", "roller", g_setting_defaults.inputs.roller, SETTING_INI);
+    g_setting.inputs.left_click = ini_getl("inputs", "left_click", g_setting_defaults.inputs.left_click, SETTING_INI);
+    g_setting.inputs.left_press = ini_getl("inputs", "left_press", g_setting_defaults.inputs.left_press, SETTING_INI);
+    g_setting.inputs.right_click = ini_getl("inputs", "right_click", g_setting_defaults.inputs.right_click, SETTING_INI);
+    g_setting.inputs.right_press = ini_getl("inputs", "right_press", g_setting_defaults.inputs.right_press, SETTING_INI);
+    g_setting.inputs.right_double_click = ini_getl("inputs", "right_double_click", g_setting_defaults.inputs.right_double_click, SETTING_INI);
+
     // wifi
     g_setting.wifi.enable = settings_get_bool("wifi", "enable", g_setting_defaults.wifi.enable);
     g_setting.wifi.mode = ini_getl("wifi", "mode", g_setting_defaults.wifi.mode, SETTING_INI);

diff --git a/src/core/settings.h b/src/core/settings.h
@@ -227,6 +227,15 @@ typedef struct {
     setting_sources_hdzero_bw_t hdzero_bw;
 } setting_sources_t;
 
+typedef struct {
+    uint16_t roller;
+    uint16_t left_click;
+    uint16_t left_press;
+    uint16_t right_click;
+    uint16_t right_press;
+    uint16_t right_double_click;
+} setting_inputs_t;
+
 typedef struct {
     bool logging;
     bool selftest;
@@ -245,6 +254,7 @@ typedef struct {
     wifi_t wifi;
     setting_osd_t osd;
     setting_clock_t clock;
+    setting_inputs_t inputs;
     ease_use_t ease;
     setting_storage_t storage;
 } setting_t;

diff --git a/src/driver/oled.h b/src/driver/oled.h
@@ -7,6 +7,9 @@ extern "C" {
 #include "defines.h"
 #include <stdint.h>
 
+#define MIN_OLED_BRIGHTNESS 0
+#define MAX_OLED_BRIGHTNESS 12
+
 void OLED_write(uint16_t addr, uint16_t wdat, uint8_t sel);
 uint16_t OLED_read(uint16_t addr, uint8_t sel);