Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 09:45:33 +03:00
Code Issues Wiki Activity

Rename blackbox_baudrate to peripheral_baudate

Browse source
This commit is contained in:
Konstantin Sharlaimov (DigitalEntity) 2017-08-09 17:38:02 +10:00
parent ab33d1eee4
commit d7662d1684
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/blackbox/blackbox_io.c
View file

@ -213,7 +213,7 @@ bool blackboxDeviceOpen(void)
} }
blackboxPortSharing = determinePortSharing(portConfig, FUNCTION_BLACKBOX); blackboxPortSharing = determinePortSharing(portConfig, FUNCTION_BLACKBOX);
baudRateIndex = portConfig->blackbox_baudrateIndex; baudRateIndex = portConfig->peripheral_baudrateIndex;
if (baudRates[baudRateIndex] == 230400) { if (baudRates[baudRateIndex] == 230400) {
/* /*

8
src/main/fc/cli.c
View file

@ -1495,14 +1495,14 @@ static void printSerial(uint8_t dumpMask, const serialConfig_t *serialConfig, co
&& serialConfig->portConfigs[i].msp_baudrateIndex == serialConfigDefault->portConfigs[i].msp_baudrateIndex && serialConfig->portConfigs[i].msp_baudrateIndex == serialConfigDefault->portConfigs[i].msp_baudrateIndex
&& serialConfig->portConfigs[i].gps_baudrateIndex == serialConfigDefault->portConfigs[i].gps_baudrateIndex && serialConfig->portConfigs[i].gps_baudrateIndex == serialConfigDefault->portConfigs[i].gps_baudrateIndex
&& serialConfig->portConfigs[i].telemetry_baudrateIndex == serialConfigDefault->portConfigs[i].telemetry_baudrateIndex && serialConfig->portConfigs[i].telemetry_baudrateIndex == serialConfigDefault->portConfigs[i].telemetry_baudrateIndex
&& serialConfig->portConfigs[i].blackbox_baudrateIndex == serialConfigDefault->portConfigs[i].blackbox_baudrateIndex; && serialConfig->portConfigs[i].peripheral_baudrateIndex == serialConfigDefault->portConfigs[i].peripheral_baudrateIndex;
cliDefaultPrintf(dumpMask, equalsDefault, format, cliDefaultPrintf(dumpMask, equalsDefault, format,
serialConfigDefault->portConfigs[i].identifier, serialConfigDefault->portConfigs[i].identifier,
serialConfigDefault->portConfigs[i].functionMask, serialConfigDefault->portConfigs[i].functionMask,
baudRates[serialConfigDefault->portConfigs[i].msp_baudrateIndex], baudRates[serialConfigDefault->portConfigs[i].msp_baudrateIndex],
baudRates[serialConfigDefault->portConfigs[i].gps_baudrateIndex], baudRates[serialConfigDefault->portConfigs[i].gps_baudrateIndex],
baudRates[serialConfigDefault->portConfigs[i].telemetry_baudrateIndex], baudRates[serialConfigDefault->portConfigs[i].telemetry_baudrateIndex],
baudRates[serialConfigDefault->portConfigs[i].blackbox_baudrateIndex] baudRates[serialConfigDefault->portConfigs[i].peripheral_baudrateIndex]
); );
} }
cliDumpPrintf(dumpMask, equalsDefault, format, cliDumpPrintf(dumpMask, equalsDefault, format,
@ -1511,7 +1511,7 @@ static void printSerial(uint8_t dumpMask, const serialConfig_t *serialConfig, co
baudRates[serialConfig->portConfigs[i].msp_baudrateIndex], baudRates[serialConfig->portConfigs[i].msp_baudrateIndex],
baudRates[serialConfig->portConfigs[i].gps_baudrateIndex], baudRates[serialConfig->portConfigs[i].gps_baudrateIndex],
baudRates[serialConfig->portConfigs[i].telemetry_baudrateIndex], baudRates[serialConfig->portConfigs[i].telemetry_baudrateIndex],
baudRates[serialConfig->portConfigs[i].blackbox_baudrateIndex] baudRates[serialConfig->portConfigs[i].peripheral_baudrateIndex]
); );
} }
} }
@ -1581,7 +1581,7 @@ static void cliSerial(char *cmdline)
if (baudRateIndex < BAUD_19200 || baudRateIndex > BAUD_250000) { if (baudRateIndex < BAUD_19200 || baudRateIndex > BAUD_250000) {
continue; continue;
} }
portConfig.blackbox_baudrateIndex = baudRateIndex; portConfig.peripheral_baudrateIndex = baudRateIndex;
break; break;
} }

4
src/main/fc/fc_msp.c
View file

@ -954,7 +954,7 @@ static bool mspFcProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProcessFn
sbufWriteU8(dst, serialConfig()->portConfigs[i].msp_baudrateIndex); sbufWriteU8(dst, serialConfig()->portConfigs[i].msp_baudrateIndex);
sbufWriteU8(dst, serialConfig()->portConfigs[i].gps_baudrateIndex); sbufWriteU8(dst, serialConfig()->portConfigs[i].gps_baudrateIndex);
sbufWriteU8(dst, serialConfig()->portConfigs[i].telemetry_baudrateIndex); sbufWriteU8(dst, serialConfig()->portConfigs[i].telemetry_baudrateIndex);
sbufWriteU8(dst, serialConfig()->portConfigs[i].blackbox_baudrateIndex); sbufWriteU8(dst, serialConfig()->portConfigs[i].peripheral_baudrateIndex);
} }
break; break;
@ -2020,7 +2020,7 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
portConfig->msp_baudrateIndex = sbufReadU8(src); portConfig->msp_baudrateIndex = sbufReadU8(src);
portConfig->gps_baudrateIndex = sbufReadU8(src); portConfig->gps_baudrateIndex = sbufReadU8(src);
portConfig->telemetry_baudrateIndex = sbufReadU8(src); portConfig->telemetry_baudrateIndex = sbufReadU8(src);
portConfig->blackbox_baudrateIndex = sbufReadU8(src); portConfig->peripheral_baudrateIndex = sbufReadU8(src);
} }
} }
break; break;

2
src/main/io/serial.c
View file

@ -112,7 +112,7 @@ void pgResetFn_serialConfig(serialConfig_t *serialConfig)
serialConfig->portConfigs[i].msp_baudrateIndex = BAUD_115200; serialConfig->portConfigs[i].msp_baudrateIndex = BAUD_115200;
serialConfig->portConfigs[i].gps_baudrateIndex = BAUD_38400; serialConfig->portConfigs[i].gps_baudrateIndex = BAUD_38400;
serialConfig->portConfigs[i].telemetry_baudrateIndex = BAUD_AUTO; serialConfig->portConfigs[i].telemetry_baudrateIndex = BAUD_AUTO;
serialConfig->portConfigs[i].blackbox_baudrateIndex = BAUD_115200; serialConfig->portConfigs[i].peripheral_baudrateIndex = BAUD_115200;
} }
serialConfig->portConfigs[0].functionMask = FUNCTION_MSP; serialConfig->portConfigs[0].functionMask = FUNCTION_MSP;

2
src/main/io/serial.h
View file

@ -105,7 +105,7 @@ typedef struct serialPortConfig_s {
serialPortIdentifier_e identifier; serialPortIdentifier_e identifier;
uint8_t msp_baudrateIndex; uint8_t msp_baudrateIndex;
uint8_t gps_baudrateIndex; uint8_t gps_baudrateIndex;
uint8_t blackbox_baudrateIndex; uint8_t peripheral_baudrateIndex;
uint8_t telemetry_baudrateIndex; // not used for all telemetry systems, e.g. HoTT only works at 19200. uint8_t telemetry_baudrateIndex; // not used for all telemetry systems, e.g. HoTT only works at 19200.
} serialPortConfig_t; } serialPortConfig_t;