martin/abfall
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "WIP: try to safe energy (deinit pio)"

Browse source 
This reverts commit 29272d43bc.
This commit is contained in:
Martin Brodbeck 2023-01-10 08:39:51 +01:00
parent a2a7521e1d
commit aaa2c6dac4
3 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/abfall.cpp
View file

@ -32,7 +32,7 @@ int main() {
#endif #endif
printf("Firmware version: %s\n", PROJECT_VERSION); 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 wifi_enable(); // Enable Wifi in order to set time and retrieve data
@ -96,26 +96,22 @@ int main() {
while (currentTime < timestamp) { while (currentTime < timestamp) {
size_t index = count % wasteDate.wasteTypes.size(); 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; auto timeLeft = timestamp - currentTime;
@ -131,10 +127,7 @@ int main() {
} }
} else { } else {
{ led.blinkReady();
WS2812 led(WS2812_PIN);
led.blinkReady();
}
sleep_until(static_cast<absolute_time_t>(timestamp)); sleep_until(static_cast<absolute_time_t>(timestamp));
} }
} }

6
src/ws2812.cpp
View file

@ -1,13 +1,11 @@
#include "ws2812.h" #include "ws2812.h"
WS2812::WS2812(uint gpio, PIO pio, uint sm) : m_pio{pio}, m_sm{sm} { 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); 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::switchColor(Color color) { putPixel(static_cast<uint32_t>(color)); }
void WS2812::blinkReady() { void WS2812::blinkReady() {

2
src/ws2812.h
View file

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