From f6660fc3df6dbe9555f068635231f03757b5dd54 Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Wed, 1 Jun 2022 10:42:53 +0200
Subject: [PATCH] Remove the numpad layer

---
 Model100.ino | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/Model100.ino b/Model100.ino
index 93f3b46..b200fe0 100644
--- a/Model100.ino
+++ b/Model100.ino
@@ -14,7 +14,6 @@
 #include "Kaleidoscope-MouseKeys.h"
 #include "Kaleidoscope-Macros.h"
 #include "Kaleidoscope-LEDControl.h"
-#include "Kaleidoscope-NumPad.h"
 #include "Kaleidoscope-LEDEffect-BootGreeting.h"
 #include "Kaleidoscope-LEDEffect-SolidColor.h"
 #include "Kaleidoscope-LEDEffect-Breathe.h"
@@ -35,9 +34,7 @@ enum {
 };
 
 
-/** The Model 100's key layouts are defined as 'keymaps'. By default, there are three
-  * keymaps: The standard QWERTY keymap, the "Function layer" keymap and the "Numpad"
-  * keymap.
+/** The Model 100's key layouts are defined as 'keymaps'.
   *
   * Each keymap is defined as a list using the 'KEYMAP_STACKED' macro, built
   * of first the left hand's layout, followed by the right hand's layout.
@@ -58,12 +55,11 @@ enum {
   *   keeping NUM and FN consistent and accessible on all layers
   *
   * A key defined as 'ShiftToLayer(FUNCTION)' will switch to FUNCTION while held.
-  * Similarly, a key defined as 'LockLayer(NUMPAD)' will switch to NUMPAD when tapped.
+  * Similarly, a key defined as 'LockLayer(FUNCTION)' will switch to FUNCTION when tapped.
   */
 
 enum {
   PRIMARY,
-  NUMPAD,
   FUNCTION,
 };
 
@@ -82,28 +78,13 @@ KEYMAPS(
    Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
    ShiftToLayer(FUNCTION),
 
-   M(MACRO_ANY),  Key_6, Key_7, Key_8,     Key_9,         Key_0,         LockLayer(NUMPAD),
+   M(MACRO_ANY),  Key_6, Key_7, Key_8,     Key_9,         Key_0,         ___,
    Key_Enter,     Key_Y, Key_U, Key_I,     Key_O,         Key_P,         Key_Equals,
                   Key_H, Key_J, Key_K,     Key_L,         Key_Semicolon, Key_Quote,
    Key_RightAlt,  Key_N, Key_M, Key_Comma, Key_Period,    Key_Slash,     Key_Minus,
    Key_RightShift, Key_LeftAlt, Key_Spacebar, Key_RightControl,
    ShiftToLayer(FUNCTION)),
 
-  [NUMPAD] =  KEYMAP_STACKED
-  (___, ___, ___, ___, ___, ___, ___,
-   ___, ___, ___, ___, ___, ___, ___,
-   ___, ___, ___, ___, ___, ___,
-   ___, ___, ___, ___, ___, ___, ___,
-   ___, ___, ___, ___,
-   ___,
-
-   M(MACRO_VERSION_INFO),  ___, Key_7, Key_8,      Key_9,              Key_KeypadSubtract, ___,
-   ___,                    ___, Key_4, Key_5,      Key_6,              Key_KeypadAdd,      ___,
-                           ___, Key_1, Key_2,      Key_3,              Key_Equals,         ___,
-   ___,                    ___, Key_0, Key_Period, Key_KeypadMultiply, Key_KeypadDivide,   Key_Enter,
-   ___, ___, ___, ___,
-   ___),
-
   [FUNCTION] =  KEYMAP_STACKED
   (___,      Key_F1,           Key_F2,      Key_F3,     Key_F4,        Key_F5,           Key_CapsLock,
    Key_Tab,  ___,              Key_mouseUp, ___,        Key_mouseBtnR, Key_mouseWarpEnd, Key_mouseWarpNE,
@@ -222,7 +203,6 @@ KALEIDOSCOPE_INIT_PLUGINS(
   StalkerEffect,
   LEDPaletteTheme,
   ColormapEffect,
-  NumPad,
   Macros,
   MouseKeys,
   HostPowerManagement,
@@ -231,7 +211,6 @@ KALEIDOSCOPE_INIT_PLUGINS(
 
 void setup() {
   Kaleidoscope.setup();
-  NumPad.numPadLayer = NUMPAD;
   AlphaSquare.color = CRGB(255, 0, 0);
   LEDRainbowEffect.brightness(255);
   LEDRainbowWaveEffect.brightness(255);