Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		| @@ -39,6 +39,4 @@ | ||||
|  | ||||
| #define MATRIX_ROW_PINS {D1, D0, D4, C6, D7} | ||||
| #define MATRIX_COL_PINS {B3, B1, F7, F6, F5, F4} | ||||
|  | ||||
| #define UNUSED_PINS {B2, B6, B7, D5, C7, F1, F0, B4, E6} | ||||
|  | ||||
| #define UNUSED_PINS | ||||
|   | ||||
| @@ -15,8 +15,6 @@ | ||||
| */ | ||||
| #include QMK_KEYBOARD_H | ||||
|  | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  | ||||
| /* LAYER 0 | ||||
|  * ,-----------------------------------------------. | ||||
|  * |   1   |   2   |   3   |   4   |   5   |   -   | | ||||
| @@ -30,32 +28,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  * |       |   Z   |   X   |   C   |       |   N   | | ||||
|  * ,-----------------------------------------------. | ||||
|  */ | ||||
| LAYOUT( | ||||
|   KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS, | ||||
|   KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R, | ||||
|   LT(1,KC_SLSH), KC_Q,   KC_W,      KC_E,      KC_U,      KC_V, | ||||
|   KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O, | ||||
|               KC_Z,      KC_X,      KC_C,                 KC_N      | ||||
| ) | ||||
| LAYOUT( | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|               KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS    | ||||
| ) | ||||
| LAYOUT( | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|               KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS    | ||||
| ) | ||||
| LAYOUT( | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|               KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS    | ||||
| ) | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   [0] = LAYOUT( | ||||
|     KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS, | ||||
|     KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R, | ||||
|     LT(1,KC_SLSH), KC_Q,   KC_W,      KC_E,      KC_U,      KC_V, | ||||
|     KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O, | ||||
|                 KC_Z,      KC_X,      KC_C,                 KC_N      | ||||
|   ), | ||||
|   [1] = LAYOUT( | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|                 KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS    | ||||
|   ), | ||||
|   [2] = LAYOUT( | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|                 KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS    | ||||
|   ), | ||||
|   [3] = LAYOUT( | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, | ||||
|                 KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS    | ||||
|   ) | ||||
| }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user