diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-07-03 16:15:23 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-07-03 16:15:23 -0700 |
| commit | d49e4543b3c55bc128d5f2857971e9d34b8fcba6 (patch) | |
| tree | bb61032255ffdc94fb709047e23c176408880838 /keyboards | |
| parent | a120bbc4de81206b1e7ff7879a9dfdc83b5c0387 (diff) | |
| download | qmk_firmware-d49e4543b3c55bc128d5f2857971e9d34b8fcba6.tar.gz qmk_firmware-d49e4543b3c55bc128d5f2857971e9d34b8fcba6.zip | |
Prime_R refactor and Configurator support (#3289)
* Matrix refactor: rename KEYMAP to LAYOUT
* Keymap refactor: QMK_KEYBOARD_H; new matrix names
* Configurator support
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/prime_r/info.json | 13 | ||||
| -rw-r--r-- | keyboards/prime_r/keymaps/default/keymap.c | 42 | ||||
| -rw-r--r-- | keyboards/prime_r/keymaps/rooski/keymap.c | 226 | ||||
| -rw-r--r-- | keyboards/prime_r/prime_r.h | 2 |
4 files changed, 149 insertions, 134 deletions
diff --git a/keyboards/prime_r/info.json b/keyboards/prime_r/info.json new file mode 100644 index 000000000..1899df9f3 --- /dev/null +++ b/keyboards/prime_r/info.json | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Prime_R", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 16, | ||
| 6 | "height": 5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "key_count": 75, | ||
| 10 | "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K012", "x":12, "y":0}, {"label":"K013", "x":13, "y":0}, {"label":"K014", "x":14, "y":0}, {"label":"K015", "x":15, "y":0}, {"label":"K100", "x":0, "y":1}, {"label":"K101", "x":1, "y":1}, {"label":"K102", "x":2, "y":1}, {"label":"K103", "x":3, "y":1}, {"label":"K104", "x":4, "y":1}, {"label":"K105", "x":5, "y":1}, {"label":"K106", "x":6, "y":1}, {"label":"K107", "x":7, "y":1}, {"label":"K108", "x":8, "y":1}, {"label":"K109", "x":9, "y":1}, {"label":"K110", "x":10, "y":1}, {"label":"K111", "x":11, "y":1}, {"label":"K112", "x":12, "y":1}, {"label":"K113", "x":13, "y":1}, {"label":"K114", "x":14, "y":1}, {"label":"K115", "x":15, "y":1}, {"label":"K200", "x":0, "y":2, "w":1.25}, {"label":"K201", "x":1.25, "y":2}, {"label":"K202", "x":2.25, "y":2}, {"label":"K203", "x":3.25, "y":2}, {"label":"K204", "x":4.25, "y":2}, {"label":"K205", "x":5.25, "y":2}, {"label":"K206", "x":6.25, "y":2}, {"label":"K207", "x":7.25, "y":2}, {"label":"K208", "x":8.25, "y":2}, {"label":"K209", "x":9.25, "y":2}, {"label":"K210", "x":10.25, "y":2}, {"label":"K212", "x":11.25, "y":2, "w":1.75}, {"label":"K213", "x":13, "y":2}, {"label":"K214", "x":14, "y":2}, {"label":"K215", "x":15, "y":2}, {"label":"K300", "x":0, "y":3, "w":1.75}, {"label":"K302", "x":1.75, "y":3}, {"label":"K303", "x":2.75, "y":3}, {"label":"K304", "x":3.75, "y":3}, {"label":"K305", "x":4.75, "y":3}, {"label":"K306", "x":5.75, "y":3}, {"label":"K307", "x":6.75, "y":3}, {"label":"K308", "x":7.75, "y":3}, {"label":"K309", "x":8.75, "y":3}, {"label":"K310", "x":9.75, "y":3}, {"label":"K311", "x":10.75, "y":3}, {"label":"K312", "x":11.75, "y":3, "w":1.25}, {"label":"K313", "x":13, "y":3}, {"label":"K314", "x":14, "y":3}, {"label":"K315", "x":15, "y":3}, {"label":"K400", "x":0, "y":4, "w":1.25}, {"label":"K402", "x":1.25, "y":4, "w":1.25}, {"label":"K403", "x":2.5, "y":4}, {"label":"K404", "x":3.5, "y":4}, {"label":"K405", "x":4.5, "y":4, "w":2}, {"label":"K407", "x":6.5, "y":4, "w":2.25}, {"label":"K409", "x":8.75, "y":4}, {"label":"K410", "x":9.75, "y":4}, {"label":"K411", "x":10.75, "y":4}, {"label":"K412", "x":11.75, "y":4, "w":1.25}, {"label":"K413", "x":13, "y":4}, {"label":"K414", "x":14, "y":4}, {"label":"K415", "x":15, "y":4}] | ||
| 11 | } | ||
| 12 | } | ||
| 13 | } | ||
diff --git a/keyboards/prime_r/keymaps/default/keymap.c b/keyboards/prime_r/keymaps/default/keymap.c index ff00dc657..a39d197e2 100644 --- a/keyboards/prime_r/keymaps/default/keymap.c +++ b/keyboards/prime_r/keymaps/default/keymap.c | |||
| @@ -17,9 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | // Prime_R Rev 1.0 | 18 | // Prime_R Rev 1.0 |
| 19 | 19 | ||
| 20 | #include "prime_r.h" | 20 | #include QMK_KEYBOARD_H |
| 21 | #include "action_layer.h" | ||
| 22 | #include "backlight.h" | ||
| 23 | 21 | ||
| 24 | // Fillers to make layering more clear | 22 | // Fillers to make layering more clear |
| 25 | #define _______ KC_TRNS | 23 | #define _______ KC_TRNS |
| @@ -40,29 +38,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 40 | * `---------------------------------------------------------------' | 38 | * `---------------------------------------------------------------' |
| 41 | */ | 39 | */ |
| 42 | // 0: Base Layer | 40 | // 0: Base Layer |
| 43 | KEYMAP( | 41 | [0] = LAYOUT( |
| 44 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PGUP, KC_BSPC, KC_PSCR, KC_PGUP, KC_PGDN, \ | 42 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PGUP, KC_BSPC, KC_PSCR, KC_PGUP, KC_PGDN, \ |
| 45 | KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PGDN, KC_DEL, KC_7, KC_8, KC_9, \ | 43 | KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PGDN, KC_DEL, KC_7, KC_8, KC_9, \ |
| 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_DQUO, KC_ENT, KC_4, KC_5, KC_6, \ | 44 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_DQUO, KC_ENT, KC_4, KC_5, KC_6, \ |
| 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_LABK, KC_RABK, KC_QUES, KC_LSFT, KC_1, KC_2, KC_3, \ | 45 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_LABK, KC_RABK, KC_QUES, KC_LSFT, KC_1, KC_2, KC_3, \ |
| 48 | KC_LCTL, KC_LGUI, KC_APP, KC_LALT, MO(0), KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL, KC_0, KC_DOT, KC_ENT), \ | 46 | KC_LCTL, KC_LGUI, KC_APP, KC_LALT, MO(0), KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL, KC_0, KC_DOT, KC_ENT \ |
| 47 | ), | ||
| 49 | 48 | ||
| 50 | // 1: Function Layer | 49 | // 1: Function Layer |
| 51 | KEYMAP( | 50 | [1] = LAYOUT( |
| 52 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 51 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 53 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 52 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 54 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 53 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 54 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 56 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), | 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 56 | ), | ||
| 57 | 57 | ||
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | 60 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { |
| 61 | 61 | ||
| 62 | switch (id) { | 62 | switch (id) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | return MACRO_NONE; | 65 | return MACRO_NONE; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void matrix_init_user(void) { | 68 | void matrix_init_user(void) { |
| @@ -72,5 +72,5 @@ void matrix_scan_user(void) { | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 74 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 75 | return true; | 75 | return true; |
| 76 | } \ No newline at end of file | 76 | } |
diff --git a/keyboards/prime_r/keymaps/rooski/keymap.c b/keyboards/prime_r/keymaps/rooski/keymap.c index 091dcce24..3fadc6c6b 100644 --- a/keyboards/prime_r/keymaps/rooski/keymap.c +++ b/keyboards/prime_r/keymaps/rooski/keymap.c | |||
| @@ -16,9 +16,7 @@ | |||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */// Prime_R Rev 1.0 | 17 | */// Prime_R Rev 1.0 |
| 18 | 18 | ||
| 19 | #include "prime_r.h" | 19 | #include QMK_KEYBOARD_H |
| 20 | #include "action_layer.h" | ||
| 21 | #include "backlight.h" | ||
| 22 | 20 | ||
| 23 | // Fillers to make layering more clear | 21 | // Fillers to make layering more clear |
| 24 | #define _______ KC_TRNS | 22 | #define _______ KC_TRNS |
| @@ -29,13 +27,13 @@ static bool arrow_toggle = false; | |||
| 29 | 27 | ||
| 30 | //Arrow Keys | 28 | //Arrow Keys |
| 31 | enum custom_keycodes{ | 29 | enum custom_keycodes{ |
| 32 | AR_TOG = SAFE_RANGE, //Toggle Arrow Keys | 30 | AR_TOG = SAFE_RANGE, //Toggle Arrow Keys |
| 33 | AR_LT, //Num0 or Left Arrow | 31 | AR_LT, //Num0 or Left Arrow |
| 34 | AR_RT, //NumEnt or Right Arrow | 32 | AR_RT, //NumEnt or Right Arrow |
| 35 | AR_DN, //NumDot or Down Arrow | 33 | AR_DN, //NumDot or Down Arrow |
| 36 | AR_UP, //Num2 or Up Arrow | 34 | AR_UP, //Num2 or Up Arrow |
| 37 | }; | 35 | }; |
| 38 | 36 | ||
| 39 | // Tap/Hold Space Layer | 37 | // Tap/Hold Space Layer |
| 40 | #define SPC_LT LT(1, KC_SPC) | 38 | #define SPC_LT LT(1, KC_SPC) |
| 41 | 39 | ||
| @@ -54,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 54 | * `---------------------------------------------------------------' | 52 | * `---------------------------------------------------------------' |
| 55 | */ | 53 | */ |
| 56 | // 0: Base Layer | 54 | // 0: Base Layer |
| 57 | KEYMAP( | 55 | [0] = LAYOUT( |
| 58 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, KC_DEL, KC_HOME, KC_END, \ | 56 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, KC_DEL, KC_HOME, KC_END, \ |
| 59 | KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, \ | 57 | KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, \ |
| 60 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_P4, KC_P5, KC_P6, \ | 58 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_P4, KC_P5, KC_P6, \ |
| 61 | KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_P1, AR_UP, KC_P3, \ | 59 | KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_P1, AR_UP, KC_P3, \ |
| 62 | KC_LCTL, KC_LGUI, KC_LALT, TO(1), SPC_LT, SPC_LT, AR_TOG, KC_APP, KC_RALT, KC_RCTL, AR_LT, AR_DN, AR_RT), \ | 60 | KC_LCTL, KC_LGUI, KC_LALT, TO(1), SPC_LT, SPC_LT, AR_TOG, KC_APP, KC_RALT, KC_RCTL, AR_LT, AR_DN, AR_RT \ |
| 61 | ), | ||
| 63 | 62 | ||
| 64 | /* (Function Layer) | 63 | /* (Function Layer) |
| 65 | * ,---------------------------------------------------------------. | 64 | * ,---------------------------------------------------------------. |
| @@ -73,14 +72,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 73 | * |---------------------------------------------------------------| | 72 | * |---------------------------------------------------------------| |
| 74 | * |Ctrl|Gui |Alt|TO0| 1/SP | 1/SP |ART|TO2|Alt|Ctrl |MUT|VDN|STP| | 73 | * |Ctrl|Gui |Alt|TO0| 1/SP | 1/SP |ART|TO2|Alt|Ctrl |MUT|VDN|STP| |
| 75 | * `---------------------------------------------------------------' | 74 | * `---------------------------------------------------------------' |
| 76 | */ | 75 | */ |
| 77 | // 1: Function Layer | 76 | // 1: Function Layer |
| 78 | KEYMAP( | 77 | [1] = LAYOUT( |
| 79 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQL, _______, KC_PSLS, KC_PAST, KC_PPLS, | 78 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQL, _______, KC_PSLS, KC_PAST, KC_PPLS, |
| 80 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______, _______, | 79 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______, _______, |
| 81 | BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, _______, _______, _______, _______, | 80 | BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, _______, _______, _______, _______, |
| 82 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, | 81 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, |
| 83 | _______, _______, _______, TO(0), _______, _______, _______, TO(2), _______, _______, KC_MUTE, KC_VOLD, KC_MSTP), | 82 | _______, _______, _______, TO(0), _______, _______, _______, TO(2), _______, _______, KC_MUTE, KC_VOLD, KC_MSTP |
| 83 | ), | ||
| 84 | 84 | ||
| 85 | /* (Numpad Mods) | 85 | /* (Numpad Mods) |
| 86 | * ,---------------------------------------------------------------. | 86 | * ,---------------------------------------------------------------. |
| @@ -96,104 +96,106 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 96 | * `---------------------------------------------------------------' | 96 | * `---------------------------------------------------------------' |
| 97 | */ | 97 | */ |
| 98 | // 2: Numpad Mods | 98 | // 2: Numpad Mods |
| 99 | KEYMAP( | 99 | [2] = LAYOUT( |
| 100 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, _______, KC_PSLS, KC_PAST, KC_PPLS, | 100 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, _______, KC_PSLS, KC_PAST, KC_PPLS, |
| 101 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RBRC, _______, _______, _______, | 101 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RBRC, _______, _______, _______, |
| 102 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, _______, _______, _______, _______, | 102 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, _______, _______, _______, _______, |
| 103 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AR_UP, _______, | 103 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AR_UP, _______, |
| 104 | _______, _______, _______, TO(0), _______, _______, _______, KC_APP, _______, _______, AR_LT, AR_DN, AR_RT ), | 104 | _______, _______, _______, TO(0), _______, _______, _______, KC_APP, _______, _______, AR_LT, AR_DN, AR_RT |
| 105 | 105 | ), | |
| 106 | |||
| 106 | // 3: Extra | 107 | // 3: Extra |
| 107 | KEYMAP( | 108 | [3] = LAYOUT( |
| 108 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 109 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 109 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 110 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 110 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 111 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 111 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 112 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 112 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), | 113 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 114 | ), | ||
| 113 | 115 | ||
| 114 | }; | 116 | }; |
| 115 | 117 | ||
| 116 | void matrix_init_user(void) { | 118 | void matrix_init_user(void) { |
| 117 | if (get_backlight_level() != 0){ | 119 | if (get_backlight_level() != 0){ |
| 118 | backlight_toggle(); | 120 | backlight_toggle(); |
| 119 | } | 121 | } |
| 120 | }; | 122 | }; |
| 121 | 123 | ||
| 122 | void matrix_scan_user(void) { | 124 | void matrix_scan_user(void) { |
| 123 | }; | 125 | }; |
| 124 | 126 | ||
| 125 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 127 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 126 | if(record->event.pressed){ | 128 | if(record->event.pressed){ |
| 127 | switch(keycode) { | 129 | switch(keycode) { |
| 128 | case AR_TOG: | 130 | case AR_TOG: |
| 129 | arrow_toggle = !arrow_toggle; | 131 | arrow_toggle = !arrow_toggle; |
| 130 | backlight_toggle(); | 132 | backlight_toggle(); |
| 131 | return false; break; | 133 | return false; break; |
| 132 | 134 | ||
| 133 | case AR_UP: | 135 | case AR_UP: |
| 134 | if(arrow_toggle == 1){ | 136 | if(arrow_toggle == 1){ |
| 135 | SEND_STRING(SS_DOWN(X_UP)); | 137 | SEND_STRING(SS_DOWN(X_UP)); |
| 136 | } else { | 138 | } else { |
| 137 | SEND_STRING(SS_DOWN(X_KP_2)); | 139 | SEND_STRING(SS_DOWN(X_KP_2)); |
| 138 | } | 140 | } |
| 139 | return false; break; | 141 | return false; break; |
| 140 | 142 | ||
| 141 | case AR_DN: | 143 | case AR_DN: |
| 142 | if(arrow_toggle == 1){ | 144 | if(arrow_toggle == 1){ |
| 143 | SEND_STRING(SS_DOWN(X_DOWN)); | 145 | SEND_STRING(SS_DOWN(X_DOWN)); |
| 144 | } else { | 146 | } else { |
| 145 | SEND_STRING(SS_DOWN(X_KP_DOT)); | 147 | SEND_STRING(SS_DOWN(X_KP_DOT)); |
| 146 | } | 148 | } |
| 147 | return false; break; | 149 | return false; break; |
| 148 | 150 | ||
| 149 | case AR_LT: | 151 | case AR_LT: |
| 150 | if(arrow_toggle == 1){ | 152 | if(arrow_toggle == 1){ |
| 151 | SEND_STRING(SS_DOWN(X_LEFT)); | 153 | SEND_STRING(SS_DOWN(X_LEFT)); |
| 152 | } else { | 154 | } else { |
| 153 | SEND_STRING(SS_DOWN(X_KP_0)); | 155 | SEND_STRING(SS_DOWN(X_KP_0)); |
| 154 | } | 156 | } |
| 155 | return false; break; | 157 | return false; break; |
| 156 | 158 | ||
| 157 | case AR_RT: | 159 | case AR_RT: |
| 158 | if(arrow_toggle == 1){ | 160 | if(arrow_toggle == 1){ |
| 159 | SEND_STRING(SS_DOWN(X_RIGHT)); | 161 | SEND_STRING(SS_DOWN(X_RIGHT)); |
| 160 | } else { | 162 | } else { |
| 161 | SEND_STRING(SS_DOWN(X_KP_ENTER)); | 163 | SEND_STRING(SS_DOWN(X_KP_ENTER)); |
| 162 | } | 164 | } |
| 163 | return false; break; | 165 | return false; break; |
| 164 | } | 166 | } |
| 165 | } | 167 | } |
| 166 | if(!record->event.pressed){ | 168 | if(!record->event.pressed){ |
| 167 | switch(keycode) { | 169 | switch(keycode) { |
| 168 | case AR_UP: | 170 | case AR_UP: |
| 169 | if(arrow_toggle == 1){ | 171 | if(arrow_toggle == 1){ |
| 170 | SEND_STRING(SS_UP(X_UP)); | 172 | SEND_STRING(SS_UP(X_UP)); |
| 171 | } else { | 173 | } else { |
| 172 | SEND_STRING(SS_UP(X_KP_2)); | 174 | SEND_STRING(SS_UP(X_KP_2)); |
| 173 | } | 175 | } |
| 174 | return false; break; | 176 | return false; break; |
| 175 | case AR_DN: | 177 | case AR_DN: |
| 176 | if(arrow_toggle == 1){ | 178 | if(arrow_toggle == 1){ |
| 177 | SEND_STRING(SS_UP(X_DOWN)); | 179 | SEND_STRING(SS_UP(X_DOWN)); |
| 178 | } else { | 180 | } else { |
| 179 | SEND_STRING(SS_UP(X_KP_DOT)); | 181 | SEND_STRING(SS_UP(X_KP_DOT)); |
| 180 | } | 182 | } |
| 181 | return false; break; | 183 | return false; break; |
| 182 | case AR_LT: | 184 | case AR_LT: |
| 183 | if(arrow_toggle == 1){ | 185 | if(arrow_toggle == 1){ |
| 184 | SEND_STRING(SS_UP(X_LEFT)); | 186 | SEND_STRING(SS_UP(X_LEFT)); |
| 185 | } else { | 187 | } else { |
| 186 | SEND_STRING(SS_UP(X_KP_0)); | 188 | SEND_STRING(SS_UP(X_KP_0)); |
| 187 | } | 189 | } |
| 188 | return false; break; | 190 | return false; break; |
| 189 | case AR_RT: | 191 | case AR_RT: |
| 190 | if(arrow_toggle == 1){ | 192 | if(arrow_toggle == 1){ |
| 191 | SEND_STRING(SS_UP(X_RIGHT)); | 193 | SEND_STRING(SS_UP(X_RIGHT)); |
| 192 | } else { | 194 | } else { |
| 193 | SEND_STRING(SS_UP(X_KP_ENTER)); | 195 | SEND_STRING(SS_UP(X_KP_ENTER)); |
| 194 | } | 196 | } |
| 195 | return false; break; | 197 | return false; break; |
| 196 | } | 198 | } |
| 197 | } | 199 | } |
| 198 | return true; | 200 | return true; |
| 199 | }; \ No newline at end of file | 201 | }; |
diff --git a/keyboards/prime_r/prime_r.h b/keyboards/prime_r/prime_r.h index f98b5e87b..8295fc336 100644 --- a/keyboards/prime_r/prime_r.h +++ b/keyboards/prime_r/prime_r.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include "quantum.h" | 19 | #include "quantum.h" |
| 20 | 20 | ||
| 21 | #define KEYMAP( \ | 21 | #define LAYOUT( \ |
| 22 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ | 22 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ |
| 23 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ | 23 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ |
| 24 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K212, K213, K214, K215, \ | 24 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K212, K213, K214, K215, \ |
