Merge branch '2.3.1' into 2.3

# Conflicts:
#	CREDITS.txt
#	radio/src/gui/480x272/radio_hardware.cpp
This commit is contained in:
Kilrah
2019-10-05 11:41:48 +02:00
72 changed files with 544 additions and 419 deletions
+1
View File
@@ -40,6 +40,7 @@ if (PCB STREQUAL X10)
set(FONTS_TARGET x10_fonts)
set(LCD_DRIVER lcd_driver.cpp)
set(LUA_EXPORT lua_export_x10)
set(INTERNAL_GPS OFF)
if (PCBREV STREQUAL EXPRESS)
set(FLAVOUR x10express)
option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF)
+1 -1
View File
@@ -592,7 +592,7 @@ uint8_t gpsGetByte(uint8_t * byte);
extern uint8_t gpsTraceEnabled;
#endif
void gpsSendByte(uint8_t byte);
#if defined(PCBX12S)
#if defined(INTERNAL_GPS)
#define PILOTPOS_MIN_HDOP 500
#endif
+1 -1
View File
@@ -139,7 +139,7 @@ void adcInit()
uint16_t getRTCBatteryVoltage()
{
return (rtcBatteryVoltage * ADC_VREF_PREC2) / 2048;
return (rtcBatteryVoltage * 2 * ADC_VREF_PREC2) / 2048;
}
const uint16_t adcCommands[MOUSE1+2] =