Merge against latest 2.3

This commit is contained in:
Bertrand Songis
2019-09-17 13:28:42 +02:00
247 changed files with 35085 additions and 42445 deletions
@@ -220,6 +220,7 @@ set(PULSES_SRC
${PULSES_SRC}
pulses.cpp
ppm.cpp
modules_helpers.cpp
)
if(DSM2)
@@ -206,4 +206,4 @@ extern "C" void AUX_SERIAL_USART_IRQHandler(void)
}
}
#endif
}
}
@@ -209,9 +209,8 @@ int main()
RCC_APB2PeriphClockCmd(LCD_RCC_APB2Periph | BACKLIGHT_RCC_APB2Periph | RCC_APB2Periph_SYSCFG, ENABLE);
keysInit();
pwrInit();
pwrOff();
keysInit();
#if defined(PCBHORUS)
// wait a bit for the inputs to stabilize...
@@ -234,7 +233,7 @@ int main()
delaysInit(); // needed for lcdInit()
#if defined(DEBUG)
#if defined(DEBUG) && defined(AUX_SERIAL)
auxSerialInit(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined)
#endif