chore: use settings from radio JSON files instead of hal.h (#7411)

Co-authored-by: 3djc <3djc@gh.com>
2026-07-13 10:15:50 +10:00
parent 445c09f662
commit f3cabd42f7
100 changed files with 3290 additions and 2193 deletions
@@ -319,7 +319,7 @@ void lcdSetContrast(bool useDefault)
 {
 #if defined(BOOT)
  lcdSetRefVolt(LCD_CONTRAST_DEFAULT);
-#elif defined(OLED_SCREEN)
+#elif OLED_SCREEN
  // Handled by brightness feature
  if (useDefault)
    lcdSetRefVolt(LCD_CONTRAST_DEFAULT);
@@ -555,9 +555,9 @@ void menuRadioSetup(event_t event)
        if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
        break;

-#if defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)
+#if defined(BACKLIGHT_GPIO) || OLED_SCREEN
      case ITEM_RADIO_SETUP_BACKLIGHT_LABEL:
-#if defined(OLED_SCREEN)
+#if OLED_SCREEN
        lcdDrawTextAlignedLeft(y, STR_BRIGHTNESS);
 #else
        lcdDrawTextAlignedLeft(y, STR_BACKLIGHT_LABEL);
@@ -581,7 +581,7 @@ void menuRadioSetup(event_t event)

      case ITEM_RADIO_SETUP_BRIGHTNESS:
        lcdDrawTextIndented(y, STR_BRIGHTNESS);
-#if defined(OLED_SCREEN)
+#if OLED_SCREEN
        lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT);
        if (attr) {
          CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
@@ -610,7 +610,7 @@ void menuRadioSetup(event_t event)
        break;
 #endif

-#if !defined(OLED_SCREEN)
+#if !OLED_SCREEN
      case ITEM_RADIO_SETUP_CONTRAST:
        lcdDrawTextIndented(y, STR_CONTRAST);
        lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT);
@@ -43,6 +43,12 @@ int8_t slider_5pos(coord_t y, int8_t value, event_t event, uint8_t attr, const c
  return editChoice(RADIO_SETUP_2ND_COLUMN, y, title, nullptr, value, -2, +2, attr, event, INDENT_WIDTH);
 }

+#if HAS_BACKLIGHT_COLOR
+  #define CASE_HAS_BACKLIGHT_COLOR(x) x,
+#else
+  #define CASE_HAS_BACKLIGHT_COLOR(x)
+#endif
+
 enum MenuRadioSetupItems {
  CASE_RTCLOCK(ITEM_RADIO_SETUP_DATE)
  CASE_RTCLOCK(ITEM_RADIO_SETUP_TIME)
@@ -80,7 +86,7 @@ enum MenuRadioSetupItems {
  ITEM_RADIO_SETUP_BACKLIGHT_DELAY,
  ITEM_RADIO_SETUP_BRIGHTNESS,
  ITEM_RADIO_SETUP_CONTRAST,
-  CASE_PCBX9E_PCBX9DP(ITEM_RADIO_SETUP_BACKLIGHT_COLOR)
+  CASE_HAS_BACKLIGHT_COLOR(ITEM_RADIO_SETUP_BACKLIGHT_COLOR)
  ITEM_RADIO_SETUP_BACKLIGHT_SOURCE,
  ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE,
  ITEM_RADIO_SETUP_FLASH_BEEP,
@@ -224,7 +230,7 @@ void menuRadioSetup(event_t event)
      0, // backlight delay
      0, // brightness
      0, // contrast
-      CASE_PCBX9E_PCBX9DP(0) // backlight color
+      CASE_HAS_BACKLIGHT_COLOR(0) // backlight color
      0, // backlight control
      BACKLIGHT_WARNING_ROW(LABEL(0)), // backlight control override warning
      0, // flash beep
@@ -585,7 +591,7 @@ void menuRadioSetup(event_t event)
        }
        break;

-#if defined(PCBX9DP) || defined(PCBX9E)
+#if HAS_BACKLIGHT_COLOR
      case ITEM_RADIO_SETUP_BACKLIGHT_COLOR:
        lcdDrawTextIndented(y, STR_BLCOLOR);
        drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.backlightColor, 20, attr);
@@ -94,7 +94,7 @@ static void init_lvgl_disp_drv()
  disp_drv.ver_res = LCD_H; /*Set the vertical resolution in pixels*/
  disp_drv.full_refresh = 0;

-#if !defined(LCD_VERTICAL_INVERT)
+#if !LCD_VERTICAL_INVERT
  disp_drv.direct_mode = 1;
 #elif defined(RADIO_F16)
  disp_drv.direct_mode = (hardwareOptions.pcbrev > 0) ? 1 : 0;
@@ -71,7 +71,7 @@ static lv_disp_drv_t* refr_disp = nullptr;
 static void flushLcd(lv_disp_drv_t* disp_drv, const lv_area_t* area,
                     lv_color_t* color_p)
 {
-#if !defined(LCD_VERTICAL_INVERT) || defined(RADIO_F16)
+#if !LCD_VERTICAL_INVERT || defined(RADIO_F16)
 #if defined(RADIO_F16)
  if (hardwareOptions.pcbrev > 0)
 #endif
@@ -126,7 +126,7 @@ static void init_lvgl_disp_drv()
  disp_drv.ver_res = LCD_H; /*Set the vertical resolution in pixels*/
  disp_drv.full_refresh = 0;

-#if !defined(LCD_VERTICAL_INVERT)
+#if !LCD_VERTICAL_INVERT
  disp_drv.direct_mode = 1;
 #elif defined(RADIO_F16)
  disp_drv.direct_mode = (hardwareOptions.pcbrev > 0) ? 1 : 0;
@@ -35,13 +35,13 @@
 #define CASE_IMU(x)
 #endif

-#if defined(OLED_SCREEN)
+#if OLED_SCREEN
 #define CASE_CONTRAST(x)
 #else
 #define CASE_CONTRAST(x) x,
 #endif

-#if defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)
+#if defined(BACKLIGHT_GPIO) || OLED_SCREEN
 #define CASE_BACKLIGHT(x) x,
 #else
 #define CASE_BACKLIGHT(x)
@@ -119,10 +119,4 @@
  #define CASE_LUA_MODEL_SCRIPTS(x)
 #endif

-#if defined(PCBX9DP) || defined(PCBX9E)
-  #define CASE_PCBX9E_PCBX9DP(x) x,
-#else
-  #define CASE_PCBX9E_PCBX9DP(x)
-#endif
-
 #define CASE_SPLASH_PARAM(x) x,
@@ -95,7 +95,7 @@ enum {
  ITEM_RADIO_HARDWARE_JITTER_FILTER,
  ITEM_RADIO_HARDWARE_RAS,
  ITEM_RADIO_HARDWARE_SPORT_UPDATE_POWER,
-#if (defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)) && (LCD_W == 128)
+#if (defined(BACKLIGHT_GPIO) || OLED_SCREEN) && (LCD_W == 128)
  ITEM_RADIO_HARDWARE_SCREEN_LABEL,
  ITEM_RADIO_HARDWARE_SCREEN_INVERT,
 #endif
@@ -367,7 +367,7 @@ static void _init_menu_tab_array(uint8_t* tab, size_t len)
    tab[ITEM_RADIO_HARDWARE_SPORT_UPDATE_POWER] = HIDDEN_ROW;
  }

-#if (defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)) && (LCD_W == 128)
+#if (defined(BACKLIGHT_GPIO) || OLED_SCREEN) && (LCD_W == 128)
  tab[ITEM_RADIO_HARDWARE_SCREEN_LABEL] = READONLY_ROW;
  tab[ITEM_RADIO_HARDWARE_SCREEN_INVERT] = 0;
 #endif
@@ -612,7 +612,7 @@ void menuRadioHardware(event_t event)
        }
        break;

-#if (defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)) && (LCD_W == 128)
+#if (defined(BACKLIGHT_GPIO) || OLED_SCREEN) && (LCD_W == 128)
      case ITEM_RADIO_HARDWARE_SCREEN_LABEL:
        lcdDrawTextAlignedLeft(y, STR_SCREEN);
        break;
@@ -167,7 +167,7 @@ const uint8_t BMP_HEADER[] = {
  /* important colors */ 0x00, 0x00, 0x00, 0x00,
 #if !defined(COLORLCD)
  /* grayscale palette */
-#if defined(OLED_SCREEN)
+#if OLED_SCREEN
  0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x00, 0x22, 0x22, 0x22, 0x00, 0x33, 0x33, 0x33, 0x00,
  0x44, 0x44, 0x44, 0x00, 0x55, 0x55, 0x55, 0x00, 0x66, 0x66, 0x66, 0x00, 0x77, 0x77, 0x77, 0x00,
  0x88, 0x88, 0x88, 0x00, 0x99, 0x99, 0x99, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0xbb, 0xbb, 0xbb, 0x00,