diff options
| author | Jesse Vincent <jesse@keyboard.io> | 2017-10-02 18:43:21 -0700 |
|---|---|---|
| committer | Jesse Vincent <jesse@keyboard.io> | 2017-10-02 18:43:21 -0700 |
| commit | b0e1c32113733385f378710525225ac2c5f5401b (patch) | |
| tree | 19869814efcd6de99520cb56bfce08f4258f60b0 | |
| parent | 1257825f181bb53a93b37d57f2c4006f7625e6ec (diff) | |
| download | model01-firmware-b0e1c32113733385f378710525225ac2c5f5401b.tar.gz model01-firmware-b0e1c32113733385f378710525225ac2c5f5401b.tar.bz2 model01-firmware-b0e1c32113733385f378710525225ac2c5f5401b.zip | |
rename our keymaps to be more consistent.
I feel weird about putting the name before the word 'keymap', but this
seems less confusing than explaining why KEYMAP_QWERTY and
KEYMAP_STACKED are different kidns of entitites
| -rw-r--r-- | Model01-Firmware.ino | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino index 82277ba..424b225 100644 --- a/Model01-Firmware.ino +++ b/Model01-Firmware.ino @@ -31,7 +31,7 @@ #define Macro_Any M(MACRO_ANY) #define NUMPAD_KEYMAP 2 -#define GENERIC_FN2 KEYMAP_STACKED ( \ +#define FUNCTION_KEYMAP 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, \ @@ -49,7 +49,7 @@ ___ \ -#define NUMPAD KEYMAP_STACKED (\ +#define NUMPAD_KEYMAP KEYMAP_STACKED (\ ___, ___, ___, ___, ___, ___, ___, \ ___, ___, ___, ___, ___, ___, ___, \ ___, ___, ___, ___, ___, ___, \ @@ -66,7 +66,7 @@ ___ \ Key_Keymap1_Momentary \ ) -#define QWERTY KEYMAP_STACKED ( \ +#define QWERTY_KEYMAP KEYMAP_STACKED ( \ ___, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, \ Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, \ Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, \ @@ -83,9 +83,9 @@ ___ \ ) const Key keymaps[][ROWS][COLS] PROGMEM = { - QWERTY, - GENERIC_FN2, - NUMPAD + QWERTY_KEYMAP, + FUNCTION_KEYMAP, + NUMPAD_KEYMAP }; static kaleidoscope::LEDSolidColor solidRed(160, 0, 0); |