From 05596fec9eff54481b8b87ea841e757aa0e64855 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 6 May 2019 11:23:51 +0200 Subject: [PATCH] BootCmd should be always high --- radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 3 ++- radio/src/targets/taranis/pwr_driver.cpp | 11 +++++++++-- radio/src/targets/taranis/trainer_driver.cpp | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index 3f820f5f6..d86ebbb95 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -490,10 +490,11 @@ void menuRadioSdManager(event_t _event) popupMenuItems[i] = reusableBuffer.sdManager.otaInformation.candidateReceiversNames[i]; } popupMenuTitle = STR_PXX2_SELECT_RX; + CLEAR_POPUP(); POPUP_MENU_START(onUpdateReceiverSelection); } else { - drawMessageBox("Waiting for RX..."); + POPUP_WAIT(STR_WAITING_FOR_RX); } } } diff --git a/radio/src/targets/taranis/pwr_driver.cpp b/radio/src/targets/taranis/pwr_driver.cpp index d52004c58..c27988fd1 100644 --- a/radio/src/targets/taranis/pwr_driver.cpp +++ b/radio/src/targets/taranis/pwr_driver.cpp @@ -54,12 +54,19 @@ void pwrInit() #endif #if defined(INTMODULE_BOOTCMD_GPIO) - GPIO_ResetBits(INTMODULE_BOOTCMD_GPIO, INTMODULE_BOOTCMD_GPIO_PIN); + GPIO_SetBits(INTMODULE_BOOTCMD_GPIO, INTMODULE_BOOTCMD_GPIO_PIN); GPIO_InitStructure.GPIO_Pin = INTMODULE_BOOTCMD_GPIO_PIN; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_DOWN; + GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_Init(INTMODULE_BOOTCMD_GPIO, &GPIO_InitStructure); #endif +#if defined(INTMODULE_USART) && defined(HEARTBEAT_GPIO_PIN) + GPIO_SetBits(HEARTBEAT_GPIO, HEARTBEAT_GPIO_PIN); + GPIO_InitStructure.GPIO_Pin = HEARTBEAT_GPIO_PIN; + GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; + GPIO_Init(HEARTBEAT_GPIO, &GPIO_InitStructure); +#endif + pwrOn(); } diff --git a/radio/src/targets/taranis/trainer_driver.cpp b/radio/src/targets/taranis/trainer_driver.cpp index 000c0721b..aabb42e1c 100644 --- a/radio/src/targets/taranis/trainer_driver.cpp +++ b/radio/src/targets/taranis/trainer_driver.cpp @@ -252,7 +252,7 @@ void init_sbus_on_heartbeat_capture() GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; - GPIO_Init(GPIOC, &GPIO_InitStructure); + GPIO_Init(HEARTBEAT_GPIO, &GPIO_InitStructure); USART_InitStructure.USART_BaudRate = 100000; USART_InitStructure.USART_WordLength = USART_WordLength_9b;