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
@@ -151,6 +151,7 @@ enum {

 #if defined(STM32)
  ITEM_RADIO_HARDWARE_RTC_BATTERY,
+  ITEM_RADIO_HARDWARE_RTC_CHECK,
 #endif

 #if defined(TX_CAPACITY_MEASUREMENT)
@@ -257,7 +258,7 @@ void onHardwareAntennaSwitchConfirm(const char * result)
 #endif

 #if defined(STM32)
-  #define RTC_ROW                        READONLY_ROW,
+  #define RTC_ROW                        READONLY_ROW, 0,
 #else
  #define RTC_ROW
 #endif
@@ -512,6 +513,10 @@ void menuRadioHardware(event_t event)
        lcdDrawTextAlignedLeft(y, STR_RTC_BATT);
        putsVolts(HW_SETTINGS_COLUMN2, y, getRTCBatteryVoltage(), PREC2|LEFT);
        break;
+
+      case ITEM_RADIO_HARDWARE_RTC_CHECK:
+        g_eeGeneral.disableRtcWarning = 1 - editCheckBox(1 - g_eeGeneral.disableRtcWarning, HW_SETTINGS_COLUMN2, y, STR_RTC_CHECK, attr, event);
+        break;
 #endif

 #if defined(TX_CAPACITY_MEASUREMENT)