Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-26 01:35:16 +03:00
Code Activity

BootCmd should be always high

Browse source
This commit is contained in:
Bertrand Songis 2019-05-06 11:23:51 +02:00
parent a3fe388399
commit 05596fec9e
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
View file

@ -490,10 +490,11 @@ void menuRadioSdManager(event_t _event)
popupMenuItems[i] = reusableBuffer.sdManager.otaInformation.candidateReceiversNames[i]; popupMenuItems[i] = reusableBuffer.sdManager.otaInformation.candidateReceiversNames[i];
} }
popupMenuTitle = STR_PXX2_SELECT_RX; popupMenuTitle = STR_PXX2_SELECT_RX;
CLEAR_POPUP();
POPUP_MENU_START(onUpdateReceiverSelection); POPUP_MENU_START(onUpdateReceiverSelection);
} }
else { else {
drawMessageBox("Waiting for RX..."); POPUP_WAIT(STR_WAITING_FOR_RX);
} }
} }
} }

11
radio/src/targets/taranis/pwr_driver.cpp
View file

@ -54,12 +54,19 @@ void pwrInit()
#endif #endif
#if defined(INTMODULE_BOOTCMD_GPIO) #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_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); GPIO_Init(INTMODULE_BOOTCMD_GPIO, &GPIO_InitStructure);
#endif #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(); pwrOn();
} }

2
radio/src/targets/taranis/trainer_driver.cpp
View file

@ -252,7 +252,7 @@ void init_sbus_on_heartbeat_capture()
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; 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_BaudRate = 100000;
USART_InitStructure.USART_WordLength = USART_WordLength_9b; USART_InitStructure.USART_WordLength = USART_WordLength_9b;