rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some reworking of INDICATOR's and RING's functionality. 

* RING: phase start and direction of animation now depends on LED's X:Y coordinates on the grid (X+Y)
* INDICATOR: it works only at LEDs with defined direction (North, South, East, West).
  Also the colors are changed: Orange for turns, Blue for acceleration, Red for decceleration.
This commit is contained in:
Maxim Khomenko 2016-03-06 15:28:26 +02:00
parent 0aac025494
commit 2f65e0d7f7
1 changed files with 31 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/main/io/ledstrip.c
View File

@ -558,42 +558,6 @@ void applyDirectionalModeColor(const uint8_t ledIndex, const ledConfig_t *ledCon
}
typedef enum {
QUADRANT_NORTH_EAST = 1,
QUADRANT_SOUTH_EAST,
QUADRANT_SOUTH_WEST,
QUADRANT_NORTH_WEST
} quadrant_e;
void applyQuadrantColor(const uint8_t ledIndex, const ledConfig_t *ledConfig, const quadrant_e quadrant, const hsvColor_t *color)
{
switch (quadrant) {
case QUADRANT_NORTH_EAST:
if (GET_LED_Y(ledConfig) <= highestYValueForNorth && GET_LED_X(ledConfig) >= lowestXValueForEast) {
setLedHsv(ledIndex, color);
}
return;
case QUADRANT_SOUTH_EAST:
if (GET_LED_Y(ledConfig) >= lowestYValueForSouth && GET_LED_X(ledConfig) >= lowestXValueForEast) {
setLedHsv(ledIndex, color);
}
return;
case QUADRANT_SOUTH_WEST:
if (GET_LED_Y(ledConfig) >= lowestYValueForSouth && GET_LED_X(ledConfig) <= highestXValueForWest) {
setLedHsv(ledIndex, color);
}
return;
case QUADRANT_NORTH_WEST:
if (GET_LED_Y(ledConfig) <= highestYValueForNorth && GET_LED_X(ledConfig) <= highestXValueForWest) {
setLedHsv(ledIndex, color);
}
return;
}
}
void applyLedModeLayer(void)
{
const ledConfig_t *ledConfig;
@ -713,18 +677,24 @@ void applyLedWarningLayer(uint8_t updateNow)
void applyLedIndicatorLayer(uint8_t indicatorFlashState)
{
const ledConfig_t *ledConfig;
static const hsvColor_t *flashColor;
static const hsvColor_t *turnColor;
static const hsvColor_t *accColor;
static const hsvColor_t *decColor;
if (!rxIsReceivingSignal()) {
return;
}
if (indicatorFlashState == 0) {
flashColor = &hsv_orange;
turnColor = &hsv_orange;
accColor = &hsv_blue;
decColor = &hsv_red;
} else {
flashColor = &hsv_black;
turnColor = &hsv_black;
accColor = &hsv_black;
decColor = &hsv_black;
}
uint8_t ledIndex;
for (ledIndex = 0; ledIndex < ledCount; ledIndex++) {
@ -734,25 +704,31 @@ void applyLedIndicatorLayer(uint8_t indicatorFlashState)
if (!(ledConfig->flags & LED_FUNCTION_INDICATOR)) {
continue;
}
if (rcCommand[ROLL] > INDICATOR_DEADBAND) {
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_NORTH_EAST, flashColor);
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_SOUTH_EAST, flashColor);
if ((ledConfig->flags & LED_DIRECTION_EAST)) {
setLedHsv(ledIndex, turnColor);
continue;
}
}
if (rcCommand[ROLL] < -INDICATOR_DEADBAND) {
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_NORTH_WEST, flashColor);
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_SOUTH_WEST, flashColor);
if ((ledConfig->flags & LED_DIRECTION_WEST)) {
setLedHsv(ledIndex, turnColor);
continue;
}
}
if (rcCommand[PITCH] > INDICATOR_DEADBAND) {
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_NORTH_EAST, flashColor);
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_NORTH_WEST, flashColor);
if ((ledConfig->flags & LED_DIRECTION_NORTH)) {
setLedHsv(ledIndex, accColor);
}
}
if (rcCommand[PITCH] < -INDICATOR_DEADBAND) {
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_SOUTH_EAST, flashColor);
applyQuadrantColor(ledIndex, ledConfig, QUADRANT_SOUTH_WEST, flashColor);
if ((ledConfig->flags & LED_DIRECTION_SOUTH)) {
setLedHsv(ledIndex, decColor);
}
}
}
}
@ -790,11 +766,8 @@ void applyLedThrustRingLayer(void)
uint8_t ledIndex;
// initialised to special value instead of using more memory for a flag.
static uint8_t rotationSeqLedCount = RING_PATTERN_NOT_CALCULATED;
static uint8_t rotationPhase = ROTATION_SEQUENCE_LED_COUNT;
bool nextLedOn = false;
uint8_t ledRingIndex = 0;
for (ledIndex = 0; ledIndex < ledCount; ledIndex++) {
ledConfig = &ledConfigs[ledIndex];
@ -803,16 +776,15 @@ void applyLedThrustRingLayer(void)
continue;
}
uint8_t ledRingIndex = GET_LED_X(ledConfig) + GET_LED_Y(ledConfig);
bool applyColor = false;
if (ARMING_FLAG(ARMED)) {
if ((ledRingIndex + rotationPhase) % rotationSeqLedCount < ROTATION_SEQUENCE_LED_WIDTH) {
if ((ledRingIndex + rotationPhase) % ROTATION_SEQUENCE_LED_COUNT < ROTATION_SEQUENCE_LED_WIDTH) {
applyColor = true;
}
} else {
if (nextLedOn == false) {
applyColor = true;
}
nextLedOn = !nextLedOn;
applyColor = (ledRingIndex % 2) == 0;
}
if (applyColor) {
@ -822,33 +794,11 @@ void applyLedThrustRingLayer(void)
}
setLedHsv(ledIndex, &ringColor);
ledRingIndex++;
}
uint8_t ledRingLedCount = ledRingIndex;
if (rotationSeqLedCount == RING_PATTERN_NOT_CALCULATED) {
// update ring pattern according to total number of ring leds found
rotationSeqLedCount = ledRingLedCount;
// try to split in segments/rings of exactly ROTATION_SEQUENCE_LED_COUNT leds
if ((ledRingLedCount % ROTATION_SEQUENCE_LED_COUNT) == 0) {
rotationSeqLedCount = ROTATION_SEQUENCE_LED_COUNT;
} else {
// else split up in equal segments/rings of at most ROTATION_SEQUENCE_LED_COUNT leds
while ((rotationSeqLedCount > ROTATION_SEQUENCE_LED_COUNT) && ((rotationSeqLedCount % 2) == 0)) {
rotationSeqLedCount >>= 1;
}
}
// trigger start over
rotationPhase = 1;
}
rotationPhase--;
if (rotationPhase == 0) {
rotationPhase = rotationSeqLedCount;
rotationPhase = ROTATION_SEQUENCE_LED_COUNT;
}
}