kill numpad

I only ever hit it by accident

3 files changed, 3 insertions, 39 deletions

diff --git a/keymap-layers.h b/keymap-layers.h
index 364ca67..2efc6b6 100644
--- a/keymap-layers.h
+++ b/keymap-layers.h
@@ -1,9 +1,7 @@
 // -*- mode: c++ -*-
 #pragma once
 
-#include "keymap-layers.h"
-
-enum { PRIMARY, NUMPAD, FUNCTION, FVWM }; // layers
+enum { PRIMARY, FUNCTION, FVWM }; // layers
 
 // #define PRIMARY_KEYMAP_QWERTY
 #define PRIMARY_KEYMAP_DVORAK
diff --git a/keymaps.h b/keymaps.h
index aa0b097..f1add56 100644
--- a/keymaps.h
+++ b/keymaps.h
@@ -12,7 +12,7 @@ ColorKeymaps(
    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(M(MACRO_NUMLOCK),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),
@@ -29,7 +29,7 @@ ColorKeymaps(
    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(LockLayer(NUMPAD),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_F,Base), CK(Key_G,Base), CK(Key_C,Base), CK(Key_R,Base), CK(Key_L,Base), CK(Key_Slash,Base),
                             CK(Key_D,Base), CK(Key_H,Base), CK(Key_T,Base), CK(Key_N,Base), CK(Key_S,Base), CK(Key_Minus,Base),
    CK(Key_RightAlt,Base),   CK(Key_B,Base), CK(Key_M,Base), CK(Key_W,Base), CK(Key_V,Base), CK(Key_Z,Base), CK(Key_Equals,Base),
@@ -42,23 +42,6 @@ ColorKeymaps(
 
 #endif
 
-
-
-  [NUMPAD] =  KEYMAP_STACKED
-  (CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(___,Off),
-   CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off),
-   CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off),
-   CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off), CK(XXX,Off),
-   CK(___,Off), CK(___,Off), CK(___,Off), CK(___,Off),
-   CK(___,Off),
-
-   CK(M(MACRO_VERSION_INFO),Base), CK(XXX,Off), CK(Key_Keypad7,Num), CK(Key_Keypad8,Num),   CK(Key_Keypad9,Num),        CK(Key_KeypadSubtract,Num), CK(___,NumBreathe),
-   CK(XXX,Off),                    CK(XXX,Off), CK(Key_Keypad4,Num), CK(Key_Keypad5,Num),   CK(Key_Keypad6,Num),        CK(Key_KeypadAdd,Num),      CK(XXX,Off),
-                                   CK(XXX,Off), CK(Key_Keypad1,Num), CK(Key_Keypad2,Num),   CK(Key_Keypad3,Num),        CK(Key_KeypadEquals,Num),   CK(XXX,Off),
-   CK(XXX,Off),                    CK(XXX,Off), CK(Key_Keypad0,Num), CK(Key_KeypadDot,Num), CK(Key_KeypadMultiply,Num), CK(Key_KeypadDivide,Num),   CK(Key_KeypadEnter,Num),
-   CK(___,Off), CK(___,Off), CK(___,Off), CK(___,Off),
-   CK(___,Off)),
-
   [FUNCTION] =  KEYMAP_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),
diff --git a/macros.h b/macros.h
index ce5ec13..9a06eab 100644
--- a/macros.h
+++ b/macros.h
@@ -6,7 +6,6 @@
 
 enum { MACRO_VERSION_INFO,
        MACRO_ANY,
-       MACRO_NUMLOCK,
        MACRO_FVWM,
      };
 
@@ -33,18 +32,6 @@ static void anyKeyMacro(uint8_t keyState) {
     kaleidoscope::hid::pressKey(lastKey, toggledOn);
 }
 
-static void numLockMacro(uint8_t keyState) {
-  if (keyToggledOn(keyState)) {
-    kaleidoscope::hid::pressKey(Key_KeypadNumLock);
-    if (Layer.isActive(NUMPAD)) {
-      Layer.deactivate(NUMPAD);
-    }
-    else {
-      Layer.activate(NUMPAD);
-    }
-  }
-}
-
 static const macro_t *fvwmMacro(uint8_t keyState) {
   if (keyIsPressed(keyState)) {
     return MACRO(D(LeftAlt),Dr(ShiftToLayer(FVWM)));
@@ -66,10 +53,6 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
     anyKeyMacro(keyState);
     break;
 
-  case MACRO_NUMLOCK:
-    numLockMacro(keyState);
-    break;
-
   case MACRO_FVWM:
     return fvwmMacro(keyState);
     break;