diff options
| -rw-r--r-- | Model01-Firmware.ino | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino index f01cdd3..0642915 100644 --- a/Model01-Firmware.ino +++ b/Model01-Firmware.ino @@ -115,9 +115,10 @@ enum { MACRO_VERSION_INFO, * The third one is layer 2. * This 'enum' lets us use names like QWERTY, FUNCTION, and NUMPAD in place of * the numbers 0, 1 and 2. + * */ -enum { QWERTY, FUNCTION, NUMPAD }; // layers +enum { QWERTY, NUMPAD, FUNCTION }; // layers /* This comment temporarily turns off astyle's indent enforcement * so we can make the keymaps actually resemble the physical key layout better @@ -141,21 +142,6 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_LeftAlt, Key_Spacebar, Key_RightControl, ShiftToLayer(FUNCTION)), - [FUNCTION] = KEYMAP_STACKED - (___, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, XXX, - Key_Tab, ___, Key_mouseUp, ___, Key_mouseBtnR, Key_mouseWarpEnd, Key_mouseWarpNE, - Key_Home, Key_mouseL, Key_mouseDn, Key_mouseR, Key_mouseBtnL, Key_mouseWarpNW, - Key_End, Key_PrintScreen, Key_Insert, ___, Key_mouseBtnM, Key_mouseWarpSW, Key_mouseWarpSE, - ___, Key_Delete, ___, ___, - ___, - - Consumer_ScanPreviousTrack, Key_F6, Key_F7, Key_F8, Key_F9, Key_F10, Key_F11, - Consumer_PlaySlashPause, Consumer_ScanNextTrack, Key_LeftCurlyBracket, Key_RightCurlyBracket, Key_LeftBracket, Key_RightBracket, Key_F12, - Key_LeftArrow, Key_DownArrow, Key_UpArrow, Key_RightArrow, ___, ___, - Key_PcApplication, Key_Mute, Consumer_VolumeDecrement, Consumer_VolumeIncrement, ___, Key_Backslash, Key_Pipe, - ___, ___, Key_Enter, ___, - ___), - [NUMPAD] = KEYMAP_STACKED (___, ___, ___, ___, ___, ___, ___, @@ -170,7 +156,23 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { ___, Key_Keypad1, Key_Keypad2, Key_Keypad3, Key_Equals, Key_Quote, ___, ___, Key_Keypad0, Key_KeypadDot, Key_KeypadMultiply, Key_KeypadDivide, Key_Enter, ___, ___, ___, ___, + ___), + + [FUNCTION] = KEYMAP_STACKED + (___, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, XXX, + Key_Tab, ___, Key_mouseUp, ___, Key_mouseBtnR, Key_mouseWarpEnd, Key_mouseWarpNE, + Key_Home, Key_mouseL, Key_mouseDn, Key_mouseR, Key_mouseBtnL, Key_mouseWarpNW, + Key_End, Key_PrintScreen, Key_Insert, ___, Key_mouseBtnM, Key_mouseWarpSW, Key_mouseWarpSE, + ___, Key_Delete, ___, ___, + ___, + + Consumer_ScanPreviousTrack, Key_F6, Key_F7, Key_F8, Key_F9, Key_F10, Key_F11, + Consumer_PlaySlashPause, Consumer_ScanNextTrack, Key_LeftCurlyBracket, Key_RightCurlyBracket, Key_LeftBracket, Key_RightBracket, Key_F12, + Key_LeftArrow, Key_DownArrow, Key_UpArrow, Key_RightArrow, ___, ___, + Key_PcApplication, Key_Mute, Consumer_VolumeDecrement, Consumer_VolumeIncrement, ___, Key_Backslash, Key_Pipe, + ___, ___, Key_Enter, ___, ___) + }; /* Re-enable astyle's indent enforcement */ |