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

Update turn indicators and battery led flashing to operate

Browse source 
independently.

Turn indicators now flash faster the more you're turning.
This commit is contained in:
Dominic Clifton 2014-06-08 04:04:29 +01:00
parent bad872377b
commit 32018d0310
1 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/main/mw.c
View file

@ -378,53 +378,85 @@ static const rgbColor24bpp_t stripReds[] =
{{ 32, 0, 0}}, {{ 32, 0, 0}},
}; };
uint32_t lastStripUpdateAt = 0; uint32_t nextIndicatorFlashAt = 0;
uint32_t nextBatteryFlashAt = 0;
#define LED_STRIP_10HZ ((1000 * 1000) / 10) #define LED_STRIP_10HZ ((1000 * 1000) / 10)
#define LED_STRIP_5HZ ((1000 * 1000) / 5)
void updateLedStrip(void) void updateLedStrip(void)
{ {
uint32_t now = micros(); uint32_t now = micros();
if (now - lastStripUpdateAt < LED_STRIP_10HZ) { bool indicatorFlashNow = (int32_t)(now - nextIndicatorFlashAt) >= 0L;
bool batteryFlashNow = (int32_t)(now - nextBatteryFlashAt) >= 0L;
if (!(batteryFlashNow || indicatorFlashNow)) {
return; return;
} }
lastStripUpdateAt = now; static uint8_t indicatorFlashState = 0;
static uint8_t batteryFlashState = 0;
static uint8_t stripState = 0; static const rgbColor24bpp_t *flashColor;
const rgbColor24bpp_t *flashColor; // LAYER 1
if (stripState == 0) { if (f.ARMED) {
flashColor = &orange; setStripColors(stripOrientation);
if (f.ARMED) {
setStripColors(stripOrientation);
} else {
setStripColors(stripReds);
}
stripState = 1;
} else { } else {
flashColor = &black; setStripColors(stripReds);
if (feature(FEATURE_VBAT) && shouldSoundBatteryAlarm()) {
setStripColor(&black);
}
stripState = 0;
} }
if (rcCommand[ROLL] < -100) { // LAYER 2
if (batteryFlashNow) {
nextBatteryFlashAt = now + LED_STRIP_10HZ;
if (batteryFlashState == 0) {
batteryFlashState = 1;
} else {
batteryFlashState = 0;
}
}
if (batteryFlashState == 1 && feature(FEATURE_VBAT) && shouldSoundBatteryAlarm()) {
setStripColor(&black);
}
// LAYER 3
if (indicatorFlashNow) {
uint8_t rollScale = abs(rcCommand[ROLL]) / 50;
uint8_t pitchScale = abs(rcCommand[PITCH]) / 50;
nextIndicatorFlashAt = now + (LED_STRIP_5HZ / max(rollScale, pitchScale));
if (indicatorFlashState == 0) {
indicatorFlashState = 1;
} else {
indicatorFlashState = 0;
}
}
if (indicatorFlashState == 0) {
flashColor = &orange;
} else {
flashColor = &black;
}
if (rcCommand[ROLL] < -50) {
setLedColor(0, flashColor); setLedColor(0, flashColor);
setLedColor(9, flashColor); setLedColor(9, flashColor);
} }
if (rcCommand[ROLL] > 100) { if (rcCommand[ROLL] > 50) {
setLedColor(4, flashColor); setLedColor(4, flashColor);
setLedColor(5, flashColor); setLedColor(5, flashColor);
} }
if (rcCommand[PITCH] > 100) { if (rcCommand[PITCH] > 50) {
setLedColor(0, flashColor); setLedColor(0, flashColor);
setLedColor(4, flashColor); setLedColor(4, flashColor);
} }
if (rcCommand[PITCH] < -100) { if (rcCommand[PITCH] < -50) {
setLedColor(5, flashColor); setLedColor(5, flashColor);
setLedColor(9, flashColor); setLedColor(9, flashColor);
} }