src/abfall.cpp

@@ -32,7 +32,7 @@ int main() {
 #endif
     printf("Firmware version: %s\n", PROJECT_VERSION);
 
-    // WS2812 led(WS2812_PIN);
+    WS2812 led(WS2812_PIN);
 
     wifi_enable(); // Enable Wifi in order to set time and retrieve data
 
@@ -89,33 +89,29 @@ int main() {
         printf("%d-%02d-%02d %02d:%02d.%02d\n", dt.year, dt.month, dt.day, hour, dt.min, dt.sec);
 
         // If there was a waste bin pickup found AND we are in the evening (>= 18:00) …
-        if (it != dates.end() && hour >= 18 && hour < 23) {
+        if (it != dates.end() && hour >= 18) {
             auto wasteDate = *it;
             size_t count{0};
             auto currentTime = time_us_64();
             while (currentTime < timestamp) {
                 size_t index = count % wasteDate.wasteTypes.size();
 
-                {
+                switch (wasteDate.wasteTypes.at(index)) {
-                    WS2812 led(WS2812_PIN);
+                case Waste::GelberSack:
-
+                    led.switchColor(Color::YELLOW);
-                    switch (wasteDate.wasteTypes.at(index)) {
+                    break;
-                    case Waste::GelberSack:
+                case Waste::Restmuell:
-                        led.switchColor(Color::YELLOW);
+                    led.switchColor(Color::RED);
-                        break;
+                    break;
-                    case Waste::Restmuell:
+                case Waste::Papiertonne:
-                        led.switchColor(Color::RED);
+                    led.switchColor(Color::BLUE);
-                        break;
+                    break;
-                    case Waste::Papiertonne:
+                case Waste::Problemstoffmobil:
-                        led.switchColor(Color::BLUE);
+                    led.switchColor(Color::CYAN);
-                        break;
+                    break;
-                    case Waste::Problemstoffmobil:
+                case Waste::Biotonne:
-                        led.switchColor(Color::CYAN);
+                    led.switchColor(Color::GREEN);
-                        break;
+                    break;
-                    case Waste::Biotonne:
-                        led.switchColor(Color::GREEN);
-                        break;
-                    }
                 }
 
                 auto timeLeft = timestamp - currentTime;
@@ -131,10 +127,7 @@ int main() {
             }
 
         } else {
-            {
+            led.blinkReady();
-                WS2812 led(WS2812_PIN);
-                led.blinkReady();
-            }
             sleep_until(static_cast<absolute_time_t>(timestamp));
         }
     }

src/ws2812.cpp

@@ -1,13 +1,11 @@
 #include "ws2812.h"
 
 WS2812::WS2812(uint gpio, PIO pio, uint sm) : m_pio{pio}, m_sm{sm} {
-    m_offset = pio_add_program(m_pio, &ws2812_program);
+    uint offset = pio_add_program(m_pio, &ws2812_program);
-    ws2812_program_init(m_pio, m_sm, m_offset, gpio, 800000, true);
+    ws2812_program_init(m_pio, m_sm, offset, gpio, 800000, true);
     switchColor(Color::OFF);
 }
 
-WS2812::~WS2812() { pio_remove_program(m_pio, &ws2812_program, m_offset); }
-
 void WS2812::switchColor(Color color) { putPixel(static_cast<uint32_t>(color)); }
 
 void WS2812::blinkReady() {

src/ws2812.h

@@ -17,7 +17,6 @@ enum class Color : uint32_t {
 class WS2812 {
   public:
     WS2812(uint gpio, PIO pio = pio0, uint sm = 0);
-    virtual ~WS2812();
     void switchColor(Color color);
     void blinkReady();
 
@@ -25,5 +24,4 @@ class WS2812 {
     void putPixel(uint32_t pixel_rgb);
     PIO m_pio;
     uint m_sm;
-    uint m_offset{0};
 };