diff options
author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-07-04 17:59:35 -0700 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-07-04 17:59:35 -0700 |
commit | 3204dec09636f94275707368fb1ba37632c82042 (patch) | |
tree | d1c3cc121de2bf844654c6d28fa5eececec9de95 /keyboards/roadkit/keymaps/mjt | |
parent | d5def73f6eccc3727d7aa192b9204322af2933ba (diff) | |
download | firmware-3204dec09636f94275707368fb1ba37632c82042.tar.gz firmware-3204dec09636f94275707368fb1ba37632c82042.tar.bz2 firmware-3204dec09636f94275707368fb1ba37632c82042.zip |
Roadkit refactor and Configurator support (#3303)
* Matrix refactor: rename KEYMAP to LAYOUT_numpad_4x4
* Keymap refactor: QMK_KEYBOARD_H, matrix renames, readability
* Configurator support
* Add numpad_4x4 LAYOUT to rules.mk
Diffstat (limited to 'keyboards/roadkit/keymaps/mjt')
-rw-r--r-- | keyboards/roadkit/keymaps/mjt/keymap.c | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/keyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/roadkit/keymaps/mjt/keymap.c index d3c82ac84..a1af5b1f2 100644 --- a/keyboards/roadkit/keymaps/mjt/keymap.c +++ b/keyboards/roadkit/keymaps/mjt/keymap.c @@ -1,6 +1,4 @@ -#include "roadkit.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; @@ -46,31 +44,36 @@ enum minivan_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_NUMPAD] = /* Numpad */ - KEYMAP(KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, \ - KC_KP_4, KC_KP_5, KC_KP_6, \ - KC_KP_1, KC_KP_2, KC_KP_3, NAVIGATION, \ - EXCEL, KC_KP_DOT), - [_EXCEL] = /* Excel related */ - KEYMAP(KC_KP_SLASH, KC_KP_ASTERISK, KC_MINS, KC_TAB, \ - KC_QUOT, KC_KP_EQUAL, PARENS , \ - KC_DQT, BRACKETS, BRACES, _______, \ - _______, MO(_DYN)), - [_NAVIGATION] = /* Navigation */ - KEYMAP(KC_HOME, _______, KC_PGUP, KC_TAB, \ - KC_END, KC_UP, KC_PGDN, \ - KC_LEFT, KC_DOWN, KC_RIGHT, _______, \ - _______, MO(_DYN)), - [_ADJUST] = /* Adjustments */ - KEYMAP(KC_NUMLOCK, MACSLEEP, BACKLIT, _______, \ - KC_BSPC, _______, KC_DEL, \ - EXCEL_LOCK, NUMPAD_LOCK, NAVIGATION_LOCK, _______, \ - _______, _______), - [_DYN] = /* DYNAMIC MACRO */ - KEYMAP(DYN_REC_START1, DYN_REC_START2, _______, _______, \ - _______, _______, _______, \ - DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, _______, \ - _______, _______), + [_NUMPAD] = LAYOUT_numpad_4x4( /* Numpad */ + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, \ + KC_KP_4, KC_KP_5, KC_KP_6, \ + KC_KP_1, KC_KP_2, KC_KP_3, NAVIGATION, \ + EXCEL, KC_KP_DOT + ), + [_EXCEL] = LAYOUT_numpad_4x4( /* Excel related */ + KC_KP_SLASH, KC_KP_ASTERISK, KC_MINS, KC_TAB, \ + KC_QUOT, KC_KP_EQUAL, PARENS, \ + KC_DQT, BRACKETS, BRACES, _______, \ + _______, MO(_DYN) + ), + [_NAVIGATION] = LAYOUT_numpad_4x4( /* Navigation */ + KC_HOME, _______, KC_PGUP, KC_TAB, \ + KC_END, KC_UP, KC_PGDN, \ + KC_LEFT, KC_DOWN, KC_RIGHT, _______, \ + _______, MO(_DYN) + ), + [_ADJUST] = LAYOUT_numpad_4x4( /* Adjustments */ + KC_NUMLOCK, MACSLEEP, BACKLIT, _______, \ + KC_BSPC, _______, KC_DEL, \ + EXCEL_LOCK, NUMPAD_LOCK, NAVIGATION_LOCK, _______, \ + _______, _______ + ), + [_DYN] = LAYOUT_numpad_4x4( /* DYNAMIC MACRO */ + DYN_REC_START1, DYN_REC_START2, _______, _______, \ + _______, _______, _______, \ + DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, _______, \ + _______, _______ + ), }; const uint16_t PROGMEM fn_actions[] = { |