From b7ffead547641b904199547d4bd2607b35c4b0bc Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 23 Sep 2022 12:48:47 +0100
Subject: now it compiles

---
 keymaps.h | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

(limited to 'keymaps.h')

diff --git a/keymaps.h b/keymaps.h
index da76be2..02015a9 100644
--- a/keymaps.h
+++ b/keymaps.h
@@ -3,25 +3,7 @@
 
 ColorKeymaps(
 
-#if defined (PRIMARY_KEYMAP_QWERTY)
-  [PRIMARY] = KEYMAP_STACKED
-  (CK(___,Base),          CK(Key_1,Base), CK(Key_2,Base), CK(Key_3,Base), CK(Key_4,Base), CK(Key_5,Base), CK(Key_LEDEffectNext,Base),
-   CK(Key_Backtick,Base), CK(Key_Q,Base), CK(Key_W,Base), CK(Key_E,Base), CK(Key_R,Base), CK(Key_T,Base), CK(Key_Tab,Base),
-   CK(Key_PageUp,Base),   CK(Key_A,Base), CK(Key_S,Base), CK(Key_D,Base), CK(Key_F,Base), CK(Key_G,Base),
-   CK(Key_PageDown,Base), CK(Key_Z,Base), CK(Key_X,Base), CK(Key_C,Base), CK(Key_V,Base), CK(Key_B,Base), CK(Key_Escape,Base),
-   CK(Key_LeftControl,Base), CK(Key_Backspace,Base), CK(Key_LeftGui,Base), CK(Key_LeftShift,Base),
-   CK(M(MACRO_FVWM),Base),
-
-   CK(M(MACRO_ANY),Base),   CK(Key_6,Base), CK(Key_7,Base), CK(Key_8,Base),     CK(Key_9,Base),      CK(Key_0,Base),         CK(___,Base),
-   CK(Key_Enter,Base),      CK(Key_Y,Base), CK(Key_U,Base), CK(Key_I,Base),     CK(Key_O,Base),      CK(Key_P,Base),         CK(Key_Equals,Base),
-                            CK(Key_H,Base), CK(Key_J,Base), CK(Key_K,Base),     CK(Key_L,Base),      CK(Key_Semicolon,Base), CK(Key_Quote,Base),
-   CK(Key_RightAlt,Base),   CK(Key_N,Base), CK(Key_M,Base), CK(Key_Comma,Base), CK(Key_Period,Base), CK(Key_Slash,Base),     CK(Key_Minus,Base),
-   CK(Key_RightShift,Base), CK(Key_LeftAlt,Base), CK(Key_Spacebar,Base), CK(Key_RightControl,Base),
-   CK(ShiftToLayer(FUNCTION),Base)),
-
-#elif defined (PRIMARY_KEYMAP_DVORAK)
-
-  [PRIMARY] = KEYMAP_STACKED
+  [PRIMARY] = MYMAP_STACKED
   (CK(___,Base),          CK(Key_1,Base),         CK(Key_2,Base),     CK(Key_3,Base),      CK(Key_4,Base), CK(Key_5,Base), CK(Key_LEDEffectNext,Base),
    CK(Key_Backtick,Base), CK(Key_Quote,Base),     CK(Key_Comma,Base), CK(Key_Period,Base), CK(Key_P,Base), CK(Key_Y,Base), CK(Key_Tab,Base),
    CK(Key_PageUp,Base),   CK(Key_A,Base),         CK(Key_O,Base),     CK(Key_E,Base),      CK(Key_U,Base), CK(Key_I,Base),
@@ -36,13 +18,7 @@ ColorKeymaps(
    CK(Key_RightShift,Base), CK(Key_LeftAlt,Base), CK(Key_Spacebar,Base), CK(Key_RightControl,Base),
    CK(ShiftToLayer(FUNCTION),Base)),
 
-#else
-
-#error "No default keymap defined. You should make sure that you have a line like '#define PRIMARY_KEYMAP_QWERTY' in your sketch"
-
-#endif
-
-  [FUNCTION] =  KEYMAP_STACKED
+  [FUNCTION] =  MYMAP_STACKED
   (CK(XXX,Off),        CK(Key_F1,Func),           CK(Key_F2,Func),      CK(Key_F3,Func),   CK(Key_F4,Func),       CK(Key_F5,Func),          CK(___,Off),
    CK(Key_Tab,Func2),  CK(XXX,Off),               CK(Key_mouseUp,Ms),   CK(XXX,Off),       CK(Key_mouseBtnR,MsB), CK(Key_mouseWarpEnd,MsW), CK(Key_mouseWarpNE,MsW),
    CK(Key_Home,Func2), CK(Key_mouseL,Ms),         CK(Key_mouseDn,Ms),   CK(Key_mouseR,Ms), CK(Key_mouseBtnL,MsB), CK(Key_mouseWarpNW,MsW),
@@ -57,7 +33,7 @@ ColorKeymaps(
    CK(___,Off), CK(___,Off), CK(Key_Insert,Func2), CK(___,Off),
    CK(___,Off)),
 
-  [FVWM] =  KEYMAP_STACKED
+  [FVWM] =  MYMAP_STACKED
   (CK(XXX,Off),                 CK(Key_BacklightDown,Screen), CK(Key_BacklightUp,Screen), CK(Key_F1,Lnch),      CK(Key_F2,Lnch),      CK(XXX,Off),                 CK(___,Off),
    CK(XXX,Off),                 CK(XXX,Off),                  CK(XXX,Off),                CK(XXX,Off),          CK(XXX,Off),          CK(XXX,Off),                 CK(Key_Tab,Wind),
    CK(Key_KeypadAdd,Wind),      CK(XXX,Off),                  CK(Key_Keypad4,Wind),       CK(Key_Keypad2,Wind), CK(Key_Keypad8,Wind), CK(Key_Keypad6,Wind),
-- 
cgit v1.2.3