init WS2812 LED from main setup(), more logging

ecocurious2 · May 13, 2021 · 731202e · 731202e
1 parent 59da93b
commit 731202e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/multigeiger/multigeiger.ino b/multigeiger/multigeiger.ino
@@ -43,6 +43,7 @@ static Switches switches;
 void setup() {
   bool isLoraBoard = init_hwtest();
   setup_log(DEFAULT_LOG_LEVEL);
+  setup_status_LED();
   setup_display(isLoraBoard);
   setup_switches(isLoraBoard);
   switches = read_switches();  // only read DIP switches once at boot time

diff --git a/multigeiger/status_led.cpp b/multigeiger/status_led.cpp
@@ -4,6 +4,7 @@
 
 #include <NeoPixelBus.h>
 
+#include "log.h"
 #include "status_led.h"
 
 #define PIXEL_COUNT 1
@@ -18,7 +19,7 @@ RgbColor black(0, 0, 0);
 
 static NeoPixelBus<NeoRgbFeature, Neo800KbpsMethod> LEDs(PIXEL_COUNT, PIXEL_PIN);
 
-static RgbColor last_col = black;
+static RgbColor last_col;
 
 static void set_LED(RgbColor col) {
   if (col == last_col)
@@ -29,7 +30,7 @@ static void set_LED(RgbColor col) {
   last_col = col;
 }
 
-static void init_LED(void) {
+void setup_status_LED(void) {
   LEDs.Begin();  // all LEDs off
   LEDs.Show();
   last_col = black;  // consistency sw state == hw state
@@ -65,9 +66,10 @@ void indicate(float radiation, unsigned int indication) {
   RgbColor col;
   static int index = 0;  // index counting modulo COLOR_SEQUENCE_LENGTH
 
+  log(INFO, "LED index: %d, radiation: %f", index, radiation);
+
   switch (index) {
   case 0:  // show a fixed dark separator after LED init
-    init_LED();  // (re-)init the LED
     col = black;
     break;
   case 1:

diff --git a/multigeiger/status_led.h b/multigeiger/status_led.h
@@ -13,3 +13,5 @@
 // indicate radiation and special indications via a color time sequence.
 // you should call this in regular time intervals [e.g. 1s].
 void indicate(float radiation, unsigned int indication);
+
+void setup_status_LED(void);