aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Vincent <jesse@fsck.com>2017-10-02 15:35:41 -0700
committerGitHub <noreply@github.com>2017-10-02 15:35:41 -0700
commit1257825f181bb53a93b37d57f2c4006f7625e6ec (patch)
tree30019c026154c74c95eebbe86cf53e923eee8939
parent36796237bb655620ba2d265ef1a038991d0d9fa0 (diff)
parent2a13e4a9c91b24b8108e05c49f8da5c3575aa9a0 (diff)
downloadModel01-Firmware-1257825f181bb53a93b37d57f2c4006f7625e6ec.tar.gz
Model01-Firmware-1257825f181bb53a93b37d57f2c4006f7625e6ec.zip
Merge pull request #14 from algernon/f/numlock-no-macro
Updated to use the new NumLock plugin.
-rw-r--r--Model01-Firmware.ino6
1 files changed, 2 insertions, 4 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 9097284..82277ba 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -74,7 +74,7 @@ ___ \
Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift, \
Key_Keymap1_Momentary, \
\
- Macro_Any, Key_6, Key_7, Key_8, Key_9, Key_0, Key_ToggleNumlock, \
+ Macro_Any, Key_6, Key_7, Key_8, Key_9, Key_0, Key_KeypadNumLock, \
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, \
@@ -97,9 +97,7 @@ static kaleidoscope::LEDSolidColor solidIndigo(0, 0, 170);
static kaleidoscope::LEDSolidColor solidViolet(130, 0, 120);
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
- if (macroIndex == TOGGLENUMLOCK && keyToggledOn(keyState)) {
- return NumLock.toggle();
- } else if (macroIndex == 1 && keyToggledOn(keyState)) {
+ if (macroIndex == 1 && keyToggledOn(keyState)) {
Macros.type(PSTR("Keyboardio Model 01 - Kaleidoscope "));
Macros.type(PSTR(BUILD_INFORMATION));
} else if (macroIndex == MACRO_ANY) {