diff --git a/ampel-firmware/co2_sensor.cpp b/ampel-firmware/co2_sensor.cpp index 1ac7f9bbd267ed6365585069f532b880a9af4e13..20878af8d0ecd1a78dba6879fea7731917c230f1 100644 --- a/ampel-firmware/co2_sensor.cpp +++ b/ampel-firmware/co2_sensor.cpp @@ -138,7 +138,6 @@ namespace sensor { */ if (co2 < 2000) { led_effects::displayCO2color(co2); - led_effects::breathe(co2); delay(100); } else { // >= 2000: entire ring blinks red diff --git a/ampel-firmware/led_effects.cpp b/ampel-firmware/led_effects.cpp index 4f84b3bfeb83f093e6ad4d844dfd124c5d1f27a1..c2909e6f4db9a64ea5f7302414fafff554c97885 100644 --- a/ampel-firmware/led_effects.cpp +++ b/ampel-firmware/led_effects.cpp @@ -129,6 +129,19 @@ namespace led_effects { } } + /** + * If enabled, slowly varies the brightness between MAX_BRIGHTNESS & MIN_BRIGHTNESS. + */ + void breathe(int16_t co2) { + static uint8_t breathing_offset = 0; + uint16_t brightness = config::min_brightness + + pixels.sine8(breathing_offset) * config::brightness_amplitude / 255; + pixels.setBrightness(brightness); + pixels.show(); + breathing_offset += co2 > 1600 ? 6 : 3; // breathing speed. +3 looks like slow human breathing. + } + + /** * Fills the whole ring with green, yellow, orange or black, depending on co2 input and CO2_TICKS. */ @@ -142,6 +155,9 @@ namespace led_effects { pixels.setPixelColor(ledId, pixels.ColorHSV(LED_HUES[ledId], 255, brightness)); } pixels.show(); + if (config::brightness_amplitude > 0){ + breathe(co2); + } } void showRainbowWheel(uint16_t duration_ms, uint16_t hue_increment) { @@ -177,18 +193,6 @@ namespace led_effects { } } - void breathe(int16_t co2) { - if (config::night_mode || config::brightness_amplitude == 0) { - return; - } - static uint16_t breathing_offset = 0; - uint16_t brightness = config::min_brightness - + pixels.sine8(breathing_offset) * config::brightness_amplitude / 255; - pixels.setBrightness(brightness); - pixels.show(); - breathing_offset += co2 > 1600 ? 6 : 3; // breathing speed. +3 looks like slow human breathing. - } - /** * Displays a complete blue circle, and starts removing LEDs one by one. Returns the number of remaining LEDs. * Can be used for calibration, e.g. when countdown is 0. Does not work in night mode. diff --git a/ampel-firmware/led_effects.h b/ampel-firmware/led_effects.h index d34a9bfb7d42eeca5fd8cf0ca55b037dec604482..3deb809940e61c9d042ddc52614f7b0ec16a08ca 100644 --- a/ampel-firmware/led_effects.h +++ b/ampel-firmware/led_effects.h @@ -25,7 +25,6 @@ namespace led_effects { void setupRing(); void redAlert(); - void breathe(int16_t co2); int countdownToZero(); void showWaitingLED(uint32_t color); void showKITTWheel(uint32_t color, uint16_t duration_s = 2);