gergely/keyboardio-model100-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the numpad layer

Browse Source
This commit is contained in:
Gergely Polonkai 2022-06-01 10:42:53 +02:00
parent 0846c6f057
commit f6660fc3df
No known key found for this signature in database
GPG Key ID: 2D2885533B869ED4
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Model100.ino
View File

@ -14,7 +14,6 @@
#include "Kaleidoscope-MouseKeys.h" #include "Kaleidoscope-MouseKeys.h"
#include "Kaleidoscope-Macros.h" #include "Kaleidoscope-Macros.h"
#include "Kaleidoscope-LEDControl.h" #include "Kaleidoscope-LEDControl.h"
#include "Kaleidoscope-NumPad.h"
#include "Kaleidoscope-LEDEffect-BootGreeting.h" #include "Kaleidoscope-LEDEffect-BootGreeting.h"
#include "Kaleidoscope-LEDEffect-SolidColor.h" #include "Kaleidoscope-LEDEffect-SolidColor.h"
#include "Kaleidoscope-LEDEffect-Breathe.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 /** The Model 100's key layouts are defined as 'keymaps'.
* keymaps: The standard QWERTY keymap, the "Function layer" keymap and the "Numpad"
* keymap.
* *
* Each keymap is defined as a list using the 'KEYMAP_STACKED' macro, built * 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. * 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 * keeping NUM and FN consistent and accessible on all layers
* *
* A key defined as 'ShiftToLayer(FUNCTION)' will switch to FUNCTION while held. * 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 { enum {
PRIMARY, PRIMARY,
NUMPAD,
FUNCTION, FUNCTION,
}; };
@ -82,28 +78,13 @@ KEYMAPS(
Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift, Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
ShiftToLayer(FUNCTION), 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_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_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_RightAlt, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
Key_RightShift, Key_LeftAlt, Key_Spacebar, Key_RightControl, Key_RightShift, Key_LeftAlt, Key_Spacebar, Key_RightControl,
ShiftToLayer(FUNCTION)), 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 [FUNCTION] = KEYMAP_STACKED
(___, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, Key_CapsLock, (___, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, Key_CapsLock,
Key_Tab, ___, Key_mouseUp, ___, Key_mouseBtnR, Key_mouseWarpEnd, Key_mouseWarpNE, Key_Tab, ___, Key_mouseUp, ___, Key_mouseBtnR, Key_mouseWarpEnd, Key_mouseWarpNE,
@ -222,7 +203,6 @@ KALEIDOSCOPE_INIT_PLUGINS(
StalkerEffect, StalkerEffect,
LEDPaletteTheme, LEDPaletteTheme,
ColormapEffect, ColormapEffect,
NumPad,
Macros, Macros,
MouseKeys, MouseKeys,
HostPowerManagement, HostPowerManagement,
@ -231,7 +211,6 @@ KALEIDOSCOPE_INIT_PLUGINS(
void setup() { void setup() {
Kaleidoscope.setup(); Kaleidoscope.setup();
NumPad.numPadLayer = NUMPAD;
AlphaSquare.color = CRGB(255, 0, 0); AlphaSquare.color = CRGB(255, 0, 0);
LEDRainbowEffect.brightness(255); LEDRainbowEffect.brightness(255);
LEDRainbowWaveEffect.brightness(255); LEDRainbowWaveEffect.brightness(255);