From 4b2ed1290f039a6fc050f06d83dc89e8836d29fa Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 10 Feb 2019 11:02:08 +0000
Subject: more flexible / simpler color specification

---
 Model01-Firmware.ino | 63 ++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

(limited to 'Model01-Firmware.ino')

diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 21efc71..aac0431 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -134,21 +134,22 @@ enum { PRIMARY, NUMPAD, FUNCTION, FVWM }; // layers
 #define PRIMARY_KEYMAP_QWERTY
 // #define PRIMARY_KEYMAP_DVORAK
 
+typedef enum {
+              Off,
+              Base,
+              Lnch, Wind, View,
+              Ms, MsB, MsW,
+              Func,
+              COLOR_COUNT,
+} color_enum;
+
 class DakkarColor: public kaleidoscope::plugin::LEDMode {
 public:
-  typedef enum {
-        OFF,
-        BASE,
-        LAUNCH, WINDOW, VIEWPORT,
-        MOUSE, MOUSE_BUTTON, MOUSE_WARP,
-        FUNCTION,
-        COUNT,
-  } color;
-
-  DakkarColor(const cRGB _colors[], const color _map[][ROWS][COLS]) : colors(_colors), map(_map) { }
+
+  DakkarColor(const cRGB _colors[], const color_enum _map[][ROWS][COLS]) : colors(_colors), map(_map) { }
 private:
   const cRGB *colors;
-  const color (*map)[ROWS][COLS];
+  const color_enum (*map)[ROWS][COLS];
 protected:
   void update(void) final {
     uint8_t layer = Layer.top();
@@ -165,30 +166,30 @@ protected:
 
 #include "keymap-wrapper.h"
 
-static constexpr cRGB dark_colors[DakkarColor::COUNT] =
+static constexpr cRGB dark_colors[COLOR_COUNT] =
   {
-   [DakkarColor::OFF] = CRGB(0,0,0),
-   [DakkarColor::BASE] = CRGB(0,0,0),
-   [DakkarColor::LAUNCH] = CRGB(0,0,150),
-   [DakkarColor::WINDOW] = CRGB(150,0,0),
-   [DakkarColor::VIEWPORT] = CRGB(0,150,0),
-   [DakkarColor::MOUSE] = CRGB(100,100,0),
-   [DakkarColor::MOUSE_BUTTON] = CRGB(50,0,50),
-   [DakkarColor::MOUSE_WARP] = CRGB(0,50,50),
-   [DakkarColor::FUNCTION] = CRGB(100,100,100),
+   [Off] = CRGB(0,0,0),
+   [Base] = CRGB(0,0,0),
+   [Lnch] = CRGB(0,0,150),
+   [Wind] = CRGB(150,0,0),
+   [View] = CRGB(0,150,0),
+   [Ms] = CRGB(100,100,0),
+   [MsB] = CRGB(50,0,50),
+   [MsW] = CRGB(0,50,50),
+   [Func] = CRGB(100,100,100),
   };
 
-static constexpr cRGB bright_colors[DakkarColor::COUNT] =
+static constexpr cRGB bright_colors[COLOR_COUNT] =
   {
-   [DakkarColor::OFF] = CRGB(0,0,0),
-   [DakkarColor::BASE] = CRGB(50,50,50),
-   [DakkarColor::LAUNCH] = CRGB(0,0,100),
-   [DakkarColor::WINDOW] = CRGB(100,0,0),
-   [DakkarColor::VIEWPORT] = CRGB(0,100,0),
-   [DakkarColor::MOUSE] = CRGB(50,50,0),
-   [DakkarColor::MOUSE_BUTTON] = CRGB(30,0,30),
-   [DakkarColor::MOUSE_WARP] = CRGB(0,30,30),
-   [DakkarColor::FUNCTION] = CRGB(50,50,80),
+   [Off] = CRGB(0,0,0),
+   [Base] = CRGB(50,50,50),
+   [Lnch] = CRGB(0,0,100),
+   [Wind] = CRGB(100,0,0),
+   [View] = CRGB(0,100,0),
+   [Ms] = CRGB(50,50,0),
+   [MsB] = CRGB(30,0,30),
+   [MsW] = CRGB(0,30,30),
+   [Func] = CRGB(50,50,80),
   };
 
 static DakkarColor DakkarColorDark(dark_colors,color_keymaps);
-- 
cgit v1.2.3