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

Merge pull request #7587 from jeffhendrix/master

Browse source 
Incorrectly using compare value as mask.
This commit is contained in:
Paweł Spychalski 2021-11-19 09:04:17 +01:00 • committed by GitHub
commit ab64cc74ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -485,11 +485,11 @@ static void applyLedFixedLayers(void)
} }
} }
static void applyLedHsv(uint32_t mask, const hsvColor_t *color) static void applyLedHsv(uint32_t mask, uint32_t ledOperation, const hsvColor_t *color)
{ {
for (int ledIndex = 0; ledIndex < ledCounts.count; ledIndex++) { for (int ledIndex = 0; ledIndex < ledCounts.count; ledIndex++) {
const ledConfig_t *ledConfig = &ledStripConfig()->ledConfigs[ledIndex]; const ledConfig_t *ledConfig = &ledStripConfig()->ledConfigs[ledIndex];
if ((*ledConfig & mask) == mask) if ((*ledConfig & mask) == ledOperation)
setLedHsv(ledIndex, color); setLedHsv(ledIndex, color);
} }
} }
@ -548,7 +548,7 @@ static void applyLedWarningLayer(bool updateNow, timeUs_t *timer)
} }
} }
if (warningColor) if (warningColor)
applyLedHsv(LED_MOV_OVERLAY(LED_FLAG_OVERLAY(LED_OVERLAY_WARNING)), warningColor); applyLedHsv(LED_OVERLAY_MASK, LED_MOV_OVERLAY(LED_FLAG_OVERLAY(LED_OVERLAY_WARNING)), warningColor);
} }
} }
@ -582,7 +582,7 @@ static void applyLedBatteryLayer(bool updateNow, timeUs_t *timer)
if (!flash) { if (!flash) {
const hsvColor_t *bgc = getSC(LED_SCOLOR_BACKGROUND); const hsvColor_t *bgc = getSC(LED_SCOLOR_BACKGROUND);
applyLedHsv(LED_MOV_FUNCTION(LED_FUNCTION_BATTERY), bgc); applyLedHsv(LED_FUNCTION_MASK, LED_MOV_FUNCTION(LED_FUNCTION_BATTERY), bgc);
} }
} }
@ -612,7 +612,7 @@ static void applyLedRssiLayer(bool updateNow, timeUs_t *timer)
if (!flash) { if (!flash) {
const hsvColor_t *bgc = getSC(LED_SCOLOR_BACKGROUND); const hsvColor_t *bgc = getSC(LED_SCOLOR_BACKGROUND);
applyLedHsv(LED_MOV_FUNCTION(LED_FUNCTION_RSSI), bgc); applyLedHsv(LED_FUNCTION_MASK, LED_MOV_FUNCTION(LED_FUNCTION_RSSI), bgc);
} }
} }
@ -649,7 +649,7 @@ static void applyLedGpsLayer(bool updateNow, timeUs_t *timer)
} }
} }
applyLedHsv(LED_MOV_FUNCTION(LED_FUNCTION_GPS), gpsColor); applyLedHsv(LED_FUNCTION_MASK, LED_MOV_FUNCTION(LED_FUNCTION_GPS), gpsColor);
} }
#endif #endif