All the useful updates

.gitignore

@@ -1,3 +1,3 @@
-wifi_creds.h
-*.swp
-build/
+EleksTubeHAX/global_defines.h
+EleksTubeHAX/GLOBAL_DEFINES.h
+EleksTubeHAX/global_defines.h

EleksTubeHAX/Backlights.cpp

@@ -8,7 +8,7 @@ void Backlights::begin(StoredConfig::Config::Backlights *config_)  {
     // Config is invalid, probably a new device never had its config written.
     // Load some reasonable defaults.
     Serial.println("Loaded Backlights config is invalid, using default.  This is normal on first boot.");
-    setPattern(dark);
+    setPattern(rainbow);
     setColorPhase(0);
     setIntensity(max_intensity-1);
     setPulseRate(72);
@@ -65,7 +65,11 @@ void Backlights::loop() {
   }
   else if (config->pattern == constant) {
     if (pattern_needs_init) {
-      setBrightness(0xFF >> max_intensity - config->intensity - 1);
+      if (dimming) {
+        setBrightness(0xFF >> max_intensity - (BACKLIGHT_DIMMED_INTENSITY) - 1);
+        } else {
+        setBrightness(0xFF >> max_intensity - config->intensity - 1);
+        }
       fill(phaseToColor(config->color_phase));
       show();
     }
@@ -90,6 +94,9 @@ void Backlights::pulsePattern() {
 
   float pulse_length_millis = (60.0f * 1000) / config->breath_per_min;
   float val = 1 + abs(sin(2 * M_PI * millis() / pulse_length_millis)) * 254;
+  if (dimming) {
+    val = val * BACKLIGHT_DIMMED_INTENSITY / 7;
+  }  
   setBrightness((uint8_t)val);
 
   show();
@@ -106,6 +113,10 @@ void Backlights::breathPattern() {
   float pulse_length_millis = (60.0f * 1000) / config->breath_per_min;
   float val = (exp(sin(2 * M_PI * millis() / pulse_length_millis)) - 0.36787944f) * 108.0f;
 
+  if (dimming) {
+    val = val * BACKLIGHT_DIMMED_INTENSITY / 7;
+  }  
+
   uint8_t brightness = (uint8_t)val;
   if (brightness < 1) { brightness = 1; }
   setBrightness(brightness);
@@ -161,13 +172,18 @@ void Backlights::rainbowPattern() {
 
   // Divide by 10 to slow down the rainbow rotation rate.
   // TODO Make this /10 a parameter
-  uint16_t phase = millis()/10 % max_phase;  
+  uint16_t phase = millis()/16 % max_phase;  
 
   for (uint8_t digit=0; digit < NUM_DIGITS; digit++) {
     // Shift the phase for this LED.
     uint16_t my_phase = (phase + digit*phase_per_digit) % max_phase;
     setPixelColor(digit, phaseToColor(my_phase));
   }
+  if (dimming) {
+    setBrightness((uint8_t) BACKLIGHT_DIMMED_INTENSITY);
+  }  else {
+    setBrightness(0xFF >> max_intensity - config->intensity - 1);  
+  }
   show();
 }
 

EleksTubeHAX/Backlights.h

@@ -1,6 +1,8 @@
 #ifndef BACKLIGHTS_H
 #define BACKLIGHTS_H
 
+#include "GLOBAL_DEFINES.h"
+
 /*
  * A simple sub-class of the Adafruit_NeoPixel class, to configure it for
  * the EleksTube-IPS clock, and to add a little functionality.
@@ -12,7 +14,6 @@
  * Otherwise, class Backlights behaves exactly as Adafruit_NeoPixel does.
  */
 #include <stdint.h>
-#include "Hardware.h"
 #include "StoredConfig.h"
 #include <Adafruit_NeoPixel.h>
 
@@ -29,6 +30,8 @@ class Backlights: public Adafruit_NeoPixel {
   void loop();
 
   void togglePower() { off = !off; pattern_needs_init = true; }
+  void PowerOn()  { off = false; pattern_needs_init = true; }
+  void PowerOff() { off = true; pattern_needs_init = true; }
 
   void setPattern(patterns p)      { config->pattern = uint8_t(p); pattern_needs_init = true; }
   patterns getPattern()            { return patterns(config->pattern); }
@@ -50,7 +53,8 @@ class Backlights: public Adafruit_NeoPixel {
   void setIntensity(uint8_t intensity);
   void adjustIntensity(int16_t adj);
   uint8_t getIntensity()                      { return config->intensity; }
-
+
+  bool dimming = false;
 
 private:
   bool pattern_needs_init;

EleksTubeHAX/Button.cpp

@@ -1,4 +1,4 @@
-#include "Button.h"
+#include "Buttons.h"
 
 void Button::begin() {
   millis_at_last_transition = millis();

EleksTubeHAX/Buttons.h

@@ -1,11 +1,80 @@
 #ifndef BUTTONS_H
 #define BUTTONS_H
+
+#include "GLOBAL_DEFINES.h"
+
+/*
+ * A simple class to keep track of button states.  It's asynchronous, only checking
+ * for changes between calls to .loop().  If a button changes states multiple times 
+ * between calls to .loop(), only the state when .loop() is called is registered.
+ */
+
+// For HIGH and LOW
+#include <Arduino.h>
+
+class Button {
+public:
+  Button(uint8_t pin, uint8_t active_state=LOW, uint32_t long_press_ms=500)
+    : pin(pin), active_state(active_state), long_press_ms(long_press_ms), 
+      down_last_time(false), state_changed(false), millis_at_last_transition(0), button_state(idle) {}
+
+  /*
+   * States:
+   * idle: button was up (not pressed) last time, and is still up now.
+   * down_edge: button was up last time, but is down now. ie: it has just been pressed.
+   * down: button was down last time, and is still down, but for less than long_press_ms.
+   * down_long_edge: button has been down for at least long_press_ms, the first time.
+   * down_long: button has been down for at least long_press_ms, after the first time.
+   * up_edge: button was down last time, but is up now.  ie: it has just been released from a short press.
+   * up_long_edge: button was down_long last time, but is up now. ie: just released from a long press.
+   * 
+   * Note: There is no up_long state, that's just idle and it goes into idle immediately
+   * after up_edge.
+   */
+  enum state {idle, down_edge, down, down_long_edge, down_long, up_edge, up_long_edge, num_states};
+  const static String state_str[num_states];
+
+  void begin();
+  void loop();
+
+  // These are only updated when loop() is called, not when the getters are called.
+  state getState() { return button_state; }
+  String getStateStr() { return state_str[button_state]; }
+  bool stateChanged() { return state_changed; }
+  uint32_t millisInState() { return millis_at_last_loop-millis_at_last_transition; }
+
+  bool isIdle()         { return button_state == idle; }
+  bool isDownEdge()     { return button_state == down_edge; }
+  bool isDown()         { return button_state == down; }
+  bool isDownLongEdge() { return button_state == down_long_edge; }
+  bool isDownLong()     { return button_state == down_long; }
+  bool isUpEdge()       { return button_state == up_edge; }
+  bool isUpLongEdge()   { return button_state == up_long_edge; }
+  bool isDownLongy()    { return button_state == down_long_edge || button_state == down_long; }
+  bool isDowny()        { return button_state == down_edge || button_state == down || isDownLongy(); }
+  bool isUpy()          { return button_state == idle || button_state == up_edge || button_state == up_long_edge; }
+
+private:
+  // Config
+  const uint8_t pin;
+  const uint8_t active_state;
+  const uint32_t long_press_ms;
+
+  // Internal state
+  bool down_last_time;
+  bool state_changed;
+  uint32_t millis_at_last_transition;
+  uint32_t millis_at_last_loop;
+  state button_state;
+
+  bool isButtonDown() { return digitalRead(pin) == active_state; }
+};
+
+
 /*
  * A simple helper class to call common functions on all buttons at once.
  */
 
-#include "Button.h"
-#include "Hardware.h"
 
 class Buttons {
 public:

EleksTubeHAX/ChipSelect.h

@@ -1,7 +1,7 @@
 #ifndef CHIP_SELECT_H
 #define CHIP_SELECT_H
 
-#include "Hardware.h"
+#include "GLOBAL_DEFINES.h"
 
 /*
  * `digit`s are as defined in Hardware.h, 0 == seconds ones, 5 == hours tens.