diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-05-14 06:57:01 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-05-14 10:21:12 -0400 |
| commit | 34b274360c3be6cc0f080a81b60b36396ff3facd (patch) | |
| tree | 6f271381aa50f6d1e5f7626bc39c89b2db7d3550 /keyboards/orthodox | |
| parent | 5941f81e38b7f1b1ab485f7b142ba6ed00df5ead (diff) | |
| download | qmk_firmware-34b274360c3be6cc0f080a81b60b36396ff3facd.tar.gz qmk_firmware-34b274360c3be6cc0f080a81b60b36396ff3facd.zip | |
Orthodox info.json changes
Diffstat (limited to 'keyboards/orthodox')
| -rw-r--r-- | keyboards/orthodox/keymaps/default/config.h | 11 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/default/keymap.c | 81 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/oscillope/keymap.c | 13 | ||||
| -rw-r--r-- | keyboards/orthodox/orthodox.h | 2 | ||||
| -rw-r--r-- | keyboards/orthodox/rev1/info.json | 12 | ||||
| -rw-r--r-- | keyboards/orthodox/rev1/rev1.h | 2 | ||||
| -rw-r--r-- | keyboards/orthodox/rev3/info.json | 12 | ||||
| -rw-r--r-- | keyboards/orthodox/rev3/rev3.h | 2 | ||||
| -rw-r--r-- | keyboards/orthodox/rev3_teensy/info.json | 12 | ||||
| -rw-r--r-- | keyboards/orthodox/rev3_teensy/rev3_teensy.h | 2 |
10 files changed, 54 insertions, 95 deletions
diff --git a/keyboards/orthodox/keymaps/default/config.h b/keyboards/orthodox/keymaps/default/config.h index 9e685054b..3df957b84 100644 --- a/keyboards/orthodox/keymaps/default/config.h +++ b/keyboards/orthodox/keymaps/default/config.h | |||
| @@ -35,4 +35,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 35 | // #define MASTER_RIGHT | 35 | // #define MASTER_RIGHT |
| 36 | #define EE_HANDS | 36 | #define EE_HANDS |
| 37 | 37 | ||
| 38 | #ifdef AUDIO_ENABLE | ||
| 39 | #define STARTUP_SONG SONG(PLANCK_SOUND) | ||
| 40 | // #define STARTUP_SONG SONG(NO_SOUND) | ||
| 41 | |||
| 42 | #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ | ||
| 43 | SONG(COLEMAK_SOUND), \ | ||
| 44 | SONG(DVORAK_SOUND) \ | ||
| 45 | } | ||
| 46 | #endif | ||
| 47 | |||
| 48 | |||
| 38 | #endif | 49 | #endif |
diff --git a/keyboards/orthodox/keymaps/default/keymap.c b/keyboards/orthodox/keymaps/default/keymap.c index 79077cdfb..5e7791674 100644 --- a/keyboards/orthodox/keymaps/default/keymap.c +++ b/keyboards/orthodox/keymaps/default/keymap.c | |||
| @@ -19,11 +19,7 @@ You should have received a copy of the GNU General Public License | |||
| 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "orthodox.h" | 22 | #include QMK_KEYBOARD_H |
| 23 | #include "action_layer.h" | ||
| 24 | #include "eeconfig.h" | ||
| 25 | |||
| 26 | extern keymap_config_t keymap_config; | ||
| 27 | 23 | ||
| 28 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 24 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 29 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 25 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| @@ -40,8 +36,6 @@ enum custom_keycodes { | |||
| 40 | QWERTY = SAFE_RANGE, | 36 | QWERTY = SAFE_RANGE, |
| 41 | COLEMAK, | 37 | COLEMAK, |
| 42 | DVORAK, | 38 | DVORAK, |
| 43 | LOWER, | ||
| 44 | RAISE, | ||
| 45 | ADJUST, | 39 | ADJUST, |
| 46 | }; | 40 | }; |
| 47 | 41 | ||
| @@ -50,116 +44,73 @@ enum custom_keycodes { | |||
| 50 | #define XXXXXXX KC_NO | 44 | #define XXXXXXX KC_NO |
| 51 | 45 | ||
| 52 | #define LS__SPC MT(MOD_LSFT, KC_SPC) | 46 | #define LS__SPC MT(MOD_LSFT, KC_SPC) |
| 47 | #define LOWER MO(_LOWER) | ||
| 48 | #define RAISE MO(_RAISE) | ||
| 53 | 49 | ||
| 54 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 50 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 55 | 51 | ||
| 56 | [_QWERTY] = KEYMAP( \ | 52 | [_QWERTY] = LAYOUT( \ |
| 57 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 53 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 58 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 54 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 59 | KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ | 55 | KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ |
| 60 | ), | 56 | ), |
| 61 | 57 | ||
| 62 | [_COLEMAK] = KEYMAP(\ | 58 | [_COLEMAK] = LAYOUT(\ |
| 63 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ | 59 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ |
| 64 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ | 60 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
| 65 | KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_LGUI \ | 61 | KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_LGUI \ |
| 66 | ), | 62 | ), |
| 67 | 63 | ||
| 68 | [_DVORAK] = KEYMAP(\ | 64 | [_DVORAK] = LAYOUT(\ |
| 69 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | 65 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
| 70 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ | 66 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ |
| 71 | KC_LCTL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LGUI \ | 67 | KC_LCTL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LGUI \ |
| 72 | ), | 68 | ), |
| 73 | 69 | ||
| 74 | [_LOWER] = KEYMAP( \ | 70 | [_LOWER] = LAYOUT( \ |
| 75 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 71 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 76 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCTL, _______, _______, KC_RCTL, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 72 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCTL, _______, _______, KC_RCTL, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| 77 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, KC_F12, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \ | 73 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, KC_F12, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \ |
| 78 | ), | 74 | ), |
| 79 | 75 | ||
| 80 | [_RAISE] = KEYMAP( \ | 76 | [_RAISE] = LAYOUT( \ |
| 81 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 77 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 82 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 78 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 83 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, KC_F12, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ \ | 79 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, KC_F12, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ \ |
| 84 | ), | 80 | ), |
| 85 | 81 | ||
| 86 | [_ADJUST] = KEYMAP( \ | 82 | [_ADJUST] = LAYOUT( \ |
| 87 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ | 83 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ |
| 88 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY , COLEMAK, DVORAK, _______, _______, \ | 84 | _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY , COLEMAK, DVORAK, _______, _______, \ |
| 89 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | 85 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY \ |
| 90 | ) | 86 | ) |
| 91 | 87 | ||
| 92 | 88 | ||
| 93 | }; | 89 | }; |
| 94 | 90 | ||
| 95 | #ifdef AUDIO_ENABLE | 91 | uint32_t layer_state_set_user(uint32_t state) { |
| 96 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 92 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 97 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | ||
| 98 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | ||
| 99 | #endif | ||
| 100 | |||
| 101 | void persistent_default_layer_set(uint16_t default_layer) { | ||
| 102 | eeconfig_update_default_layer(default_layer); | ||
| 103 | default_layer_set(default_layer); | ||
| 104 | } | 93 | } |
| 105 | 94 | ||
| 106 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 95 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 107 | switch (keycode) { | 96 | switch (keycode) { |
| 108 | case QWERTY: | 97 | case QWERTY: |
| 109 | if (record->event.pressed) { | 98 | if (record->event.pressed) { |
| 110 | #ifdef AUDIO_ENABLE | 99 | set_single_persistent_default_layer(_QWERTY); |
| 111 | PLAY_SONG(tone_qwerty); | ||
| 112 | #endif | ||
| 113 | persistent_default_layer_set(1UL<<_QWERTY); | ||
| 114 | } | 100 | } |
| 115 | return false; | 101 | return false; |
| 116 | break; | 102 | break; |
| 117 | case COLEMAK: | 103 | case COLEMAK: |
| 118 | if (record->event.pressed) { | 104 | if (record->event.pressed) { |
| 119 | #ifdef AUDIO_ENABLE | 105 | set_single_persistent_default_layer(_COLEMAK); |
| 120 | PLAY_SONG(tone_colemak); | ||
| 121 | #endif | ||
| 122 | persistent_default_layer_set(1UL<<_COLEMAK); | ||
| 123 | } | 106 | } |
| 124 | return false; | 107 | return false; |
| 125 | break; | 108 | break; |
| 126 | case DVORAK: | 109 | case DVORAK: |
| 127 | if (record->event.pressed) { | 110 | if (record->event.pressed) { |
| 128 | #ifdef AUDIO_ENABLE | 111 | set_single_persistent_default_layer(_DVORAK); |
| 129 | PLAY_SONG(tone_dvorak); | ||
| 130 | #endif | ||
| 131 | persistent_default_layer_set(1UL<<_DVORAK); | ||
| 132 | } | ||
| 133 | return false; | ||
| 134 | break; | ||
| 135 | case LOWER: | ||
| 136 | if (record->event.pressed) { | ||
| 137 | layer_on(_LOWER); | ||
| 138 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 139 | } else { | ||
| 140 | layer_off(_LOWER); | ||
| 141 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 142 | } | ||
| 143 | return false; | ||
| 144 | break; | ||
| 145 | case RAISE: | ||
| 146 | if (record->event.pressed) { | ||
| 147 | layer_on(_RAISE); | ||
| 148 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 149 | } else { | ||
| 150 | layer_off(_RAISE); | ||
| 151 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 152 | } | ||
| 153 | return false; | ||
| 154 | break; | ||
| 155 | case ADJUST: | ||
| 156 | if (record->event.pressed) { | ||
| 157 | layer_on(_ADJUST); | ||
| 158 | } else { | ||
| 159 | layer_off(_ADJUST); | ||
| 160 | } | 112 | } |
| 161 | return false; | 113 | return false; |
| 162 | break; | 114 | break; |
| 163 | } | ||
| 164 | return true; | 115 | return true; |
| 165 | } | 116 | } |
diff --git a/keyboards/orthodox/keymaps/oscillope/keymap.c b/keyboards/orthodox/keymaps/oscillope/keymap.c index 28fea02c4..ad07b3ed4 100644 --- a/keyboards/orthodox/keymaps/oscillope/keymap.c +++ b/keyboards/orthodox/keymaps/oscillope/keymap.c | |||
| @@ -19,11 +19,8 @@ You should have received a copy of the GNU General Public License | |||
| 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "orthodox.h" | 22 | #include QMK_KEYBOARD_H |
| 23 | #include "action_layer.h" | ||
| 24 | #include "eeconfig.h" | ||
| 25 | 23 | ||
| 26 | extern keymap_config_t keymap_config; | ||
| 27 | 24 | ||
| 28 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 25 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 29 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 26 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| @@ -53,25 +50,25 @@ enum custom_keycodes { | |||
| 53 | 50 | ||
| 54 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 51 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 55 | 52 | ||
| 56 | [_QWERTY] = KEYMAP( \ | 53 | [_QWERTY] = LAYOUT( \ |
| 57 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ | 54 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ |
| 58 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, TT(_RAISE), TT(_LOWER), TT(_LOWER), TT(_RAISE), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ | 55 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, TT(_RAISE), TT(_LOWER), TT(_LOWER), TT(_RAISE), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ |
| 59 | KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_TAP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT \ | 56 | KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_TAP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT \ |
| 60 | ), | 57 | ), |
| 61 | 58 | ||
| 62 | [_LOWER] = KEYMAP( \ | 59 | [_LOWER] = LAYOUT( \ |
| 63 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ | 60 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
| 64 | KC_INS, _______, _______, CC_PRN, CC_BRC, CC_CBR, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, \ | 61 | KC_INS, _______, _______, CC_PRN, CC_BRC, CC_CBR, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, \ |
| 65 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \ | 62 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \ |
| 66 | ), | 63 | ), |
| 67 | 64 | ||
| 68 | [_RAISE] = KEYMAP( \ | 65 | [_RAISE] = LAYOUT( \ |
| 69 | KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN, KC_7, KC_8, KC_9, KC_EQL, _______, _______, \ | 66 | KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN, KC_7, KC_8, KC_9, KC_EQL, _______, _______, \ |
| 70 | _______, KC_DLR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, _______, \ | 67 | _______, KC_DLR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, _______, \ |
| 71 | CC_ARRW, KC_EXLM, KC_AT, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_BSLS, KC_PIPE \ | 68 | CC_ARRW, KC_EXLM, KC_AT, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_BSLS, KC_PIPE \ |
| 72 | ), | 69 | ), |
| 73 | 70 | ||
| 74 | [_NAV] = KEYMAP( \ | 71 | [_NAV] = LAYOUT( \ |
| 75 | _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, \ | 72 | _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, \ |
| 76 | _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ | 73 | _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ |
| 77 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 74 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h index 932f8fd12..51c524552 100644 --- a/keyboards/orthodox/orthodox.h +++ b/keyboards/orthodox/orthodox.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #endif | 12 | #endif |
| 13 | 13 | ||
| 14 | // Used to create a keymap using only KC_ prefixed keys | 14 | // Used to create a keymap using only KC_ prefixed keys |
| 15 | #define KC_KEYMAP( \ | 15 | #define LAYOUT_kc( \ |
| 16 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 16 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 17 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ | 17 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ |
| 18 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 18 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ |
diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json index be9738f2e..54afc306d 100644 --- a/keyboards/orthodox/rev1/info.json +++ b/keyboards/orthodox/rev1/info.json | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "Monkeebs Orthodox Rev.1", | 2 | "keyboard_name": "Monkeebs Orthodox Rev.1", |
| 3 | "maintainer": "qmk", | 3 | "maintainer": "qmk", |
| 4 | "width": 17, | 4 | "width": 17, |
| 5 | "height": 17.24, | 5 | "height": 17.24, |
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "KEYMAP": { | 7 | "LAYOUT": { |
| 8 | "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] | 8 | "layout": [{"label":"TAB", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":13, "y":0}, {"label":"U", "x":14, "y":0}, {"label":"I", "x":15, "y":0}, {"label":"O", "x":16, "y":0}, {"x":17, "y":0}, {"x":17, "y":0}, {"label":"P", "x":17, "y":0}, {"label":"BSPC", "x":18, "y":0}, {"label":"ESC", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"LEFT", "x":7, "y":1}, {"label":"DOWN", "x":8, "y":1}, {"label":"UP", "x":10, "y":1}, {"label":"RGHT", "x":11, "y":1}, {"label":"H", "x":13, "y":1}, {"label":"J", "x":14, "y":1}, {"label":"K", "x":15, "y":1}, {"label":"L", "x":16, "y":1}, {"label":";", "x":17, "y":1}, {"label":"'", "x":18, "y":1}, {"label":"CTRL", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"LOWER", "x":6, "y":2}, {"label":"BSPC", "x":7, "y":2}, {"label":"ENT", "x":8, "y":2}, {"label":"RALT", "x":10, "y":2}, {"label":"SPC", "x":11, "y":2}, {"label":"RAISE", "x":12, "y":2}, {"label":"N", "x":13, "y":2}, {"label":"M", "x":14, "y":2}, {"label":",", "x":15, "y":2}, {"label":".", "x":16, "y":2}, {"label":"/", "x":17, "y":2}, {"label":"LGUI", "x":18, "y":2}] |
| 9 | } | 9 | } |
| 10 | } | 10 | } |
| 11 | } | 11 | } |
diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h index 8211234a5..e73263fb6 100644 --- a/keyboards/orthodox/rev1/rev1.h +++ b/keyboards/orthodox/rev1/rev1.h | |||
| @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 29 | 29 | ||
| 30 | //void promicro_bootloader_jmp(bool program); | 30 | //void promicro_bootloader_jmp(bool program); |
| 31 | 31 | ||
| 32 | #define KEYMAP( \ | 32 | #define LAYOUT( \ |
| 33 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 33 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 34 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ | 34 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ |
| 35 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 35 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ |
diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json index 579167f6d..fd0b324cf 100644 --- a/keyboards/orthodox/rev3/info.json +++ b/keyboards/orthodox/rev3/info.json | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "Monkeebs Orthodox Rev.3", | 2 | "keyboard_name": "Monkeebs Orthodox Rev.3", |
| 3 | "maintainer": "qmk", | 3 | "maintainer": "qmk", |
| 4 | "width": 17, | 4 | "width": 17, |
| 5 | "height": 17.24, | 5 | "height": 17.24, |
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "KEYMAP": { | 7 | "LAYOUT": { |
| 8 | "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] | 8 | "layout": [{"label":"TAB", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":13, "y":0}, {"label":"U", "x":14, "y":0}, {"label":"I", "x":15, "y":0}, {"label":"O", "x":16, "y":0}, {"x":17, "y":0}, {"x":17, "y":0}, {"label":"P", "x":17, "y":0}, {"label":"BSPC", "x":18, "y":0}, {"label":"ESC", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"LEFT", "x":7, "y":1}, {"label":"DOWN", "x":8, "y":1}, {"label":"UP", "x":10, "y":1}, {"label":"RGHT", "x":11, "y":1}, {"label":"H", "x":13, "y":1}, {"label":"J", "x":14, "y":1}, {"label":"K", "x":15, "y":1}, {"label":"L", "x":16, "y":1}, {"label":";", "x":17, "y":1}, {"label":"'", "x":18, "y":1}, {"label":"CTRL", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"LOWER", "x":6, "y":2}, {"label":"BSPC", "x":7, "y":2}, {"label":"ENT", "x":8, "y":2}, {"label":"RALT", "x":10, "y":2}, {"label":"SPC", "x":11, "y":2}, {"label":"RAISE", "x":12, "y":2}, {"label":"N", "x":13, "y":2}, {"label":"M", "x":14, "y":2}, {"label":",", "x":15, "y":2}, {"label":".", "x":16, "y":2}, {"label":"/", "x":17, "y":2}, {"label":"LGUI", "x":18, "y":2}] |
| 9 | } | 9 | } |
| 10 | } | 10 | } |
| 11 | } | 11 | } |
diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h index 8aff9e39f..2be9b9605 100644 --- a/keyboards/orthodox/rev3/rev3.h +++ b/keyboards/orthodox/rev3/rev3.h | |||
| @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 29 | 29 | ||
| 30 | //void promicro_bootloader_jmp(bool program); | 30 | //void promicro_bootloader_jmp(bool program); |
| 31 | 31 | ||
| 32 | #define KEYMAP( \ | 32 | #define LAYOUT( \ |
| 33 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 33 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 34 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ | 34 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ |
| 35 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 35 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ |
diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json index 579167f6d..fd0b324cf 100644 --- a/keyboards/orthodox/rev3_teensy/info.json +++ b/keyboards/orthodox/rev3_teensy/info.json | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "Monkeebs Orthodox Rev.3", | 2 | "keyboard_name": "Monkeebs Orthodox Rev.3", |
| 3 | "maintainer": "qmk", | 3 | "maintainer": "qmk", |
| 4 | "width": 17, | 4 | "width": 17, |
| 5 | "height": 17.24, | 5 | "height": 17.24, |
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "KEYMAP": { | 7 | "LAYOUT": { |
| 8 | "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] | 8 | "layout": [{"label":"TAB", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":13, "y":0}, {"label":"U", "x":14, "y":0}, {"label":"I", "x":15, "y":0}, {"label":"O", "x":16, "y":0}, {"x":17, "y":0}, {"x":17, "y":0}, {"label":"P", "x":17, "y":0}, {"label":"BSPC", "x":18, "y":0}, {"label":"ESC", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"LEFT", "x":7, "y":1}, {"label":"DOWN", "x":8, "y":1}, {"label":"UP", "x":10, "y":1}, {"label":"RGHT", "x":11, "y":1}, {"label":"H", "x":13, "y":1}, {"label":"J", "x":14, "y":1}, {"label":"K", "x":15, "y":1}, {"label":"L", "x":16, "y":1}, {"label":";", "x":17, "y":1}, {"label":"'", "x":18, "y":1}, {"label":"CTRL", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"LOWER", "x":6, "y":2}, {"label":"BSPC", "x":7, "y":2}, {"label":"ENT", "x":8, "y":2}, {"label":"RALT", "x":10, "y":2}, {"label":"SPC", "x":11, "y":2}, {"label":"RAISE", "x":12, "y":2}, {"label":"N", "x":13, "y":2}, {"label":"M", "x":14, "y":2}, {"label":",", "x":15, "y":2}, {"label":".", "x":16, "y":2}, {"label":"/", "x":17, "y":2}, {"label":"LGUI", "x":18, "y":2}] |
| 9 | } | 9 | } |
| 10 | } | 10 | } |
| 11 | } | 11 | } |
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.h b/keyboards/orthodox/rev3_teensy/rev3_teensy.h index 18b47671c..0081a0df0 100644 --- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h +++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.h | |||
| @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 29 | 29 | ||
| 30 | //void promicro_bootloader_jmp(bool program); | 30 | //void promicro_bootloader_jmp(bool program); |
| 31 | 31 | ||
| 32 | #define KEYMAP( \ | 32 | #define LAYOUT( \ |
| 33 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 33 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 34 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ | 34 | L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ |
| 35 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 35 | L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ |
