mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 05:12:33 +01:00 
			
		
		
		
	Orthodox info.json changes
This commit is contained in:
		
							parent
							
								
									5941f81e38
								
							
						
					
					
						commit
						34b274360c
					
				| @ -35,4 +35,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| // #define MASTER_RIGHT
 | // #define MASTER_RIGHT
 | ||||||
| #define EE_HANDS | #define EE_HANDS | ||||||
| 
 | 
 | ||||||
|  | #ifdef AUDIO_ENABLE | ||||||
|  |     #define STARTUP_SONG SONG(PLANCK_SOUND) | ||||||
|  |     // #define STARTUP_SONG SONG(NO_SOUND)
 | ||||||
|  | 
 | ||||||
|  |     #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ | ||||||
|  |                                   SONG(COLEMAK_SOUND), \ | ||||||
|  |                                   SONG(DVORAK_SOUND) \ | ||||||
|  |                                 } | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| #endif | #endif | ||||||
|  | |||||||
| @ -19,11 +19,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #include "orthodox.h" | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
| 
 |  | ||||||
| extern keymap_config_t keymap_config; |  | ||||||
| 
 | 
 | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below.
 | // Each layer gets a name for readability, which is then used in the keymap matrix below.
 | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | ||||||
| @ -40,8 +36,6 @@ enum custom_keycodes { | |||||||
|   QWERTY = SAFE_RANGE, |   QWERTY = SAFE_RANGE, | ||||||
|   COLEMAK, |   COLEMAK, | ||||||
|   DVORAK, |   DVORAK, | ||||||
|   LOWER, |  | ||||||
|   RAISE, |  | ||||||
|   ADJUST, |   ADJUST, | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| @ -50,116 +44,73 @@ enum custom_keycodes { | |||||||
| #define XXXXXXX KC_NO | #define XXXXXXX KC_NO | ||||||
| 
 | 
 | ||||||
| #define LS__SPC MT(MOD_LSFT, KC_SPC) | #define LS__SPC MT(MOD_LSFT, KC_SPC) | ||||||
|  | #define LOWER MO(_LOWER) | ||||||
|  | #define RAISE MO(_RAISE) | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| 
 | 
 | ||||||
|   [_QWERTY] = KEYMAP( \ |   [_QWERTY] = LAYOUT( \ | ||||||
|   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                                   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \ |   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                                   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \ | ||||||
|     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, \ |     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, \ | ||||||
|     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 \ |     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 \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_COLEMAK] = KEYMAP(\ |   [_COLEMAK] = LAYOUT(\ | ||||||
|     KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \ |     KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \ | ||||||
|     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, \ |     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, \ | ||||||
|     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 \ |     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 \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_DVORAK] = KEYMAP(\ |   [_DVORAK] = LAYOUT(\ | ||||||
|     KC_TAB,   KC_QUOT, KC_COMM, KC_DOT, KC_P,     KC_Y,                                                                   KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \ |     KC_TAB,   KC_QUOT, KC_COMM, KC_DOT, KC_P,     KC_Y,                                                                   KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \ | ||||||
|     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, \ |     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, \ | ||||||
|     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 \ |     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 \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_LOWER] = KEYMAP( \ |   [_LOWER] = LAYOUT( \ | ||||||
|     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                                                KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC, \ |     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                                                KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC, \ | ||||||
|     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, \ |     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, \ | ||||||
|     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_HOME,    KC_COMM,    KC_DOT,  KC_END,  _______ \ |     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_HOME,    KC_COMM,    KC_DOT,  KC_END,  _______ \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_RAISE] = KEYMAP( \ |   [_RAISE] = LAYOUT( \ | ||||||
|     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                                   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \ |     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                                   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \ | ||||||
|     KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            _______, _______,          _______, _______,          KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \ |     KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            _______, _______,          _______, _______,          KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \ | ||||||
|     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_PGUP, KC_COMM, KC_DOT,  KC_PGDN, _______ \ |     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_PGUP, KC_COMM, KC_DOT,  KC_PGDN, _______ \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_ADJUST] =  KEYMAP( \ |   [_ADJUST] =  LAYOUT( \ | ||||||
|     _______, RESET,   _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_DEL,  \ |     _______, RESET,   _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_DEL,  \ | ||||||
|     _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______, \ |     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______, \ | ||||||
|     _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \ |     _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY  \ | ||||||
|   ) |   ) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| #ifdef AUDIO_ENABLE | uint32_t layer_state_set_user(uint32_t state) { | ||||||
| float tone_qwerty[][2]     = SONG(QWERTY_SOUND); |   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | ||||||
| float tone_dvorak[][2]     = SONG(DVORAK_SOUND); |  | ||||||
| float tone_colemak[][2]    = SONG(COLEMAK_SOUND); |  | ||||||
| #endif |  | ||||||
| 
 |  | ||||||
| void persistent_default_layer_set(uint16_t default_layer) { |  | ||||||
|   eeconfig_update_default_layer(default_layer); |  | ||||||
|   default_layer_set(default_layer); |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| bool process_record_user(uint16_t keycode, keyrecord_t *record) { | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||||
|   switch (keycode) { |   switch (keycode) { | ||||||
|   case QWERTY: |   case QWERTY: | ||||||
|     if (record->event.pressed) { |     if (record->event.pressed) { | ||||||
| #ifdef AUDIO_ENABLE |       set_single_persistent_default_layer(_QWERTY); | ||||||
|       PLAY_SONG(tone_qwerty); |  | ||||||
| #endif |  | ||||||
|       persistent_default_layer_set(1UL<<_QWERTY); |  | ||||||
|     } |     } | ||||||
|     return false; |     return false; | ||||||
|     break; |     break; | ||||||
|   case COLEMAK: |   case COLEMAK: | ||||||
|     if (record->event.pressed) { |     if (record->event.pressed) { | ||||||
| #ifdef AUDIO_ENABLE |       set_single_persistent_default_layer(_COLEMAK); | ||||||
|       PLAY_SONG(tone_colemak); |  | ||||||
| #endif |  | ||||||
|       persistent_default_layer_set(1UL<<_COLEMAK); |  | ||||||
|     } |     } | ||||||
|     return false; |     return false; | ||||||
|     break; |     break; | ||||||
|   case DVORAK: |   case DVORAK: | ||||||
|     if (record->event.pressed) { |     if (record->event.pressed) { | ||||||
| #ifdef AUDIO_ENABLE |       set_single_persistent_default_layer(_DVORAK); | ||||||
|       PLAY_SONG(tone_dvorak); |  | ||||||
| #endif |  | ||||||
|       persistent_default_layer_set(1UL<<_DVORAK); |  | ||||||
|     } |     } | ||||||
|     return false; |     return false; | ||||||
|     break; |     break; | ||||||
|   case LOWER: |  | ||||||
|     if (record->event.pressed) { |  | ||||||
|       layer_on(_LOWER); |  | ||||||
|       update_tri_layer(_LOWER, _RAISE, _ADJUST); |  | ||||||
|     } else { |  | ||||||
|       layer_off(_LOWER); |  | ||||||
|       update_tri_layer(_LOWER, _RAISE, _ADJUST); |  | ||||||
|     } |  | ||||||
|     return false; |  | ||||||
|     break; |  | ||||||
|   case RAISE: |  | ||||||
|     if (record->event.pressed) { |  | ||||||
|       layer_on(_RAISE); |  | ||||||
|       update_tri_layer(_LOWER, _RAISE, _ADJUST); |  | ||||||
|     } else { |  | ||||||
|       layer_off(_RAISE); |  | ||||||
|       update_tri_layer(_LOWER, _RAISE, _ADJUST); |  | ||||||
|     } |  | ||||||
|     return false; |  | ||||||
|     break; |  | ||||||
|   case ADJUST: |  | ||||||
|     if (record->event.pressed) { |  | ||||||
|       layer_on(_ADJUST); |  | ||||||
|     } else { |  | ||||||
|       layer_off(_ADJUST); |  | ||||||
|     } |  | ||||||
|     return false; |  | ||||||
|     break; |  | ||||||
|   } |  | ||||||
|   return true; |   return true; | ||||||
| } | } | ||||||
|  | |||||||
| @ -19,11 +19,8 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #include "orthodox.h" | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
| 
 | 
 | ||||||
| extern keymap_config_t keymap_config; |  | ||||||
| 
 | 
 | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below.
 | // Each layer gets a name for readability, which is then used in the keymap matrix below.
 | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | ||||||
| @ -53,25 +50,25 @@ enum custom_keycodes { | |||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| 
 | 
 | ||||||
|   [_QWERTY] = KEYMAP( \ |   [_QWERTY] = LAYOUT( \ | ||||||
|     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                                   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \ |     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                                   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \ | ||||||
|     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, \ |     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, \ | ||||||
|     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 \ |     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 \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_LOWER] = KEYMAP( \ |   [_LOWER] = LAYOUT( \ | ||||||
|     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                                  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \ |     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                                                  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \ | ||||||
|     KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,           _______, _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \ |     KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,           _______, _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \ | ||||||
|     RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \ |     RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_RAISE] = KEYMAP( \ |   [_RAISE] = LAYOUT( \ | ||||||
|     KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN,                                                                KC_7,    KC_8,    KC_9,    KC_EQL,  _______, _______, \ |     KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN,                                                                KC_7,    KC_8,    KC_9,    KC_EQL,  _______, _______, \ | ||||||
|     _______, KC_DLR,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC,          _______, _______,          _______, _______,          KC_4,    KC_5,    KC_6,    KC_MINS, KC_PLUS, _______, \ |     _______, KC_DLR,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC,          _______, _______,          _______, _______,          KC_4,    KC_5,    KC_6,    KC_MINS, KC_PLUS, _______, \ | ||||||
|     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 \ |     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 \ | ||||||
|   ), |   ), | ||||||
| 
 | 
 | ||||||
|   [_NAV] =  KEYMAP( \ |   [_NAV] =  LAYOUT( \ | ||||||
|     _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,                                                                _______, _______, _______, _______, _______, _______,  \ |     _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,                                                                _______, _______, _______, _______, _______, _______,  \ | ||||||
|     _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT,          _______, _______,          _______, _______,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \ |     _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT,          _______, _______,          _______, _______,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \ | ||||||
|     _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______  \ |     _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______  \ | ||||||
|  | |||||||
| @ -12,7 +12,7 @@ | |||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| // Used to create a keymap using only KC_ prefixed keys
 | // Used to create a keymap using only KC_ prefixed keys
 | ||||||
| #define KC_KEYMAP( \ | #define LAYOUT_kc( \ | ||||||
| 	L00, L01, L02, L03, L04, L05,                            R00, R01, R02, R03, R04, R05, \ | 	L00, L01, L02, L03, L04, L05,                            R00, R01, R02, R03, R04, R05, \ | ||||||
| 	L10, L11, L12, L13, L14, L15, L16, L18,       R10, R12, R13, R14, R15, R16, R17, R18,  \ | 	L10, L11, L12, L13, L14, L15, L16, L18,       R10, R12, R13, R14, R15, R16, R17, R18,  \ | ||||||
| 	L20, L21, L22, L23, L24, L25, L26, L27, L28,  R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 	L20, L21, L22, L23, L24, L25, L26, L27, L28,  R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | ||||||
|  | |||||||
| @ -4,8 +4,8 @@ | |||||||
|     "width": 17, |     "width": 17, | ||||||
|     "height": 17.24, |     "height": 17.24, | ||||||
|     "layouts": { |     "layouts": { | ||||||
|         "KEYMAP": { |         "LAYOUT": { | ||||||
|             "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}] |           "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}] | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| 
 | 
 | ||||||
| //void promicro_bootloader_jmp(bool program);
 | //void promicro_bootloader_jmp(bool program);
 | ||||||
| 
 | 
 | ||||||
| #define KEYMAP( \ | #define LAYOUT( \ | ||||||
| 	L00, L01, L02, L03, L04, L05,                                  R00, R01, R02, R03, R04, R05, \ | 	L00, L01, L02, L03, L04, L05,                                  R00, R01, R02, R03, R04, R05, \ | ||||||
| 	L10, L11, L12, L13, L14, L15,      L16, L18,    R10, R12,      R13, R14, R15, R16, R17, R18,  \ | 	L10, L11, L12, L13, L14, L15,      L16, L18,    R10, R12,      R13, R14, R15, R16, R17, R18,  \ | ||||||
| 	L20, L21, L22, L23, L24, L25, L26, L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 	L20, L21, L22, L23, L24, L25, L26, L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | ||||||
|  | |||||||
| @ -4,8 +4,8 @@ | |||||||
|     "width": 17, |     "width": 17, | ||||||
|     "height": 17.24, |     "height": 17.24, | ||||||
|     "layouts": { |     "layouts": { | ||||||
|         "KEYMAP": { |         "LAYOUT": { | ||||||
|             "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}] |           "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}] | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| 
 | 
 | ||||||
| //void promicro_bootloader_jmp(bool program);
 | //void promicro_bootloader_jmp(bool program);
 | ||||||
| 
 | 
 | ||||||
| #define KEYMAP( \ | #define LAYOUT( \ | ||||||
| 	L00, L01, L02, L03, L04, L05,                                  R00, R01, R02, R03, R04, R05, \ | 	L00, L01, L02, L03, L04, L05,                                  R00, R01, R02, R03, R04, R05, \ | ||||||
| 	L10, L11, L12, L13, L14, L15,      L16, L18,    R10, R12,      R13, R14, R15, R16, R17, R18,  \ | 	L10, L11, L12, L13, L14, L15,      L16, L18,    R10, R12,      R13, R14, R15, R16, R17, R18,  \ | ||||||
| 	L20, L21, L22, L23, L24, L25, L26, L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 	L20, L21, L22, L23, L24, L25, L26, L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | ||||||
|  | |||||||
| @ -4,8 +4,8 @@ | |||||||
|     "width": 17, |     "width": 17, | ||||||
|     "height": 17.24, |     "height": 17.24, | ||||||
|     "layouts": { |     "layouts": { | ||||||
|         "KEYMAP": { |         "LAYOUT": { | ||||||
|             "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}] |           "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}] | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| 
 | 
 | ||||||
| //void promicro_bootloader_jmp(bool program);
 | //void promicro_bootloader_jmp(bool program);
 | ||||||
| 
 | 
 | ||||||
| #define KEYMAP( \ | #define LAYOUT( \ | ||||||
| 	L00, L01, L02, L03, L04, L05,                                  R00, R01, R02, R03, R04, R05, \ | 	L00, L01, L02, L03, L04, L05,                                  R00, R01, R02, R03, R04, R05, \ | ||||||
| 	L10, L11, L12, L13, L14, L15,      L16, L18,    R10, R12,      R13, R14, R15, R16, R17, R18,  \ | 	L10, L11, L12, L13, L14, L15,      L16, L18,    R10, R12,      R13, R14, R15, R16, R17, R18,  \ | ||||||
| 	L20, L21, L22, L23, L24, L25, L26, L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | 	L20, L21, L22, L23, L24, L25, L26, L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27, R28 \ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Drashna Jaelre
						Drashna Jaelre