aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-18 12:47:01 +0000
committerQMK Bot <hello@qmk.fm>2021-01-18 12:47:01 +0000
commitffaaadc2700b2f81e05e960841209750a64e05f4 (patch)
tree10c65dbbf4c0d693dd131428b2c54b6e46a3e791
parente0e67df933edd2b5740a19b49cf88084492c964c (diff)
parent03bacec87da5482f700af9f138a0b9036dcbe2ad (diff)
downloadqmk_firmware-ffaaadc2700b2f81e05e960841209750a64e05f4.tar.gz
qmk_firmware-ffaaadc2700b2f81e05e960841209750a64e05f4.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/naked64/info.json113
-rw-r--r--keyboards/naked64/keymaps/default_with_setta21/keymap.c134
-rw-r--r--keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c218
-rw-r--r--keyboards/naked64/rev1/rev1.h11
4 files changed, 298 insertions, 178 deletions
diff --git a/keyboards/naked64/info.json b/keyboards/naked64/info.json
index 60ac6d727..17619187d 100644
--- a/keyboards/naked64/info.json
+++ b/keyboards/naked64/info.json
@@ -1,9 +1,9 @@
1{ 1{
2 "keyboard_name": "Naked64", 2 "keyboard_name": "Naked64",
3 "url": "https://salicylic-acid3.hatenablog.com/", 3 "url": "https://salicylic-acid3.hatenablog.com/",
4 "maintainer": "Salicylic_acid3", 4 "maintainer": "Salicylic_acid3",
5 "width": 16.5, 5 "width": 16.5,
6 "height": 5.25, 6 "height": 5.25,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "layout": [ 9 "layout": [
@@ -72,6 +72,107 @@
72 {"label":"&darr;", "x":14.5, "y":4}, 72 {"label":"&darr;", "x":14.5, "y":4},
73 {"label":"&rarr;", "x":15.5, "y":4} 73 {"label":"&rarr;", "x":15.5, "y":4}
74 ] 74 ]
75 },
76 "LAYOUT_with_setta21": {
77 "width": 21.5,
78 "height": 6.25,
79 "layout": [
80 {"label":"pgup", "x":0.25, "y":0},
81 {"label":"ESC", "x":1.75, "y":0},
82 {"label":"1", "x":2.75, "y":0},
83 {"label":"2", "x":4, "y":0},
84 {"label":"3", "x":5, "y":0},
85 {"label":"4", "x":6, "y":0},
86 {"label":"5", "x":7, "y":0},
87 {"label":"6", "x":9.25, "y":0},
88 {"label":"7", "x":10.25, "y":0},
89 {"label":"8", "x":11.25, "y":0},
90 {"label":"9", "x":12.25, "y":0},
91 {"label":"0", "x":13.5, "y":0},
92 {"label":"-", "x":14.5, "y":0},
93 {"label":"Back Space", "x":15.5, "y":0},
94
95 {"label":"Esc", "x": 17.5, "y":0},
96 {"label":"F2", "x": 18.5, "y":0},
97 {"label":"=", "x": 19.5, "y":0},
98 {"label":"Delete", "x": 20.5, "y":0},
99
100 {"label":"pgdn", "x":0, "y":1},
101 {"label":"Tab", "x":1.25, "y":1, "w":1.5},
102 {"label":"Q", "x":2.75, "y":1},
103 {"label":"W", "x":4, "y":1},
104 {"label":"E", "x":5, "y":1},
105 {"label":"R", "x":6, "y":1},
106 {"label":"T", "x":7, "y":1},
107 {"label":"Y", "x":9.25, "y":1},
108 {"label":"U", "x":10.25, "y":1},
109 {"label":"I", "x":11.25, "y":1},
110 {"label":"O", "x":12.25, "y":1},
111 {"label":"P", "x":13.5, "y":1},
112 {"label":"[", "x":14.5, "y":1},
113 {"label":"]", "x":15.5, "y":1},
114
115 {"label":"Num Lock", "x": 17.5, "y":1.25},
116 {"label":"/", "x": 18.5, "y":1.25},
117 {"label":"*", "x": 19.5, "y":1.25},
118 {"label":"-", "x": 20.5, "y":1.25},
119
120 {"label":"Control", "x":1, "y":2, "w":1.75},
121 {"label":"A", "x":2.75, "y":2},
122 {"label":"S", "x":4, "y":2},
123 {"label":"D", "x":5, "y":2},
124 {"label":"F", "x":6, "y":2},
125 {"label":"G", "x":7, "y":2},
126 {"label":"H", "x":9.25, "y":2},
127 {"label":"J", "x":10.25, "y":2},
128 {"label":"K", "x":11.25, "y":2},
129 {"label":"L", "x":12.25, "y":2},
130 {"label":";", "x":13.5, "y":2},
131 {"label":"'", "x":14.5, "y":2},
132 {"label":"Return", "x":15.5, "y":2},
133
134 {"label":"7", "x": 17.5, "y":2.25},
135 {"label":"8", "x": 18.5, "y":2.25},
136 {"label":"9", "x": 19.5, "y":2.25},
137
138 {"label":"Shift", "x":0.5, "y":3, "w":2.25},
139 {"label":"Z", "x":2.75, "y":3},
140 {"label":"X", "x":4, "y":3},
141 {"label":"C", "x":5, "y":3},
142 {"label":"V", "x":6, "y":3},
143 {"label":"B", "x":7, "y":3},
144 {"label":"N", "x":9.25, "y":3},
145 {"label":"M", "x":10.25, "y":3},
146 {"label":",", "x":11.25, "y":3},
147 {"label":".", "x":12.25, "y":3},
148 {"label":"/", "x":13.5, "y":3},
149 {"label":"&uarr;", "x":14.5, "y":3},
150 {"label":"Shift", "x":15.5, "y":3},
151
152 {"label":"4", "x": 17.5, "y":3.25},
153 {"label":"5", "x": 18.5, "y":3.25},
154 {"label":"6", "x": 19.5, "y":3.25},
155 {"label":"+", "x": 20.5, "y":2.25, "h":2},
156
157 {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
158 {"label":"Alt", "x":3.75, "y":4.25},
159 {"x":4.75, "y":4.25, "w":2.25},
160 {"label":"&dArr;", "x":7, "y":4.25},
161 {"label":"&uArr;", "x":9.25, "y":4.25},
162 {"x":10.25, "y":4.25, "w":2},
163 {"label":"GUI", "x":12.25, "y":4.25},
164 {"label":"&larr;", "x":13.5, "y":4},
165 {"label":"&darr;", "x":14.5, "y":4},
166 {"label":"&rarr;", "x":15.5, "y":4},
167
168 {"label":"1", "x": 17.5, "y":4.25},
169 {"label":"2", "x": 18.5, "y":4.25},
170 {"label":"3", "x": 19.5, "y":4.25},
171
172 {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2},
173 {"label":"Raise / .", "x": 19.5, "y":5.25},
174 {"label":"Enter", "x": 20.5, "y":4.25, "h":2}
175 ]
75 } 176 }
76 } 177 }
77} \ No newline at end of file 178}
diff --git a/keyboards/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/naked64/keymaps/default_with_setta21/keymap.c
index 5e3d8bf64..01039aaec 100644
--- a/keyboards/naked64/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/naked64/keymaps/default_with_setta21/keymap.c
@@ -30,76 +30,72 @@ enum custom_keycodes {
30 SEND_MIN 30 SEND_MIN
31}; 31};
32 32
33#define LOWER MO(_LOWER)
34#define RAISE MO(_RAISE)
35#define ADJUST MO(_ADJUST)
36#define LWR_P0 LT(_LOWER, KC_P0)
37#define RSE_DOT LT(_RAISE, KC_PDOT)
38
33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 [_QWERTY] = LAYOUT_with_setta21( \ 40 /*
35 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 41 * ,---. ,-----------------------. ,---------------------------. ,---------------.
36 KC_PGUP, 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_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC, \ 42 * |PUp| |Esc| 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |Bsp| |Esc|F2 | = |Del|
37 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 43 * |---| ,-------------------------| |---------------------------| |---------------|
38 KC_PGDN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCBR, KC_RCBR, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2, \ 44 * |PDn| | Tab | Q | W | E | R | T | | Y | U | I | O | P | [ | ] | |NLk| / | * | - |
39 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 45 * `---' ,--------------------------| |---------------------------| |---------------|
40 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL, \ 46 * | Caps | A | S | D | F | G | | H | J | K | L | ; | ' |Ent| | 7 | 8 | 9 | |
41 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 47 * ,---------------------------| |---------------------------| |-----------| + |
42 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL, \ 48 * | Shift | Z | X | C | V | B | | N | M | , | . | / |Up |Sft| | 4 | 5 | 6 | |
43 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 49 * `---------------------------| |---------------------------| |---------------|
44 MO(_ADJUST), KC_LALT, KC_SPC,MO(_LOWER), MO(_RAISE), KC_SPC, KC_LGUI, KC_LEFT, KC_DOWN,KC_RIGHT \ 50 * |Adjust| |Alt | Space |Lwr| |Rse| Space |Win|Lft|Dwn|Rgt| | 1 | 2 | 3 | |
45 //`-----------------------------------------------------------------------------------------------------------------------------------' 51 * `------' `---------------' `---------------------------' |-----------|Ent|
46 ), 52 * | 0 | . | |
47 53 * `---------------'
48 [_FLOCK] = LAYOUT_with_setta21( \ 54 */
49 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 55 [_QWERTY] = LAYOUT_with_setta21(
50 TG(_FLOCK), KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,_______,_______,_______,_______,_______, \ 56 KC_PGUP, 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_BSPC, KC_ESC, KC_F2, KC_EQL, KC_DEL,
51 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 57 KC_PGDN, KC_TAB , KC_Q , KC_W , KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCBR, KC_RCBR, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
52 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, \ 58 KC_LCTL, 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_P7, KC_P8, KC_P9,
53 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 59 KC_LSFT, KC_Z , KC_X , KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, KC_P4, KC_P5, KC_P6, KC_PPLS,
54 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, \ 60 ADJUST , KC_LALT, KC_SPC, LOWER, RAISE, KC_SPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3,
55 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 61 LWR_P0, RSE_DOT, KC_PENT
56 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, \ 62 ),
57 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 63
58 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 64 [_FLOCK] = LAYOUT_with_setta21(
59 //`-----------------------------------------------------------------------------------------------------------------------------------' 65 TG(_FLOCK), KC_ESC, 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 ), 66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
61 67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
62 [_LOWER] = LAYOUT_with_setta21( \ 68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
63 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
64 _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(_LOWER),XXXXXXX,KC_LEFT,XXXXXXX,XXXXXXX, KC_ESC, \ 70 _______, _______, _______
65 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 71 ),
66 _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, _______, KC_DOWN,KC_DOWN, KC_UP,KC_PSLS, KC_F2, \ 72
67 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 73 [_LOWER] = LAYOUT_with_setta21(
68 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST,KC_EQL, \ 74 _______, KC_ESC, 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_ESC, KC_F2, KC_EQL, KC_DEL,
69 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 75 _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, _______, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS,
70 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,KC_VOLU,_______, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL, \ 76 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, XXXXXXX, KC_UP, XXXXXXX,
71 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 77 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), _______, _______, KC_VOLU, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS,
72 _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY \ 78 _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY, XXXXXXX, KC_DOWN, XXXXXXX,
73 //`-----------------------------------------------------------------------------------------------------------------------------------' 79 LOWER, RAISE, KC_PENT
74 ), 80 ),
75 81
76 [_RAISE] = LAYOUT_with_setta21( \ 82 [_RAISE] = LAYOUT_with_setta21(
77 //,--------------------------------------------------------------| |--------------------------------------------------------------. |------------------------------------------------| 83 _______, KC_ESC, 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_ESC, KC_F2, KC_EQL, KC_DEL,
78 _______, KC_ESC, 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_F11, KC_F4, KC_F7,SEND_MIN, KC_ESC, \ 84 _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, SEND_MIN, SEND_MAX, SEND_CIF, SEND_AVE,
79 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+--------+-------| 85 _______, 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,
80 _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, KC_F12, KC_F5, KC_F8,SEND_MAX, KC_F2, \ 86 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______, KC_F4, KC_F5, KC_F6, SEND_SUM,
81 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+--------+-------| 87 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, KC_F3,
82 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, KC_F3, KC_F6, KC_F9,SEND_CIF, KC_EQL, \ 88 _______, _______, KC_RPRN
83 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+--------+-------| 89 ),
84 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______, KC_RPRN, SEND_SUM,SEND_AVE, KC_DEL, \ 90
85 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |------------------------------------------------| 91 [_ADJUST] = LAYOUT_with_setta21( /* Base */
86 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 92 TG(_FLOCK), RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______,
87 //`-----------------------------------------------------------------------------------------------------------------------------------' 93 _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______,
88 ), 94 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX,
89 95 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
90 [_ADJUST] = LAYOUT_with_setta21( /* Base */ 96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, XXXXXXX,
91 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 97 _______, _______, RGB_MOD
92 TG(_FLOCK), RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______, \ 98 )
93 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
94 _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______, \
95 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
96 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______, \
97 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------|
98 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_MOD, RGB_TOG,_______,_______, \
99 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------|
100 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
101 //`-----------------------------------------------------------------------------------------------------------------------------------'
102 )
103}; 99};
104 100
105layer_state_t layer_state_set_user(layer_state_t state) { 101layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
index 5c2877d9f..28522c5e9 100644
--- a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -42,105 +42,127 @@ qk_tap_dance_action_t tap_dance_actions[] = {
42 [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY), 42 [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
43}; 43};
44 44
45#define LOWER MO(_LOWER)
46#define RAISE MO(_RAISE)
47#define ADJUST MO(_ADJUST)
48#define LWR_ENT LT(_LOWER,KC_ENT)
49#define RSE_SPC LT(_RAISE,KC_SPC)
50#define LWR_P0 LT(_LOWER, KC_P0)
51#define RSE_DOT LT(_RAISE, KC_PDOT)
52
45const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 53const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 [_QWERTY] = LAYOUT_with_setta21( \ 54 [_QWERTY] = LAYOUT_with_setta21(
47 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 55 //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------.
48 TG(_MOUSE),TD(TD_ESFL), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC, \ 56 TG(_MOUSE),TD(TD_ESFL), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, KC_BSPC, KC_ESC, KC_F2, KC_EQL, KC_DEL,
49 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 57 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
50 TG(_BROWSER), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, JP_RBRC, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2, \ 58 TG(_BROWSER), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, JP_RBRC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
51 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 59 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
52 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_BSLS, KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL, \ 60 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_BSLS, KC_ENT, KC_P7, KC_P8, KC_P9,
53 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 61 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| |
54 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, KC_UP, KC_RSFT, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL, \ 62 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, KC_UP, KC_RSFT, KC_P4, KC_P5, KC_P6, KC_PPLS,
55 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 63 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
56 KC_ZKHK, LGUI_T(KC_MHEN),LT(_LOWER,KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),ALT_T(KC_HENK),KC_LEFT,KC_DOWN,KC_RIGHT \ 64 KC_ZKHK, LGUI_T(KC_MHEN), LWR_ENT, KC_BSPC, KC_DEL ,RSE_SPC, ALT_T(KC_HENK), KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3,
57 //`-----------------------------------------------------------------------------------------------------------------------------------' 65 //`---------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| |
58 ), 66 LWR_P0, RSE_DOT, KC_PENT
59 67 // `-----------------------------------'
60 [_MOUSE] = LAYOUT_with_setta21( \ 68 ),
61 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 69
62 TG(_MOUSE), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, \ 70 [_MOUSE] = LAYOUT_with_setta21(
63 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 71 //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------.
64 XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, \ 72 TG(_MOUSE), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
65 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 73 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, \ 74 XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
67 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 75 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
68 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,_______,_______, \ 76 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
69 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 77 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| |
70 _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R \ 78 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______,
71 //`-----------------------------------------------------------------------------------------------------------------------------------' 79 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
72 ), 80 _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______,
73 81 //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| |
74 [_BROWSER] = LAYOUT_with_setta21( \ 82 _______, _______, _______
75 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 83 // `-----------------------------------'
76 XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, \ 84 ),
77 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 85
78 TG(_BROWSER), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,_______,_______,_______,_______, \ 86 [_BROWSER] = LAYOUT_with_setta21(
79 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 87 //,--------------------------------------------------------------| |---------------------------------------------------------------------. ,-----------------------------------.
80 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______,_______,_______,_______,_______,_______, \ 88 XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
81 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 89 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------------+----------| |--------+--------+--------+--------|
82 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_T)),KC_UP,LCTL(KC_W), _______, _______,_______,_______, \ 90 TG(_BROWSER), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
83 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 91 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------------+----------| |--------+--------+--------+--------|
84 _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_TAB)),KC_DOWN,LCTL(KC_TAB) \ 92 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______,
85 //`-----------------------------------------------------------------------------------------------------------------------------------' 93 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+-------------+--------+----------| |--------+--------+--------| |
86 ), 94 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_T)), KC_UP , C(KC_W), _______, _______, _______, _______,
87 95 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------| |--------+--------+--------+--------|
88 [_FLOCK] = LAYOUT_with_setta21( \ 96 _______, _______, _______, _______, _______, _______, _______, C(S(KC_TAB)), KC_DOWN, C(KC_TAB), _______, _______, _______,
89 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 97 //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| |
90 _______,TD(TD_ESQW),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,_______,_______,_______,_______,_______, \ 98 _______, _______, _______
91 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 99 // `-----------------------------------'
92 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______, \ 100 ),
93 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 101
94 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, \ 102 [_FLOCK] = LAYOUT_with_setta21(
95 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 103 //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------.
96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, \ 104 _______,TD(TD_ESQW),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______,
97 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 105 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
98 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 106 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
99 //`-----------------------------------------------------------------------------------------------------------------------------------' 107 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
100 ), 108 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
101 109 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| |
102 [_LOWER] = LAYOUT_with_setta21( \ 110 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
103 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 111 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
104 _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(_LOWER),XXXXXXX,KC_LEFT,XXXXXXX,XXXXXXX, KC_ESC, \ 112 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
105 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 113 //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| |
106 _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_P6, KC_P7, KC_P8, KC_P9, JP_ASTR, JP_SLSH, XXXXXXX, KC_DOWN,KC_DOWN, KC_UP,KC_PSLS, KC_F2, \ 114 _______, _______, _______
107 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 115 // `-----------------------------------'
108 JP_QUOT, JP_HASH, JP_DQT, JP_LPRN, JP_RPRN, JP_AT, XXXXXXX, KC_P4, KC_P5, KC_P6, JP_MINS, JP_EQL, KC_ENT, MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST,KC_EQL, \ 116 ),
109 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 117
110 JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_P0, KC_P1, KC_P2, KC_P3, JP_PLUS, KC_UP, KC_RSFT, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL, \ 118 [_LOWER] = LAYOUT_with_setta21(
111 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 119 //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------.
112 KC_ZKHK, _______, MO(_LOWER), _______, _______, MO(_RAISE), JP_DOT, KC_LEFT, KC_DOWN, KC_RIGHT \ 120 _______, KC_ESC, 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_ESC, KC_F2, KC_EQL, KC_DEL,
113 //`-----------------------------------------------------------------------------------------------------------------------------------' 121 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
114 ), 122 _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_P6, KC_P7, KC_P8, KC_P9, JP_ASTR, JP_SLSH, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS,
115 123 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
116 [_RAISE] = LAYOUT_with_setta21( \ 124 JP_QUOT, JP_HASH, JP_DQT, JP_LPRN, JP_RPRN, JP_AT, XXXXXXX, KC_P4, KC_P5, KC_P6, JP_MINS, JP_EQL, KC_ENT, XXXXXXX, KC_UP, XXXXXXX,
117 //,--------------------------------------------------------------| |--------------------------------------------------------------. |------------------------------------------------| 125 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| |
118 _______, KC_ESC, 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_F11, KC_F4, KC_F7,SEND_MIN, KC_ESC, \ 126 JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_P0, KC_P1, KC_P2, KC_P3, JP_PLUS, KC_UP, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS,
119 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+--------+-------| 127 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
120 _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, KC_F12, KC_F5, KC_F8,SEND_MAX, KC_F2, \ 128 KC_ZKHK, _______, LOWER, _______, _______, RAISE, JP_DOT, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_DOWN, XXXXXXX,
121 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+--------+-------| 129 //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| |
122 LCTL_T(KC_F11), XXXXXXX, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______, _______, KC_F3, KC_F6, KC_F9,SEND_CIF, KC_EQL, \ 130 LOWER, RAISE, KC_PENT
123 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+--------+-------| 131 // `-----------------------------------'
124 SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______, KC_RPRN, SEND_SUM,SEND_AVE, KC_DEL, \ 132 ),
125 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |------------------------------------------------| 133
126 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 134 [_RAISE] = LAYOUT_with_setta21(
127 //`-----------------------------------------------------------------------------------------------------------------------------------' 135 //,--------------------------------------------------------------| |--------------------------------------------------------------. ,---------------------------------------.
128 ), 136 _______, KC_ESC, 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_ESC, KC_F2, KC_EQL, KC_DEL,
129 137 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------+---------|
130 138 _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, SEND_MIN, SEND_MAX, SEND_CIF, SEND_AVE,
131 [_ADJUST] = LAYOUT_with_setta21( /* Base */ 139 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------+---------|
132 //,--------------------------------------------------------------| |--------------------------------------------------------------. |-----------------------------------------------| 140 LCTL_T(KC_F11), XXXXXXX, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______, KC_F7, KC_F8, KC_F9,
133 _______, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______, \ 141 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------| |
134 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 142 SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______, KC_F4, KC_F5, KC_F6, SEND_SUM,
135 _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______, \ 143 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------+---------|
136 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 144 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, KC_F3,
137 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______, \ 145 //`-----------------------------------------------------------------------------------------------------------------------------------' |-------------------+---------| |
138 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 146 _______, _______, KC_RPRN
139 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_MOD, RGB_TOG,_______,_______, \ 147 // `---------------------------------------'
140 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------| 148 ),
141 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 149
142 //`-----------------------------------------------------------------------------------------------------------------------------------' 150
143 ) 151 [_ADJUST] = LAYOUT_with_setta21( /* Base */
152 //,--------------------------------------------------------------| |------------------------------------------------------------------------. ,-----------------------------------.
153 _______, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______,
154 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------|
155 _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______,
156 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------|
157 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX,
158 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------|
159 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
160 // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------|
161 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, XXXXXXX,
162 //`---------------------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------+--------|
163 _______, _______, RGB_MOD
164 // `-----------------------------------'
165 )
144}; 166};
145 167
146//A description for expressing the layer position in LED mode. 168//A description for expressing the layer position in LED mode.
diff --git a/keyboards/naked64/rev1/rev1.h b/keyboards/naked64/rev1/rev1.h
index a0f83749d..0ac804ee0 100644
--- a/keyboards/naked64/rev1/rev1.h
+++ b/keyboards/naked64/rev1/rev1.h
@@ -51,11 +51,12 @@
51////////////////////////////////////////////////////////////////////////////// 51//////////////////////////////////////////////////////////////////////////////
52 52
53#define LAYOUT_with_setta21( \ 53#define LAYOUT_with_setta21( \
54 L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, R00, R01, R02, R03, R04, R05, \ 54 L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, R05, R15, R25, R35, \
55 L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, R11, R12, R13, R14, R15, \ 55 L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, R04, R14, R24, R34, \
56 L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, R20, R21, R22, R23, R24, R25, \ 56 L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, R03, R13, R23, \
57 L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, R30, R32, R34, R35, \ 57 L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, R02, R12, R22, R32, \
58 L60, L71, L42, L53, L24, L74, L06, L56, L27, L77 \ 58 L60, L71, L42, L53, L24, L74, L06, L56, L27, L77, R01, R11, R21, \
59 R00, R20, R30 \
59 ) \ 60 ) \
60 { \ 61 { \
61 { L00, L01, L02, L03, L04, L05, L06, L07 }, \ 62 { L00, L01, L02, L03, L04, L05, L06, L07 }, \
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 01:19:08 +0000