Merge pull request #8258 from opentx/3djc/rationalize-baudrate-display
Rationalize baudrate display
This commit is contained in:
@@ -126,7 +126,7 @@ void onHardwareAntennaSwitchConfirm(const char * result)
|
|||||||
#define EXTERNAL_ANTENNA_ROW
|
#define EXTERNAL_ANTENNA_ROW
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(CROSSFIRE) || defined(GHOST))
|
#if (defined(CROSSFIRE) || defined(GHOST)) && (SPORT_MAX_BAUDRATE < 400000 || defined(DEBUG))
|
||||||
#define MAX_BAUDRATE_ROW 0
|
#define MAX_BAUDRATE_ROW 0
|
||||||
#else
|
#else
|
||||||
#define MAX_BAUDRATE_ROW HIDDEN_ROW
|
#define MAX_BAUDRATE_ROW HIDDEN_ROW
|
||||||
|
|||||||
@@ -284,7 +284,7 @@ enum {
|
|||||||
#define TX_CAPACITY_MEASUREMENT_ROWS
|
#define TX_CAPACITY_MEASUREMENT_ROWS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(CROSSFIRE) || defined(GHOST)) && SPORT_MAX_BAUDRATE < 400000
|
#if (defined(CROSSFIRE) || defined(GHOST)) && (SPORT_MAX_BAUDRATE < 400000 || defined(DEBUG))
|
||||||
#define MAX_BAUD_ROWS 0,
|
#define MAX_BAUD_ROWS 0,
|
||||||
#else
|
#else
|
||||||
#define MAX_BAUD_ROWS
|
#define MAX_BAUD_ROWS
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ const uint8_t CROSSFIRE_PERIODS[] = {
|
|||||||
4,
|
4,
|
||||||
16,
|
16,
|
||||||
};
|
};
|
||||||
#if SPORT_MAX_BAUDRATE < 400000
|
#if SPORT_MAX_BAUDRATE < 400000 || defined(DEBUG)
|
||||||
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
|
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
|
||||||
#define CROSSFIRE_PERIOD CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate]
|
#define CROSSFIRE_PERIOD CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate]
|
||||||
#else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user