Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 03:50:02 +03:00
Code Issues Wiki Activity

Fix "may be uninitialized" debug build warnings

Browse source
This commit is contained in:
Bruce Luckcuck 2019-12-22 08:16:27 -05:00
parent f3036221ea
commit b471577a14
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/cli/cli.c
View file

@ -5737,7 +5737,7 @@ static void cliTimer(char *cmdline)
pch = strtok_r(NULL, " ", &saveptr); pch = strtok_r(NULL, " ", &saveptr);
if (pch) { if (pch) {
int timerIndex; int timerIndex = TIMER_INDEX_UNDEFINED;
if (strcasecmp(pch, "list") == 0) { if (strcasecmp(pch, "list") == 0) {
/* output the list of available options */ /* output the list of available options */
const timerHardware_t *timer; const timerHardware_t *timer;
@ -5751,8 +5751,6 @@ static void cliTimer(char *cmdline)
} }
return; return;
} else if (strcasecmp(pch, "none") == 0) {
timerIndex = TIMER_INDEX_UNDEFINED;
} else if (strncasecmp(pch, "af", 2) == 0) { } else if (strncasecmp(pch, "af", 2) == 0) {
unsigned alternateFunction = atoi(&pch[2]); unsigned alternateFunction = atoi(&pch[2]);
@ -5770,7 +5768,7 @@ static void cliTimer(char *cmdline)
return; return;
} }
} else { } else if (strcasecmp(pch, "none") != 0) {
timerIndex = atoi(pch); timerIndex = atoi(pch);
const timerHardware_t *timer = timerGetByTagAndIndex(ioTag, timerIndex + 1); const timerHardware_t *timer = timerGetByTagAndIndex(ioTag, timerIndex + 1);

7
src/main/rx/cc2500_frsky_d.c
View file

@ -117,15 +117,16 @@ static void buildTelemetryFrame(uint8_t *packet)
{ {
uint8_t a1Value; uint8_t a1Value;
switch (rxCc2500SpiConfig()->a1Source) { switch (rxCc2500SpiConfig()->a1Source) {
case FRSKY_SPI_A1_SOURCE_VBAT:
a1Value = (getBatteryVoltage() / 5) & 0xff;
break;
case FRSKY_SPI_A1_SOURCE_EXTADC: case FRSKY_SPI_A1_SOURCE_EXTADC:
a1Value = (adcGetChannel(ADC_EXTERNAL1) & 0xff0) >> 4; a1Value = (adcGetChannel(ADC_EXTERNAL1) & 0xff0) >> 4;
break; break;
case FRSKY_SPI_A1_SOURCE_CONST: case FRSKY_SPI_A1_SOURCE_CONST:
a1Value = A1_CONST_D & 0xff; a1Value = A1_CONST_D & 0xff;
break; break;
case FRSKY_SPI_A1_SOURCE_VBAT:
default:
a1Value = (getBatteryVoltage() / 5) & 0xff;
break;
} }
const uint8_t a2Value = (adcGetChannel(ADC_RSSI)) >> 4; const uint8_t a2Value = (adcGetChannel(ADC_RSSI)) >> 4;
telemetryId = packet[4]; telemetryId = packet[4];

7
src/main/rx/cc2500_frsky_x.c
View file

@ -206,15 +206,16 @@ static void buildTelemetryFrame(uint8_t *packet)
} else { } else {
uint8_t a1Value; uint8_t a1Value;
switch (rxCc2500SpiConfig()->a1Source) { switch (rxCc2500SpiConfig()->a1Source) {
case FRSKY_SPI_A1_SOURCE_VBAT:
a1Value = getLegacyBatteryVoltage() & 0x7f;
break;
case FRSKY_SPI_A1_SOURCE_EXTADC: case FRSKY_SPI_A1_SOURCE_EXTADC:
a1Value = (uint8_t)((adcGetChannel(ADC_EXTERNAL1) & 0xfe0) >> 5); a1Value = (uint8_t)((adcGetChannel(ADC_EXTERNAL1) & 0xfe0) >> 5);
break; break;
case FRSKY_SPI_A1_SOURCE_CONST: case FRSKY_SPI_A1_SOURCE_CONST:
a1Value = A1_CONST_X & 0x7f; a1Value = A1_CONST_X & 0x7f;
break; break;
case FRSKY_SPI_A1_SOURCE_VBAT:
default:
a1Value = getLegacyBatteryVoltage() & 0x7f;
break;
} }
frame[4] = a1Value; frame[4] = a1Value;
} }