piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with latest 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2020-03-05 10:43:01 +01:00
parent 33b6efc40d ec56892de6
commit 6878ae4a9f
144 changed files with 3009 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/common/arm/stm32/bootloader/boot.cpp
+16 -1
View File
@@ -205,11 +205,26 @@ int main()
AUX_SERIAL_RCC_APB1Periph |
SD_RCC_APB1Periph, ENABLE);
RCC_APB2PeriphClockCmd(LCD_RCC_APB2Periph | BACKLIGHT_RCC_APB2Periph | RCC_APB2Periph_SYSCFG, ENABLE);
RCC_APB2PeriphClockCmd(LCD_RCC_APB2Periph | BACKLIGHT_RCC_APB2Periph | RCC_APB2Periph_SYSCFG | AUX_SERIAL_RCC_APB2Periph, ENABLE);
pwrInit();
keysInit();
// USB charger handling
#if defined(USB_CHARGER)
if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() && !pwrPressed()) {
ledInit();
usbChargerInit();
ledOff();
while (!pwrPressed()) {
if(usbChargerLed())
GPIO_SetBits(LED_GPIO, LED_GREEN_GPIO_PIN);
else
ledOff();
}
}
#endif
// wait a bit for the inputs to stabilize...
if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) {
for (uint32_t i = 0; i < 150000; i++) {