stricter types, shorter names

2 files changed, 41 insertions, 43 deletions

diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index ca11319..2799f9b 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -142,18 +142,16 @@ enum { PRIMARY, NUMPAD, FUNCTION, FVWM }; // layers
 
 class DakkarColor: public kaleidoscope::plugin::LEDMode {
 public:
-  class color {
-  public:
-    enum {
-          OFF,
-          BASE,
-          LAUNCH, WINDOW, VIEWPORT,
-          MOUSE, MOUSE_BUTTON, MOUSE_WARP,
-          FUNCTION,
-    };
-  };
-
-  DakkarColor(const cRGB _colors[], const uint8_t _map[][ROWS][COLS]) : colors(_colors), map(_map) { }
+  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) { }
 private:
   static constexpr cRGB color_off = CRGB(0,0,0);
 
@@ -167,7 +165,7 @@ private:
   static constexpr cRGB color_function = CRGB(64,128,64);
 
   const cRGB *colors;
-  const uint8_t (*map)[ROWS][COLS];
+  const color (*map)[ROWS][COLS];
 protected:
   void update(void) final {
     for (uint8_t r = 0; r < ROWS; r++) {
@@ -183,30 +181,30 @@ protected:
 
 #include "keymap-wrapper.h"
 
-static constexpr cRGB dark_colors[] =
+static constexpr cRGB dark_colors[DakkarColor::COUNT] =
   {
-   [DakkarColor::color::OFF] = CRGB(0,0,0),
-   [DakkarColor::color::BASE] = CRGB(0,0,0),
-   [DakkarColor::color::LAUNCH] = CRGB(0,0,150),
-   [DakkarColor::color::WINDOW] = CRGB(150,0,0),
-   [DakkarColor::color::VIEWPORT] = CRGB(0,150,0),
-   [DakkarColor::color::MOUSE] = CRGB(100,100,0),
-   [DakkarColor::color::MOUSE_BUTTON] = CRGB(50,0,50),
-   [DakkarColor::color::MOUSE_WARP] = CRGB(0,50,50),
-   [DakkarColor::color::FUNCTION] = CRGB(100,100,100),
+   [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),
   };
 
-static constexpr cRGB bright_colors[] =
+static constexpr cRGB bright_colors[DakkarColor::COUNT] =
   {
-   [DakkarColor::color::OFF] = CRGB(0,0,0),
-   [DakkarColor::color::BASE] = CRGB(50,50,50),
-   [DakkarColor::color::LAUNCH] = CRGB(0,0,100),
-   [DakkarColor::color::WINDOW] = CRGB(100,0,0),
-   [DakkarColor::color::VIEWPORT] = CRGB(0,100,0),
-   [DakkarColor::color::MOUSE] = CRGB(50,50,0),
-   [DakkarColor::color::MOUSE_BUTTON] = CRGB(30,0,30),
-   [DakkarColor::color::MOUSE_WARP] = CRGB(0,30,30),
-   [DakkarColor::color::FUNCTION] = CRGB(50,50,80),
+   [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),
   };
 
 static DakkarColor DakkarColorDark(dark_colors,color_keymaps);
diff --git a/keymap-wrapper.h b/keymap-wrapper.h
index 08e709c..96b2963 100644
--- a/keymap-wrapper.h
+++ b/keymap-wrapper.h
@@ -27,18 +27,18 @@
 
 #undef ColorKeymaps
 
-#define cOff(x) DakkarColor::color::OFF
-#define cBase(x) DakkarColor::color::BASE
-#define cLnch(x) DakkarColor::color::LAUNCH
-#define cWind(x) DakkarColor::color::WINDOW
-#define cView(x) DakkarColor::color::VIEWPORT
-#define cMs(x) DakkarColor::color::MOUSE
-#define cMsW(x) DakkarColor::color::MOUSE_WARP
-#define cMsB(x) DakkarColor::color::MOUSE_BUTTON
-#define cFunc(x) DakkarColor::color::FUNCTION
+#define cOff(x) DakkarColor::OFF
+#define cBase(x) DakkarColor::BASE
+#define cLnch(x) DakkarColor::LAUNCH
+#define cWind(x) DakkarColor::WINDOW
+#define cView(x) DakkarColor::VIEWPORT
+#define cMs(x) DakkarColor::MOUSE
+#define cMsW(x) DakkarColor::MOUSE_WARP
+#define cMsB(x) DakkarColor::MOUSE_BUTTON
+#define cFunc(x) DakkarColor::FUNCTION
 
 #define ColorKeymaps(layers...) \
-  static constexpr uint8_t color_keymaps[][ROWS][COLS] PROGMEM = { layers };
+  static constexpr DakkarColor::color color_keymaps[][ROWS][COLS] PROGMEM = { layers };
 
 #include "keymaps.h"