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] =
+7 -2
View File
@@ -498,14 +498,19 @@ enum Analogs {
#define NUM_SLIDERS 4
#define STORAGE_NUM_POTS 4
#define STORAGE_NUM_SLIDERS 4
#else
#elif defined(PCBX9DP)
#define NUM_POTS 3
#define NUM_SLIDERS 2
#define STORAGE_NUM_POTS 3
#define STORAGE_NUM_SLIDERS 2
#else
#define NUM_POTS 2
#define NUM_SLIDERS 2
#define STORAGE_NUM_POTS 3
#define STORAGE_NUM_SLIDERS 2
#endif
#define NUM_XPOTS NUM_POTS
#define NUM_XPOTS STORAGE_NUM_POTS
#define NUM_TRIMS 4
#define NUM_MOUSE_ANALOGS 0
#define STORAGE_NUM_MOUSE_ANALOGS 0
+4 -4
View File
@@ -531,8 +531,8 @@
#define HARDWARE_SWITCH_J
#define SWITCHES_GPIO_REG_I GPIOC->IDR
#define SWITCHES_GPIO_PIN_I GPIO_Pin_13 // PC.13
#define SWITCHES_GPIO_REG_J GPIOC->IDR
#define SWITCHES_GPIO_PIN_J GPIO_Pin_10 // PC.10
#define SWITCHES_GPIO_REG_J GPIOD->IDR
#define SWITCHES_GPIO_PIN_J GPIO_Pin_10 // PD.10
#endif
#if defined(PCBX9E)
@@ -642,8 +642,8 @@
#elif defined(RADIO_X7)
#define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE)
#define KEYS_GPIOA_PINS GPIO_Pin_5
#define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_10 | GPIO_Pin_13)
#define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15)
#define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_13)
#define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15)
#define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15)
#elif defined(PCBX9LITES)
#define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE)
@@ -199,6 +199,8 @@ uint32_t switchState(uint8_t index)
ADD_3POS_CASE(D, 3);
ADD_2POS_CASE(F);
ADD_2POS_CASE(H);
ADD_2POS_CASE(I);
ADD_2POS_CASE(J);
#else
ADD_3POS_CASE(D, 3);
ADD_3POS_CASE(E, 4);