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

Merge branch 'betaflight' into development

Browse source 
# Conflicts:
#	src/main/flight/pid.c
#	src/main/main.c
#	src/main/target/IRCFUSIONF3/target.h
This commit is contained in:
blckmn 2016-08-27 08:34:23 +10:00
commit 9bdb4a9b25
23 changed files with 333 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,10 +189,10 @@ STATIC_UNIT_TESTED void determineLedStripDimensions(void)
STATIC_UNIT_TESTED void determineOrientationLimits(void)
{
highestYValueForNorth = (ledGridHeight / 2) - 1;
lowestYValueForSouth = ((ledGridHeight + 1) / 2);
highestXValueForWest = (ledGridWidth / 2) - 1;
lowestXValueForEast = ((ledGridWidth + 1) / 2);
highestYValueForNorth = MIN((ledGridHeight / 2) - 1, 0);
lowestYValueForSouth = (ledGridHeight + 1) / 2;
highestXValueForWest = MIN((ledGridWidth / 2) - 1, 0);
lowestXValueForEast = (ledGridWidth + 1) / 2;
}
STATIC_UNIT_TESTED void updateLedCount(void)
@ -463,7 +463,11 @@ static void applyLedFixedLayers()
case LED_FUNCTION_FLIGHT_MODE:
for (unsigned i = 0; i < ARRAYLEN(flightModeToLed); i++)
if (!flightModeToLed[i].flightMode || FLIGHT_MODE(flightModeToLed[i].flightMode)) {
color = *getDirectionalModeColor(ledIndex, &masterConfig.modeColors[flightModeToLed[i].ledMode]);
hsvColor_t *directionalColor = getDirectionalModeColor(ledIndex, &masterConfig.modeColors[flightModeToLed[i].ledMode]);
if (directionalColor) {
color = *directionalColor;
}
break; // stop on first match
}
break;