Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Add check for NULL default in CLI printVtx()

Browse source
This commit is contained in:
Martin Budden 2016-12-28 22:53:24 +00:00
parent 3ca24959a8
commit 0519169638
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main/io/serial_cli.c
View file

@ -2374,26 +2374,26 @@ static void cliFlashRead(char *cmdline)
static void printVtx(uint8_t dumpMask, const master_t *defaultConfig) static void printVtx(uint8_t dumpMask, const master_t *defaultConfig)
{ {
// print out vtx channel settings // print out vtx channel settings
vtxChannelActivationCondition_t *cac; const char *format = "vtx %u %u %u %u %u %u\r\n";
vtxChannelActivationCondition_t *cacDefault; bool equalsDefault = true;
bool equalsDefault;
for (uint32_t i = 0; i < MAX_CHANNEL_ACTIVATION_CONDITION_COUNT; i++) { for (uint32_t i = 0; i < MAX_CHANNEL_ACTIVATION_CONDITION_COUNT; i++) {
cac = &masterConfig.vtxChannelActivationConditions[i]; const vtxChannelActivationCondition_t *cac = &masterConfig.vtxChannelActivationConditions[i];
cacDefault = &defaultConfig->vtxChannelActivationConditions[i]; if (defaultConfig) {
equalsDefault = cac->auxChannelIndex == cacDefault->auxChannelIndex const vtxChannelActivationCondition_t *cacDefault = &defaultConfig->vtxChannelActivationConditions[i];
&& cac->band == cacDefault->band equalsDefault = cac->auxChannelIndex == cacDefault->auxChannelIndex
&& cac->channel == cacDefault->channel && cac->band == cacDefault->band
&& cac->range.startStep == cacDefault->range.startStep && cac->channel == cacDefault->channel
&& cac->range.endStep == cacDefault->range.endStep; && cac->range.startStep == cacDefault->range.startStep
const char *format = "vtx %u %u %u %u %u %u\r\n"; && cac->range.endStep == cacDefault->range.endStep;
cliDefaultPrintf(dumpMask, equalsDefault, format, cliDefaultPrintf(dumpMask, equalsDefault, format,
i, i,
cacDefault->auxChannelIndex, cacDefault->auxChannelIndex,
cacDefault->band, cacDefault->band,
cacDefault->channel, cacDefault->channel,
MODE_STEP_TO_CHANNEL_VALUE(cacDefault->range.startStep), MODE_STEP_TO_CHANNEL_VALUE(cacDefault->range.startStep),
MODE_STEP_TO_CHANNEL_VALUE(cacDefault->range.endStep) MODE_STEP_TO_CHANNEL_VALUE(cacDefault->range.endStep)
); );
}
cliDumpPrintf(dumpMask, equalsDefault, format, cliDumpPrintf(dumpMask, equalsDefault, format,
i, i,
cac->auxChannelIndex, cac->auxChannelIndex,