Merge branch '2.3.1' into 2.3

# Conflicts: # CREDITS.txt # radio/src/gui/480x272/radio_hardware.cpp
2019-10-05 11:41:48 +02:00
parent 268c4d4ece 63614a06f8
commit b40dfdf12b
72 changed files with 544 additions and 419 deletions
@@ -54,6 +54,7 @@ enum MenuRadioHardwareItems {
  ITEM_RADIO_HARDWARE_SJ, // Gimbal switch right
  ITEM_RADIO_HARDWARE_BATTERY_CALIB,
  ITEM_RADIO_HARDWARE_RTC_BATTERY,
+  ITEM_RADIO_HARDWARE_RTC_CHECK,
  ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE,
 #if defined(BLUETOOTH)
  ITEM_RADIO_HARDWARE_BLUETOOTH_MODE,
@@ -123,6 +124,7 @@ bool menuRadioHardware(event_t event)

    0, /* battery */
    READONLY_ROW, /* RTC */
+    0, /* RTC check */

    0, /* max baudrate */

@@ -276,6 +278,14 @@ bool menuRadioHardware(event_t event)
        }
        break;
 #if defined(BLUETOOTH)
+      case ITEM_RADIO_HARDWARE_RTC_CHECK:
+      {
+        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RTC_CHECK);
+        uint8_t b = 1 - g_eeGeneral.disableRtcWarning;
+        g_eeGeneral.disableRtcWarning = 1 - editCheckBox(b, HW_SETTINGS_COLUMN + 50, y, attr, event);
+        break;
+      }
+
      case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLUETOOTH);
        g_eeGeneral.bluetoothMode = editChoice(HW_SETTINGS_COLUMN+50, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER, attr, event);