Display baudrate choice only when needed on colorlcd (#7311)

This commit is contained in:
3djc
2020-01-21 09:41:08 +01:00
committed by GitHub
parent cd10ba438e
commit d44ec9b218
3 changed files with 13 additions and 3 deletions
+7 -1
View File
@@ -113,6 +113,12 @@ void onHardwareAntennaSwitchConfirm(const char * result)
#define EXTERNAL_ANTENNA_ROW
#endif
#if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000
#define MAX_BAUDRATE_ROW 0
#else
#define MAX_BAUDRATE_ROW HIDDEN_ROW
#endif
bool menuRadioHardware(event_t event)
{
MENU(STR_HARDWARE, RADIO_ICONS, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, {
@@ -134,7 +140,7 @@ bool menuRadioHardware(event_t event)
READONLY_ROW, /* RTC */
0, /* RTC check */
0, /* max baudrate */
MAX_BAUDRATE_ROW, /* max baudrate */
BLUETOOTH_ROWS
+5 -1
View File
@@ -303,7 +303,11 @@
#define PWR_SWITCH_GPIO_PIN GPIO_Pin_0 // PJ.00
// S.Port update connector
#define SPORT_MAX_BAUDRATE 250000 // < 400000
#if defined(RADIO_T16)
#define SPORT_MAX_BAUDRATE 400000
#else
#define SPORT_MAX_BAUDRATE 250000 // < 400000
#endif
#if defined(PCBX10) && !defined(RADIO_T16)
#define SPORT_UPDATE_RCC_AHB1Periph RCC_AHB1Periph_GPIOH
#define SPORT_UPDATE_PWR_GPIO GPIOH
+1 -1
View File
@@ -81,7 +81,6 @@ enum CrossfireSensorIndexes {
void processCrossfireTelemetryData(uint8_t data);
void crossfireSetDefault(int index, uint8_t id, uint8_t subId);
#if SPORT_MAX_BAUDRATE < 400000
const uint32_t CROSSFIRE_BAUDRATES[] = {
400000,
115200,
@@ -90,6 +89,7 @@ const uint8_t CROSSFIRE_PERIODS[] = {
4,
16,
};
#if SPORT_MAX_BAUDRATE < 400000
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
#define CROSSFIRE_PERIOD CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate]
#else