wxcafe/Model01-Firmware
1
0
Fork 0
Code Releases Activity

Merge pull request #14 from algernon/f/numlock-no-macro

Browse Source 
Updated to use the new NumLock plugin.
This commit is contained in:
Jesse Vincent 2017-10-02 15:35:41 -07:00 committed by GitHub
commit 1257825f18
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Model01-Firmware.ino
View File

@ -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) {