Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
8471dcc563
3 changed files with 6 additions and 6 deletions
|
@ -100,7 +100,7 @@
|
|||
{"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
|
||||
{"matrix": [3, 14], "x": 17.25, "y": 3},
|
||||
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
|
||||
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
|
||||
|
@ -170,7 +170,7 @@
|
|||
{"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
|
||||
{"matrix": [3, 14], "x": 17.25, "y": 3},
|
||||
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
|
||||
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
|
||||
|
@ -238,7 +238,7 @@
|
|||
{"matrix": [3, 12], "x": 14.5, "y": 3},
|
||||
{"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
|
||||
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
|
||||
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
|
||||
|
@ -307,7 +307,7 @@
|
|||
{"matrix": [3, 12], "x": 14.5, "y": 3},
|
||||
{"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
|
||||
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
|
||||
{"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
|
||||
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT_all(
|
||||
KC_PSCR, 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_EQL, KC_BSPC, KC_DEL,
|
||||
KC_PSCR, 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_EQL, KC_BSPC, KC_BSPC,
|
||||
KC_PGUP, KC_TAB, 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_BSLS,
|
||||
KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT_all(
|
||||
KC_PSCR, 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_EQL, KC_BSPC, KC_DEL,
|
||||
KC_PSCR, 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_EQL, KC_BSPC, KC_BSPC,
|
||||
KC_PGUP, KC_TAB, 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_BSLS,
|
||||
KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
|
||||
|
|
Loading…
Reference in a new issue