aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-06-23 21:33:47 -0700
committerGitHub <noreply@github.com>2021-06-23 21:33:47 -0700
commit36d8d7df5adddd4f39b7251a8a4298e6899dd4bf (patch)
tree7b0b0b772108b5b2121993d990f62011d8d4770d
parent42f4528a4595ddacf7b812a346e912b8c4fa2f96 (diff)
downloadqmk_firmware-36d8d7df5adddd4f39b7251a8a4298e6899dd4bf.tar.gz
qmk_firmware-36d8d7df5adddd4f39b7251a8a4298e6899dd4bf.zip
SAM SG81M Layout Macro Rework (#13291)
* grid-align layout macro and keymaps * physically align layout macro and keycodes Arrange the layout macro and keycodes to resemble the assembled keyboard. * update info.json data Updates the info.json data to be correct to the new layout macro.
-rw-r--r--keyboards/sam/sg81m/info.json137
-rw-r--r--keyboards/sam/sg81m/keymaps/default/keymap.c22
-rw-r--r--keyboards/sam/sg81m/keymaps/via/keymap.c54
-rw-r--r--keyboards/sam/sg81m/sg81m.h11
4 files changed, 109 insertions, 115 deletions
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index 08782d183..4b35f4492 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -1,9 +1,9 @@
1{ 1{
2 "keyboard_name": "sam sg81m", 2 "keyboard_name": "sam sg81m",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "CMMS-Freather",
5 "width": 17, 5 "width": 18.5,
6 "height": 6, 6 "height": 5.5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "layout": [ 9 "layout": [
@@ -21,71 +21,74 @@
21 {"label":"K0B (F0,D5)", "x":11, "y":0}, 21 {"label":"K0B (F0,D5)", "x":11, "y":0},
22 {"label":"K0C (F0,D6)", "x":12, "y":0}, 22 {"label":"K0C (F0,D6)", "x":12, "y":0},
23 {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2}, 23 {"label":"K0D (F0,D7)", "x":13, "y":0, "w":2},
24 {"label":"K10 (F1,B7)", "x":0, "y":1, "w":1.5}, 24 {"label":"K2D (F4,D7)", "x":15.5, "y":0},
25 {"label":"K11 (F1,B6)", "x":1.5, "y":1}, 25 {"label":"K3D (F5,D7)", "x":16.5, "y":0},
26 {"label":"K12 (F1,B5)", "x":2.5, "y":1}, 26 {"label":"K4D (F6,D7)", "x":17.5, "y":0},
27 {"label":"K13 (F1,B4)", "x":3.5, "y":1}, 27
28 {"label":"K14 (F1,C7)", "x":4.5, "y":1}, 28 {"label":"K10 (F1,B7)", "x":0, "y":1.25, "w":1.5},
29 {"label":"K15 (F1,C6)", "x":5.5, "y":1}, 29 {"label":"K11 (F1,B6)", "x":1.5, "y":1.25},
30 {"label":"K16 (F1,D0)", "x":6.5, "y":1}, 30 {"label":"K12 (F1,B5)", "x":2.5, "y":1.25},
31 {"label":"K17 (F1,D1)", "x":7.5, "y":1}, 31 {"label":"K13 (F1,B4)", "x":3.5, "y":1.25},
32 {"label":"K18 (F1,D2)", "x":8.5, "y":1}, 32 {"label":"K14 (F1,C7)", "x":4.5, "y":1.25},
33 {"label":"K19 (F1,D3)", "x":9.5, "y":1}, 33 {"label":"K15 (F1,C6)", "x":5.5, "y":1.25},
34 {"label":"K1A (F1,D4)", "x":10.5, "y":1}, 34 {"label":"K16 (F1,D0)", "x":6.5, "y":1.25},
35 {"label":"K1B (F1,D5)", "x":11.5, "y":1}, 35 {"label":"K17 (F1,D1)", "x":7.5, "y":1.25},
36 {"label":"K1C (F1,D6)", "x":12.5, "y":1}, 36 {"label":"K18 (F1,D2)", "x":8.5, "y":1.25},
37 {"label":"K1D (F1,D7)", "x":13.5, "y":1, "w":1.5}, 37 {"label":"K19 (F1,D3)", "x":9.5, "y":1.25},
38 {"label":"K20 (F4,B7)", "x":0, "y":2, "w":1.75}, 38 {"label":"K1A (F1,D4)", "x":10.5, "y":1.25},
39 {"label":"K21 (F4,B6)", "x":1.75, "y":2}, 39 {"label":"K1B (F1,D5)", "x":11.5, "y":1.25},
40 {"label":"K22 (F4,B5)", "x":2.75, "y":2}, 40 {"label":"K1C (F1,D6)", "x":12.5, "y":1.25},
41 {"label":"K23 (F4,B4)", "x":3.75, "y":2}, 41 {"label":"K1D (F1,D7)", "x":13.5, "y":1.25, "w":1.5},
42 {"label":"K24 (F4,C7)", "x":4.75, "y":2}, 42 {"label":"K56 (F7,D0)", "x":15.5, "y":1.25},
43 {"label":"K25 (F4,C6)", "x":5.75, "y":2}, 43 {"label":"K57 (F7,D1)", "x":16.5, "y":1.25},
44 {"label":"K26 (F4,D0)", "x":6.75, "y":2}, 44 {"label":"K58 (F7,D2)", "x":17.5, "y":1.25},
45 {"label":"K27 (F4,D1)", "x":7.75, "y":2}, 45
46 {"label":"K28 (F4,D2)", "x":8.75, "y":2}, 46 {"label":"K20 (F4,B7)", "x":0, "y":2.25, "w":1.75},
47 {"label":"K29 (F4,D3)", "x":9.75, "y":2}, 47 {"label":"K21 (F4,B6)", "x":1.75, "y":2.25},
48 {"label":"K2A (F4,D4)", "x":10.75, "y":2}, 48 {"label":"K22 (F4,B5)", "x":2.75, "y":2.25},
49 {"label":"K2B (F4,D5)", "x":11.75, "y":2}, 49 {"label":"K23 (F4,B4)", "x":3.75, "y":2.25},
50 {"label":"K2C (F4,D6)", "x":12.75, "y":2, "w":2.25}, 50 {"label":"K24 (F4,C7)", "x":4.75, "y":2.25},
51 {"label":"K2D (F4,D7)", "x":15, "y":2}, 51 {"label":"K25 (F4,C6)", "x":5.75, "y":2.25},
52 {"label":"K30 (F5,B7)", "x":0, "y":3, "w":2.25}, 52 {"label":"K26 (F4,D0)", "x":6.75, "y":2.25},
53 {"label":"K31 (F5,B6)", "x":2.25, "y":3}, 53 {"label":"K27 (F4,D1)", "x":7.75, "y":2.25},
54 {"label":"K32 (F5,B5)", "x":3.25, "y":3}, 54 {"label":"K28 (F4,D2)", "x":8.75, "y":2.25},
55 {"label":"K33 (F5,B4)", "x":4.25, "y":3}, 55 {"label":"K29 (F4,D3)", "x":9.75, "y":2.25},
56 {"label":"K34 (F5,C7)", "x":5.25, "y":3}, 56 {"label":"K2A (F4,D4)", "x":10.75, "y":2.25},
57 {"label":"K35 (F5,C6)", "x":6.25, "y":3}, 57 {"label":"K2B (F4,D5)", "x":11.75, "y":2.25},
58 {"label":"K36 (F5,D0)", "x":7.25, "y":3}, 58 {"label":"K2C (F4,D6)", "x":12.75, "y":2.25, "w":2.25},
59 {"label":"K37 (F5,D1)", "x":8.25, "y":3}, 59 {"label":"K53 (F7,B4)", "x":15.5, "y":2.25},
60 {"label":"K38 (F5,D2)", "x":9.25, "y":3}, 60 {"label":"K54 (F7,C7)", "x":16.5, "y":2.25},
61 {"label":"K39 (F5,D3)", "x":10.25, "y":3}, 61 {"label":"K55 (F7,C6)", "x":17.5, "y":2.25},
62 {"label":"K3A (F5,D4)", "x":11.25, "y":3}, 62
63 {"label":"K3B (F5,D5)", "x":12.25, "y":3, "w":1.75}, 63 {"label":"K30 (F5,B7)", "x":0, "y":3.25, "w":2.25},
64 {"label":"K3C (F5,D6)", "x":14, "y":3}, 64 {"label":"K31 (F5,B6)", "x":2.25, "y":3.25},
65 {"label":"K3D (F5,D7)", "x":15, "y":3}, 65 {"label":"K32 (F5,B5)", "x":3.25, "y":3.25},
66 {"label":"K40 (F6,B7)", "x":0, "y":4, "w":1.5}, 66 {"label":"K33 (F5,B4)", "x":4.25, "y":3.25},
67 {"label":"K41 (F6,B6)", "x":1.5, "y":4}, 67 {"label":"K34 (F5,C7)", "x":5.25, "y":3.25},
68 {"label":"K42 (F6,B5)", "x":2.5, "y":4, "w":1.5}, 68 {"label":"K35 (F5,C6)", "x":6.25, "y":3.25},
69 {"label":"K45 (F6,C6)", "x":4, "y":4, "w":7}, 69 {"label":"K36 (F5,D0)", "x":7.25, "y":3.25},
70 {"label":"K48 (F6,D2)", "x":11, "y":4}, 70 {"label":"K37 (F5,D1)", "x":8.25, "y":3.25},
71 {"label":"K49 (F6,D3)", "x":12, "y":4}, 71 {"label":"K38 (F5,D2)", "x":9.25, "y":3.25},
72 {"label":"K4A (F6,D4)", "x":13, "y":4}, 72 {"label":"K39 (F5,D3)", "x":10.25, "y":3.25},
73 {"label":"K4B (F6,D5)", "x":14, "y":4}, 73 {"label":"K3A (F5,D4)", "x":11.25, "y":3.25},
74 {"label":"K4C (F6,D6)", "x":15, "y":4}, 74 {"label":"K3B (F5,D5)", "x":12.25, "y":3.25, "w":1.75},
75 {"label":"K4D (F6,D7)", "x":16, "y":4}, 75 {"label":"K3C (F5,D6)", "x":14.25, "y":3.5},
76 {"label":"K50 (F7,B7)", "x":0, "y":5}, 76 {"label":"K50 (F7,B7)", "x":15.5, "y":3.25},
77 {"label":"K51 (F7,B6)", "x":1, "y":5}, 77 {"label":"K51 (F7,B6)", "x":16.5, "y":3.25},
78 {"label":"K52 (F7,B5)", "x":2, "y":5}, 78 {"label":"K52 (F7,B5)", "x":17.5, "y":3.25},
79 {"label":"K53 (F7,B4)", "x":3, "y":5}, 79
80 {"label":"K54 (F7,C7)", "x":4, "y":5}, 80 {"label":"K40 (F6,B7)", "x":0, "y":4.25, "w":1.5},
81 {"label":"K55 (F7,C6)", "x":5, "y":5}, 81 {"label":"K41 (F6,B6)", "x":1.5, "y":4.25},
82 {"label":"K56 (F7,D0)", "x":6, "y":5}, 82 {"label":"K42 (F6,B5)", "x":2.5, "y":4.25, "w":1.5},
83 {"label":"K57 (F7,D1)", "x":7, "y":5}, 83 {"label":"K45 (F6,C6)", "x":4, "y":4.25, "w":7},
84 {"label":"K58 (F7,D2)", "x":8, "y":5}, 84 {"label":"K48 (F6,D2)", "x":11, "y":4.25},
85 {"label":"K59 (F7,D3)", "x":9, "y":5}, 85 {"label":"K49 (F6,D3)", "x":12, "y":4.25},
86 {"label":"K5A (F7,D4)", "x":10, "y":5} 86 {"label":"K4A (F6,D4)", "x":13.25, "y":4.5},
87 {"label":"K4B (F6,D5)", "x":14.25, "y":4.5},
88 {"label":"K4C (F6,D6)", "x":15.25, "y":4.5},
89 {"label":"K59 (F7,D3)", "x":16.5, "y":4.25},
90 {"label":"K5A (F7,D4)", "x":17.5, "y":4.25}
87 ] 91 ]
88 } 92 }
89 } 93 }
90 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
91} 94}
diff --git a/keyboards/sam/sg81m/keymaps/default/keymap.c b/keyboards/sam/sg81m/keymaps/default/keymap.c
index a36ebb243..5518b9a8a 100644
--- a/keyboards/sam/sg81m/keymaps/default/keymap.c
+++ b/keyboards/sam/sg81m/keymaps/default/keymap.c
@@ -18,19 +18,17 @@
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT(
21 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, 21 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_NLCK, KC_END, KC_PGDN,
22 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, 22 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_P7, KC_P8, KC_P9,
23 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_NLCK, 23 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_P4, KC_P5, KC_P6,
24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_DEL
26 KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_DEL
27 ), 26 ),
28 [1] = LAYOUT( 27 [1] = LAYOUT(
29 KC_GRV, 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_TRNS, 28 KC_GRV, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
30 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, 29 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,
31 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, 30 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,
32 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, 31 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,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
35 ), 33 ),
36}; 34};
diff --git a/keyboards/sam/sg81m/keymaps/via/keymap.c b/keyboards/sam/sg81m/keymaps/via/keymap.c
index c03205859..f69d1f4c3 100644
--- a/keyboards/sam/sg81m/keymaps/via/keymap.c
+++ b/keyboards/sam/sg81m/keymaps/via/keymap.c
@@ -17,38 +17,32 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 20 [0] = LAYOUT(
21 [0] = LAYOUT( 21 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_NLCK, KC_END, KC_PGDN,
22 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, 22 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_P7, KC_P8, KC_P9,
23 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, 23 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_P4, KC_P5, KC_P6,
24 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_NLCK, 24 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_DEL
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 26 ),
27 KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_DEL 27 [1] = LAYOUT(
28 ), 28 KC_GRV, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
29 [1] = LAYOUT( 29 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,
30 KC_GRV, 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_TRNS, 30 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,
31 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, 31 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,
32 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, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
33 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, 33 ),
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
36 ),
37 [2] = LAYOUT( 34 [2] = LAYOUT(
38 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, 35 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,
39 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, 36 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,
40 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, 37 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,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_V, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_V, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
44 ), 40 ),
45 [3] = LAYOUT( 41 [3] = LAYOUT(
46 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, 42 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,
47 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, 43 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,
48 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, 44 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,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_V, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_V, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
52 ), 47 ),
53
54}; 48};
diff --git a/keyboards/sam/sg81m/sg81m.h b/keyboards/sam/sg81m/sg81m.h
index 4736aa8ca..73e69e439 100644
--- a/keyboards/sam/sg81m/sg81m.h
+++ b/keyboards/sam/sg81m/sg81m.h
@@ -19,12 +19,11 @@
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT( \ 21#define LAYOUT( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K3D, K4D, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K56, K57, K58, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ 24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K53, K54, K55, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ 25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K50, K51, K52, \
26 K40, K41, K42, K45, K48, K49, K4A, K4B, K4C, K4D, \ 26 K40, K41, K42, K45, K48, K49, K4A, K4B, K4C, K59, K5A \
27 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A \
28) { \ 27) { \
29 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
30 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ 29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \