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

Moved LEDS_PER_METER into config-system

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-18 08:44:54 +01:00
parent 43c0f6e374
commit 1411a8847c
6 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_allfeatures.cmake
View File

@ -74,7 +74,6 @@ set(BOBBYCAR_BUILDFLAGS
-DHEAP_LRGST_CRASH_TEXT_FIX -DHEAP_LRGST_CRASH_TEXT_FIX
-DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_WRONG_DIRECTION
-DLEDSTRIP_ANIMATION_DEFAULT=1 -DLEDSTRIP_ANIMATION_DEFAULT=1
-DLEDS_PER_METER=144
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_ESPNOW -DFEATURE_ESPNOW

1
config_comred.cmake
View File

@ -67,7 +67,6 @@ set(BOBBYCAR_BUILDFLAGS
-DHEAP_LRGST_CRASH_TEXT_FIX -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DLEDSTRIP_ANIMATION_DEFAULT=1 -DLEDSTRIP_ANIMATION_DEFAULT=1
-DLEDS_PER_METER=144
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET

1
config_feedc0de.cmake
View File

@ -65,7 +65,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DHEAP_LRGST_CRASH_TEXT_FIX # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DLEDSTRIP_ANIMATION_DEFAULT=0 -DLEDSTRIP_ANIMATION_DEFAULT=0
-DLEDS_PER_METER=144
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK

1
config_nofeatures.cmake
View File

@ -74,7 +74,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DHEAP_LRGST_CRASH_TEXT_FIX # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
# -DLEDSTRIP_ANIMATION_DEFAULT=1 # -DLEDSTRIP_ANIMATION_DEFAULT=1
# -DLEDS_PER_METER=144
-DOLD_NVS -DOLD_NVS
# -DFEATURE_DNS_NS # -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK

1
config_peter.cmake
View File

@ -65,7 +65,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DHEAP_LRGST_CRASH_TEXT_FIX # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DLEDSTRIP_ANIMATION_DEFAULT=2 -DLEDSTRIP_ANIMATION_DEFAULT=2
-DLEDS_PER_METER=144
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK

8
main/ledstrip.cpp
View File

@ -285,12 +285,6 @@ void fill_rainbow_invert_at( struct CRGB * pFirstLED, int numToFill, int invertA
void showSpeedSyncAnimation() 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(); static auto last_interval = espchrono::millis_clock::now();
const auto difference_ms = espchrono::ago(last_interval) / 1ms; 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 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 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; const float hue_per_second = leds_per_second * hue_per_led;
hue_result += hue_per_second * difference_ms / 1000.f; hue_result += hue_per_second * difference_ms / 1000.f;