aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-02 17:52:46 -0700
committerGitHub <noreply@github.com>2021-08-02 17:52:46 -0700
commitbe9031d01d3195f75243ef3bd2b3fed369e2c85a (patch)
treee5ad1f8132b0a9623adf17b31a1e5f84a6b89f7c
parentc2f227d2a87d6258bca6d2f96b6fc475e2fe54f5 (diff)
downloadqmk_firmware-be9031d01d3195f75243ef3bd2b3fed369e2c85a.tar.gz
qmk_firmware-be9031d01d3195f75243ef3bd2b3fed369e2c85a.zip
0xCB Static: fix `qmk info` and Configurator issues (#13856)
Diffstat
-rw-r--r--keyboards/0xcb/static/info.json5
-rw-r--r--keyboards/0xcb/static/keymaps/default/keymap.c8
-rw-r--r--keyboards/0xcb/static/keymaps/via/keymap.c8
-rw-r--r--keyboards/0xcb/static/static.h52
4 files changed, 47 insertions, 26 deletions
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index d646471be..e1ea7132b 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -4,8 +4,11 @@
4 "maintainer": "Conor-Burns", 4 "maintainer": "Conor-Burns",
5 "width": 12, 5 "width": 12,
6 "height": 5, 6 "height": 5,
7 "layout_aliases": {
8 "LAYOUT": "LAYOUT_all"
9 },
7 "layouts": { 10 "layouts": {
8 "LAYOUT": { 11 "LAYOUT_all": {
9 "layout": [ 12 "layout": [
10 {"x":11, "y":0}, 13 {"x":11, "y":0},
11 {"x":0, "y":1}, 14 {"x":0, "y":1},
diff --git a/keyboards/0xcb/static/keymaps/default/keymap.c b/keyboards/0xcb/static/keymaps/default/keymap.c
index 2e051d270..e83d6c904 100644
--- a/keyboards/0xcb/static/keymaps/default/keymap.c
+++ b/keyboards/0xcb/static/keymaps/default/keymap.c
@@ -23,28 +23,28 @@ enum layer_names {
23 _FN4 23 _FN4
24}; 24};
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26[_HOME] = LAYOUT( 26[_HOME] = LAYOUT_all(
27 KC_MPLY, 27 KC_MPLY,
28 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 28 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
29 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, 29 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
30 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSPC, 30 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSPC,
31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), MO(2) 31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), MO(2)
32), 32),
33[_FN2] = LAYOUT( 33[_FN2] = LAYOUT_all(
34 RESET, 34 RESET,
35 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, 35 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
36 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, 36 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______ 38 _______, _______, _______, _______, _______, _______, _______, _______, _______
39), 39),
40[_FN3] = LAYOUT( 40[_FN3] = LAYOUT_all(
41 EEP_RST, 41 EEP_RST,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
43 _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH,
45 _______, _______, _______, _______, _______, _______, _______, _______, _______ 45 _______, _______, _______, _______, _______, _______, _______, _______, _______
46), 46),
47[_FN4] = LAYOUT( 47[_FN4] = LAYOUT_all(
48 _______, 48 _______,
49 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_MSTP, KC_INS, KC_HOME, KC_DEL, KC_END, _______, 49 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_MSTP, KC_INS, KC_HOME, KC_DEL, KC_END, _______,
50 _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, 50 _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______,
diff --git a/keyboards/0xcb/static/keymaps/via/keymap.c b/keyboards/0xcb/static/keymaps/via/keymap.c
index c860c941d..4b8bf3ae5 100644
--- a/keyboards/0xcb/static/keymaps/via/keymap.c
+++ b/keyboards/0xcb/static/keymaps/via/keymap.c
@@ -23,28 +23,28 @@ enum layer_names {
23 _FN4 23 _FN4
24}; 24};
25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 25const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26[_HOME] = LAYOUT( 26[_HOME] = LAYOUT_all(
27 KC_MPLY, 27 KC_MPLY,
28 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 28 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
29 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, 29 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
30 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSPC, 30 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSPC,
31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), MO(2) 31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), MO(2)
32), 32),
33[_FN2] = LAYOUT( 33[_FN2] = LAYOUT_all(
34 RESET, 34 RESET,
35 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, 35 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
36 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, 36 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______ 38 _______, _______, _______, _______, _______, _______, _______, _______, _______
39), 39),
40[_FN3] = LAYOUT( 40[_FN3] = LAYOUT_all(
41 EEP_RST, 41 EEP_RST,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
43 _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH,
45 _______, _______, _______, _______, _______, _______, _______, _______, _______ 45 _______, _______, _______, _______, _______, _______, _______, _______, _______
46), 46),
47[_FN4] = LAYOUT( 47[_FN4] = LAYOUT_all(
48 _______, 48 _______,
49 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_MSTP, KC_INS, KC_HOME, KC_DEL, KC_END, _______, 49 _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_MSTP, KC_INS, KC_HOME, KC_DEL, KC_END, _______,
50 _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, 50 _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______,
diff --git a/keyboards/0xcb/static/static.h b/keyboards/0xcb/static/static.h
index 81be5a263..19b698ef3 100644
--- a/keyboards/0xcb/static/static.h
+++ b/keyboards/0xcb/static/static.h
@@ -28,21 +28,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28 */ 28 */
29 29
30// clang-format off 30// clang-format off
31 #define LAYOUT( \ 31#define LAYOUT_all( \
32 K15, \ 32 K15, \
33 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \ 33 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \
34 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \ 34 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \
35 K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \ 35 K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \
36 K60, K70, K61, K71, K72, K64, K74, K65, K75 \ 36 K60, K70, K61, K71, K72, K64, K74, K65, K75 \
37 ) \ 37) \
38 { \ 38{ \
39 { K00, K01, K02, K03, K04, K05 }, \ 39 { K00, K01, K02, K03, K04, K05 }, \
40 { K10, K11, K12, K13, K14, K15 }, \ 40 { K10, K11, K12, K13, K14, K15 }, \
41 { K20, K21, K22, K23, K24, K25 }, \ 41 { K20, K21, K22, K23, K24, K25 }, \
42 { K30, K31, K32, K33, K34, K35 }, \ 42 { K30, K31, K32, K33, K34, K35 }, \
43 { K40, K41, K42, K43, K44, K45 }, \ 43 { K40, K41, K42, K43, K44, K45 }, \
44 { KC_NO, K51, K52, K53, K54, K55 }, \ 44 { KC_NO, K51, K52, K53, K54, K55 }, \
45 { K60, K61, KC_NO, KC_NO, K64, K65 }, \ 45 { K60, K61, KC_NO, KC_NO, K64, K65 }, \
46 { K70, K71, K72, KC_NO, K74, K75 }, \ 46 { K70, K71, K72, KC_NO, K74, K75 }, \
47 } 47}
48
49#define LAYOUT_bigbar( \
50 K15, \
51 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \
52 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \
53 K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \
54 K60, K70, K61, K72, K65, K75 \
55) \
56{ \
57 { K00, K01, K02, K03, K04, K05 }, \
58 { K10, K11, K12, K13, K14, K15 }, \
59 { K20, K21, K22, K23, K24, K25 }, \
60 { K30, K31, K32, K33, K34, K35 }, \
61 { K40, K41, K42, K43, K44, K45 }, \
62 { KC_NO, K51, K52, K53, K54, K55 }, \
63 { K60, K61, KC_NO, KC_NO, KC_NO, K65 }, \
64 { K70, KC_NO, K72, KC_NO, KC_NO, K75 }, \
65}
48// clang-format on 66// clang-format on
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 05:15:34 +0000