Merge fixes

This commit is contained in:
3djc
2021-04-08 14:20:25 +02:00
parent 70d24506da
commit efa8f5520b
9 changed files with 29 additions and 26 deletions
+1 -1
View File
@@ -104,7 +104,7 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
};
#if SPORT_MAX_BAUDRATE < 400000 || defined(DEBUG)
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
#define CROSSFIRE_PERIOD (CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate] * 1000)
#define CROSSFIRE_PERIOD (CROSSFIRE_FRAME_PERIODS[g_eeGeneral.telemetryBaudrate] * 1000)
#else
#define CROSSFIRE_BAUDRATE 400000
#define CROSSFIRE_PERIOD 4000 /* us; 250 Hz */