1 files changed, 2 insertions, 53 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 5045e3e..e91c1cc 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -134,60 +134,9 @@ 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,
-              Num,
-              NumBreathe,
-              COLOR_COUNT,
-} color_index;
-
 #include "keymap-wrapper.h"
-#include "DakkarColor.h"
-
-const cRGB num_breathe() { return breath_compute(170); }
-
-#define D_C(r,g,b) ((DakkarColor::colorSrc){ \
-  .value_or_function = DakkarColor::colorSrc::VALUE, \
-  .vf = { .value = CRGB(r,g,b) } \
-})
-#define D_F(f) ((DakkarColor::colorSrc){ \
-  .value_or_function = DakkarColor::colorSrc::FUNCTION, \
-  .vf = { .function = f } \
-})
-
-static constexpr DakkarColor::colorSrc dark_colors[COLOR_COUNT] =
-  {
-   [Off] = D_C(0,0,0),
-   [Base] = D_C(0,0,0),
-   [Lnch] = D_C(0,0,150),
-   [Wind] = D_C(150,0,0),
-   [View] = D_C(0,150,0),
-   [Ms] = D_C(100,100,0),
-   [MsB] = D_C(50,0,50),
-   [MsW] = D_C(0,50,50),
-   [Func] = D_C(100,100,150),
-   [Num] = D_C(150,0,0),
-   [NumBreathe] = D_F(num_breathe),
-  };
-
-static constexpr DakkarColor::colorSrc bright_colors[COLOR_COUNT] =
-  {
-   [Off] = D_C(0,0,0),
-   [Base] = D_C(50,50,50),
-   [Lnch] = D_C(0,0,100),
-   [Wind] = D_C(100,0,0),
-   [View] = D_C(0,100,0),
-   [Ms] = D_C(50,50,0),
-   [MsB] = D_C(30,0,30),
-   [MsW] = D_C(0,30,30),
-   [Func] = D_C(50,50,80),
-   [Num] = D_C(100,0,0),
-   [NumBreathe] = D_F(num_breathe),
-  };
+
+#include "color-themes.h"
 
 static DakkarColor DakkarColorDark(color_keymaps,dark_colors);
 static DakkarColor DakkarColorBright(color_keymaps,bright_colors);