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

Merge pull request #1840 from atomiclama/bf_remove_warning

Browse source 
cppcheck warning removal
This commit is contained in:
Martin Budden 2016-12-26 16:33:09 +01:00 • committed by GitHub
commit 372ddf67cf
3 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -262,10 +262,8 @@ static void serializeNames(sbuf_t *dst, const char *s)
static const box_t *findBoxByActiveBoxId(uint8_t activeBoxId) static const box_t *findBoxByActiveBoxId(uint8_t activeBoxId)
{ {
uint8_t boxIndex; for (uint8_t boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
const box_t *candidate; const box_t *candidate = &boxes[boxIndex];
for (boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
candidate = &boxes[boxIndex];
if (candidate->boxId == activeBoxId) { if (candidate->boxId == activeBoxId) {
return candidate; return candidate;
} }
@ -275,10 +273,8 @@ static const box_t *findBoxByActiveBoxId(uint8_t activeBoxId)
static const box_t *findBoxByPermenantId(uint8_t permenantId) static const box_t *findBoxByPermenantId(uint8_t permenantId)
{ {
uint8_t boxIndex; for (uint8_t boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
const box_t *candidate; const box_t *candidate = &boxes[boxIndex];
for (boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
candidate = &boxes[boxIndex];
if (candidate->permanentId == permenantId) { if (candidate->permanentId == permenantId) {
return candidate; return candidate;
} }
@ -1418,7 +1414,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
#ifdef USE_SERVOS #ifdef USE_SERVOS
if (dataSize != 1 + sizeof(servoParam_t)) { if (dataSize != 1 + sizeof(servoParam_t)) {
return MSP_RESULT_ERROR; return MSP_RESULT_ERROR;
break;
} }
i = sbufReadU8(src); i = sbufReadU8(src);
if (i >= MAX_SUPPORTED_SERVOS) { if (i >= MAX_SUPPORTED_SERVOS) {
@ -1572,7 +1567,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
case MSP_SET_TRANSPONDER_CONFIG: case MSP_SET_TRANSPONDER_CONFIG:
if (dataSize != sizeof(masterConfig.transponderData)) { if (dataSize != sizeof(masterConfig.transponderData)) {
return MSP_RESULT_ERROR; return MSP_RESULT_ERROR;
break;
} }
for (unsigned int i = 0; i < sizeof(masterConfig.transponderData); i++) { for (unsigned int i = 0; i < sizeof(masterConfig.transponderData); i++) {
masterConfig.transponderData[i] = sbufReadU8(src); masterConfig.transponderData[i] = sbufReadU8(src);

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

@ -110,8 +110,8 @@ static void taskHandleSerial(timeUs_t currentTimeUs)
static void taskUpdateBattery(timeUs_t currentTimeUs) static void taskUpdateBattery(timeUs_t currentTimeUs)
{ {
#if defined(USE_ADC) || defined(USE_ESC_SENSOR) #if defined(USE_ADC) || defined(USE_ESC_SENSOR)
static uint32_t vbatLastServiced = 0;
if (feature(FEATURE_VBAT) || feature(FEATURE_ESC_SENSOR)) { if (feature(FEATURE_VBAT) || feature(FEATURE_ESC_SENSOR)) {
static uint32_t vbatLastServiced = 0;
if (cmp32(currentTimeUs, vbatLastServiced) >= VBATINTERVAL) { if (cmp32(currentTimeUs, vbatLastServiced) >= VBATINTERVAL) {
vbatLastServiced = currentTimeUs; vbatLastServiced = currentTimeUs;
updateBattery(); updateBattery();
@ -119,8 +119,8 @@ static void taskUpdateBattery(timeUs_t currentTimeUs)
} }
#endif #endif
static uint32_t ibatLastServiced = 0;
if (feature(FEATURE_CURRENT_METER) || feature(FEATURE_ESC_SENSOR)) { if (feature(FEATURE_CURRENT_METER) || feature(FEATURE_ESC_SENSOR)) {
static uint32_t ibatLastServiced = 0;
const int32_t ibatTimeSinceLastServiced = cmp32(currentTimeUs, ibatLastServiced); const int32_t ibatTimeSinceLastServiced = cmp32(currentTimeUs, ibatLastServiced);
if (ibatTimeSinceLastServiced >= IBATINTERVAL) { if (ibatTimeSinceLastServiced >= IBATINTERVAL) {

10
src/main/io/ledstrip.c
View file

@ -568,13 +568,11 @@ static void applyLedBatteryLayer(bool updateNow, timeUs_t *timer)
{ {
static bool flash = false; static bool flash = false;
int state;
int timerDelayUs = HZ_TO_US(1); int timerDelayUs = HZ_TO_US(1);
if (updateNow) { if (updateNow) {
state = getBatteryState();
switch (state) { switch (getBatteryState()) {
case BATTERY_OK: case BATTERY_OK:
flash = true; flash = true;
timerDelayUs = HZ_TO_US(1); timerDelayUs = HZ_TO_US(1);
@ -605,11 +603,10 @@ static void applyLedRssiLayer(bool updateNow, timeUs_t *timer)
{ {
static bool flash = false; static bool flash = false;
int state;
int timerDelay = HZ_TO_US(1); int timerDelay = HZ_TO_US(1);
if (updateNow) { if (updateNow) {
state = (rssi * 100) / 1023; int state = (rssi * 100) / 1023;
if (state > 50) { if (state > 50) {
flash = true; flash = true;
@ -634,11 +631,12 @@ static void applyLedRssiLayer(bool updateNow, timeUs_t *timer)
#ifdef GPS #ifdef GPS
static void applyLedGpsLayer(bool updateNow, timeUs_t *timer) static void applyLedGpsLayer(bool updateNow, timeUs_t *timer)
{ {
static uint8_t gpsFlashCounter = 0;
static uint8_t gpsPauseCounter = 0; static uint8_t gpsPauseCounter = 0;
const uint8_t blinkPauseLength = 4; const uint8_t blinkPauseLength = 4;
if (updateNow) { if (updateNow) {
static uint8_t gpsFlashCounter = 0;
if (gpsPauseCounter > 0) { if (gpsPauseCounter > 0) {
gpsPauseCounter--; gpsPauseCounter--;
} else if (gpsFlashCounter >= GPS_numSat) { } else if (gpsFlashCounter >= GPS_numSat) {