feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change blink wrong direction directly to ledstrip.h

Browse Source
This commit is contained in:
Peter Poetzi
2021-09-30 14:12:17 +02:00
parent 3c38348cf2
commit 86ddacaaa2
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/buttons.h
View File

@ -142,16 +142,10 @@ public:
if(!pressed)return; if(!pressed)return;
#ifdef FEATURE_LEDSTRIP #ifdef FEATURE_LEDSTRIP
#ifdef LEDSTRIP_WRONG_DIRECTION
const auto target_blinkAnimation = 1;
#else
const auto target_blinkAnimation = 2;
#endif
if(blinkAnimation == 0){ //transition from off to left if(blinkAnimation == 0){ //transition from off to left
blinkAnimation = target_blinkAnimation; blinkAnimation = 2;
} }
else if(blinkAnimation == 3 - target_blinkAnimation){ // transition to warning else if(blinkAnimation == 1){ // transition to warning
blinkAnimation = 3; blinkAnimation = 3;
} }
else{ // transition to off else{ // transition to off
@ -163,16 +157,10 @@ public:
static void blinkRightButton(bool pressed){ static void blinkRightButton(bool pressed){
if(!pressed)return; if(!pressed)return;
#ifdef FEATURE_LEDSTRIP #ifdef FEATURE_LEDSTRIP
if(blinkAnimation == 0){ //transition from off to right
#ifdef LEDSTRIP_WRONG_DIRECTION blinkAnimation = 1;
const auto target_blinkAnimation = 2;
#else
const auto target_blinkAnimation = 1;
#endif
if(blinkAnimation == 0){ //transition from off to left
blinkAnimation = target_blinkAnimation;
} }
else if(blinkAnimation == 3 - target_blinkAnimation){ // transition to warning else if(blinkAnimation == 2){ // transition to warning
blinkAnimation = 3; blinkAnimation = 3;
} }
else{ // transition to off else{ // transition to off

6
main/ledstrip.h
View File

@ -37,6 +37,12 @@ void updateLedStrip()
auto color = CRGB{255, 255, 0}; auto color = CRGB{255, 255, 0};
const auto center = (std::begin(leds) + (leds.size() / 2) + settings.ledstrip.centerOffset); const auto center = (std::begin(leds) + (leds.size() / 2) + settings.ledstrip.centerOffset);
#ifdef LEDSTRIP_WRONG_DIRECTION
if(cpputils::is_in(blinkAnimation, 1, 2)){
blinkAnimation = 3 - blinkAnimation;
}
#endif
if (blinkAnimation != 2) if (blinkAnimation != 2)
std::fill(center - settings.ledstrip.bigOffset, center - settings.ledstrip.smallOffset, color); std::fill(center - settings.ledstrip.bigOffset, center - settings.ledstrip.smallOffset, color);
if (blinkAnimation != 1) if (blinkAnimation != 1)