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

Simplify and cleanup led ring code.

Browse source 
This changes the behaviour, but since the effect is nice we'll mark it
with a commit.
This commit is contained in:
Dominic Clifton 2015-01-22 23:46:23 +01:00
parent 5a025b7164
commit b50c5d9724
1 changed files with 37 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -744,67 +744,53 @@ void applyLedThrottleLayer()
} }
} }
int applyLedThrustRingLayer(void) void applyLedThrustRingLayer(void)
{ {
uint8_t oppositeLedIndex = ledsInRingCount >> 1;
uint8_t ledIndex; uint8_t ledIndex;
int returnedValue = 1;
int throttleScaled = scaleRange(rcData[THROTTLE], PWM_RANGE_MIN, PWM_RANGE_MAX, 1, 10);
static uint8_t rotationPhase = 0; static uint8_t rotationPhase = 0;
bool nextLedOn = false; bool nextLedOn = false;
hsvColor_t ringColor; hsvColor_t ringColor;
const ledConfig_t *ledConfig; const ledConfig_t *ledConfig;
uint8_t phaseCount = ledsInRingCount / 2;
uint8_t ledRingIndex = 0;
for (ledIndex = 0; ledIndex < ledCount; ledIndex++) { for (ledIndex = 0; ledIndex < ledCount; ledIndex++) {
ledConfig = &ledConfigs[ledIndex]; ledConfig = &ledConfigs[ledIndex];
ringColor = colors[ledConfig->color];
if ((ledConfig->flags & LED_FUNCTION_THRUST_RING)) { if ((ledConfig->flags & LED_FUNCTION_THRUST_RING) == 0) {
continue;
if (!ARMING_FLAG(ARMED)) { }
bool applyColor = false;
if (ARMING_FLAG(ARMED)) {
if (ledRingIndex == rotationPhase || ledIndex == rotationPhase + phaseCount) {
applyColor = true;
}
} else {
if (nextLedOn == false) { if (nextLedOn == false) {
nextLedOn = true; applyColor = true;
} }
else { nextLedOn = !nextLedOn;
nextLedOn = false; }
if (applyColor) {
ringColor = colors[ledConfig->color];
} else {
ringColor = hsv_black; ringColor = hsv_black;
} }
returnedValue = 1;
}
else {
if (rotationPhase == ((oppositeLedIndex) - 1)) {
if (!((ledIndex == rotationPhase) || (ledIndex == (rotationPhase + oppositeLedIndex))
|| (ledIndex == (rotationPhase +1)) || (ledIndex == 0))) {
ringColor = hsv_black;
}
}
else if (!((ledIndex == rotationPhase) || (ledIndex == (rotationPhase + oppositeLedIndex))
|| (ledIndex == (rotationPhase +1)) || (ledIndex == (rotationPhase + oppositeLedIndex +1 )))) {
ringColor = hsv_black;
}
else {
// Led stay on
}
returnedValue = throttleScaled;
}
setLedHsv(ledIndex, &ringColor); setLedHsv(ledIndex, &ringColor);
}
ledRingIndex++;
} }
if (rotationPhase >= (oppositeLedIndex - 1)) { rotationPhase++;
if (rotationPhase == phaseCount) {
rotationPhase = 0; rotationPhase = 0;
} }
else {
rotationPhase++;
}
return returnedValue;
} }
#ifdef USE_LED_ANIMATION #ifdef USE_LED_ANIMATION
@ -931,9 +917,15 @@ void updateLedStrip(void)
if (rotationUpdateNow) { if (rotationUpdateNow) {
int animationSpeedScaled = applyLedThrustRingLayer(); applyLedThrustRingLayer();
nextRotationUpdateAt = now + LED_STRIP_5HZ/animationSpeedScaled; // TODO will be changed with more specifics animation uint8_t animationSpeedScale = 1;
if (ARMING_FLAG(ARMED)) {
animationSpeedScale = scaleRange(rcData[THROTTLE], PWM_RANGE_MIN, PWM_RANGE_MAX, 1, 10);
}
nextRotationUpdateAt = now + LED_STRIP_5HZ/animationSpeedScale;
} }
ws2811UpdateStrip(); ws2811UpdateStrip();