From 1411a8847cd225f94475fb4f02b341da527c6a22 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Tue, 18 Jan 2022 08:44:54 +0100 Subject: [PATCH] Moved LEDS_PER_METER into config-system --- config_allfeatures.cmake | 1 - config_comred.cmake | 1 - config_feedc0de.cmake | 1 - config_nofeatures.cmake | 1 - config_peter.cmake | 1 - main/ledstrip.cpp | 8 +------- 6 files changed, 1 insertion(+), 12 deletions(-) diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake index 0ac5f00..18b4fb4 100644 --- a/config_allfeatures.cmake +++ b/config_allfeatures.cmake @@ -74,7 +74,6 @@ set(BOBBYCAR_BUILDFLAGS -DHEAP_LRGST_CRASH_TEXT_FIX -DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_ANIMATION_DEFAULT=1 - -DLEDS_PER_METER=144 -DOLD_NVS -DFEATURE_DNS_NS -DFEATURE_ESPNOW diff --git a/config_comred.cmake b/config_comred.cmake index d382bcd..6649208 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -67,7 +67,6 @@ set(BOBBYCAR_BUILDFLAGS -DHEAP_LRGST_CRASH_TEXT_FIX # -DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_ANIMATION_DEFAULT=1 - -DLEDS_PER_METER=144 -DOLD_NVS -DFEATURE_DNS_NS -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake index b687be1..af127e8 100644 --- a/config_feedc0de.cmake +++ b/config_feedc0de.cmake @@ -65,7 +65,6 @@ set(BOBBYCAR_BUILDFLAGS # -DHEAP_LRGST_CRASH_TEXT_FIX # -DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_ANIMATION_DEFAULT=0 - -DLEDS_PER_METER=144 -DOLD_NVS -DFEATURE_DNS_NS # -DSWITCH_BLINK diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake index d99ec75..f7a35b8 100644 --- a/config_nofeatures.cmake +++ b/config_nofeatures.cmake @@ -74,7 +74,6 @@ set(BOBBYCAR_BUILDFLAGS # -DHEAP_LRGST_CRASH_TEXT_FIX # -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_ANIMATION_DEFAULT=1 -# -DLEDS_PER_METER=144 -DOLD_NVS # -DFEATURE_DNS_NS # -DSWITCH_BLINK diff --git a/config_peter.cmake b/config_peter.cmake index 12a3ff3..9e7a539 100644 --- a/config_peter.cmake +++ b/config_peter.cmake @@ -65,7 +65,6 @@ set(BOBBYCAR_BUILDFLAGS # -DHEAP_LRGST_CRASH_TEXT_FIX # -DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_ANIMATION_DEFAULT=2 - -DLEDS_PER_METER=144 -DOLD_NVS -DFEATURE_DNS_NS # -DSWITCH_BLINK diff --git a/main/ledstrip.cpp b/main/ledstrip.cpp index ba7b1c7..afca764 100644 --- a/main/ledstrip.cpp +++ b/main/ledstrip.cpp @@ -285,12 +285,6 @@ void fill_rainbow_invert_at( struct CRGB * pFirstLED, int numToFill, int invertA void showSpeedSyncAnimation() { -#ifdef LEDS_PER_METER - const float leds_per_meter = LEDS_PER_METER; -#else - const float leds_per_meter = 144; -#endif - static auto last_interval = espchrono::millis_clock::now(); const auto difference_ms = espchrono::ago(last_interval) / 1ms; @@ -298,7 +292,7 @@ void showSpeedSyncAnimation() const float hue_per_led = 1. / std::max(uint8_t(1), uint8_t(configs.ledstrip.animationMultiplier.value)); const float meter_per_second = avgSpeedKmh / 3.6; - const float leds_per_second = meter_per_second * leds_per_meter; + const float leds_per_second = meter_per_second * configs.ledstrip.leds_per_meter.value; const float hue_per_second = leds_per_second * hue_per_led; hue_result += hue_per_second * difference_ms / 1000.f;