aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-11-19 06:13:05 +0000
committerGitHub <noreply@github.com>2021-11-18 22:13:05 -0800
commit4f764519ab3fbca7c7f2ac5a8ec5d42ae1968663 (patch)
tree6fb20ae28d7dc61f29f8d5d3f74b162ee44ac7ca
parent9cdbc040cd352aa1f44022c90f137ba5bcbe1c36 (diff)
downloadqmk_firmware-4f764519ab3fbca7c7f2ac5a8ec5d42ae1968663.tar.gz
qmk_firmware-4f764519ab3fbca7c7f2ac5a8ec5d42ae1968663.zip
Chalice: Fix QMK Configurator Implementation (#15206)
Diffstat
-rw-r--r--keyboards/chalice/chalice.h62
-rw-r--r--keyboards/chalice/info.json139
2 files changed, 141 insertions, 60 deletions
diff --git a/keyboards/chalice/chalice.h b/keyboards/chalice/chalice.h
index a0bc0026f..c55cd4ba0 100644
--- a/keyboards/chalice/chalice.h
+++ b/keyboards/chalice/chalice.h
@@ -17,44 +17,44 @@
17 17
18#pragma once 18#pragma once
19 19
20#define ____ KC_NO 20#define ___ KC_NO
21 21
22#include "quantum.h" 22#include "quantum.h"
23 23
24#define LAYOUT_default( \ 24#define LAYOUT_default( \
25 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ 25 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, \
26 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ 26 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56, \
27 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ 27 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76, \
28 K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \ 28 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96, \
29 K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \ 29 K80, K91, K82, K92, K83, K93, K84, K94, K85, K95 \
30) { \ 30) { \
31 { K000, K002, K004, K006, K008, K010, K012 }, \ 31 { K00, K01, K02, K03, K04, K05, K06 }, \
32 { K001, K003, K005, K007, K009, K011, K013 }, \ 32 { K10, K11, K12, K13, K14, K15, K16 }, \
33 { K100, K102, K104, K106, K108, K110, K112 }, \ 33 { K20, K21, K22, K23, K24, K25, K26 }, \
34 { K101, K103, K105, K107, K109, K111, K113 }, \ 34 { K30, K31, K32, K33, K34, K35, K36 }, \
35 { K200, K202, K204, K206, K208, K210, K014 }, \ 35 { K40, K41, K42, K43, K44, K45, K46 }, \
36 { K201, K203, K205, K207, K209, K211, K114 }, \ 36 { K50, K51, K52, K53, K54, K55, K56 }, \
37 { K301, K303, K305, K307, K309, K311, K212 }, \ 37 { K60, K61, K62, K63, K64, K65, K66 }, \
38 { K302, K304, K306, K308, K310, K312, K213 }, \ 38 { K70, K71, K72, K73, K74, K75, K76 }, \
39 { K401, ____, K404, K408, K411, K413, K313 }, \ 39 { K80, ___, K82, K83, K84, K85, K86 }, \
40 { ____, K402, K406, K410, K412, K314, K214 } \ 40 { ___, K91, K92, K93, K94, K95, K96 } \
41} 41}
42 42
43#define LAYOUT_split_bs( \ 43#define LAYOUT_split_bs( \
44 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K403, \ 44 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, K81, \
45 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ 45 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56, \
46 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ 46 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76, \
47 K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \ 47 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96, \
48 K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \ 48 K80, K91, K82, K92, K83, K93, K84, K94, K85, K95 \
49) { \ 49) { \
50 { K000, K002, K004, K006, K008, K010, K012 }, \ 50 { K00, K01, K02, K03, K04, K05, K06 }, \
51 { K001, K003, K005, K007, K009, K011, K013 }, \ 51 { K10, K11, K12, K13, K14, K15, K16 }, \
52 { K100, K102, K104, K106, K108, K110, K112 }, \ 52 { K20, K21, K22, K23, K24, K25, K26 }, \
53 { K101, K103, K105, K107, K109, K111, K113 }, \ 53 { K30, K31, K32, K33, K34, K35, K36 }, \
54 { K200, K202, K204, K206, K208, K210, K014 }, \ 54 { K40, K41, K42, K43, K44, K45, K46 }, \
55 { K201, K203, K205, K207, K209, K211, K114 }, \ 55 { K50, K51, K52, K53, K54, K55, K56 }, \
56 { K301, K303, K305, K307, K309, K311, K212 }, \ 56 { K60, K61, K62, K63, K64, K65, K66 }, \
57 { K302, K304, K306, K308, K310, K312, K213 }, \ 57 { K70, K71, K72, K73, K74, K75, K76 }, \
58 { K401, K403, K404, K408, K411, K413, K313 }, \ 58 { K80, K81, K82, K83, K84, K85, K86 }, \
59 { ____, K402, K406, K410, K412, K314, K214 } \ 59 { ___, K91, K92, K93, K94, K95, K96 } \
60} 60}
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index 68bd710a3..77a3f7bc1 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -1,25 +1,27 @@
1{ 1{
2 "keyboard_name": "Chalice", 2 "keyboard_name": "Chalice",
3 "url": "https://customkbd.com/products/chalice-pre-order", 3 "url": "https://customkbd.com/products/chalice-pre-order",
4 "maintainer": "CustomKBD", 4 "maintainer": "joshajohnson, CustomKBD",
5 "layouts": { 5 "layouts": {
6 "LAYOUT_default": { 6 "LAYOUT_default": {
7 "layout": [ 7 "layout": [
8 {"label":"Esc", "x":0, "y":0}, 8 {"label":"Esc", "x":0, "y":0},
9 {"label":"~", "x":1.5, "y":0}, 9 {"label":"`~", "x":1.5, "y":0},
10 {"label":"!", "x":2.5, "y":0}, 10 {"label":"1!", "x":2.5, "y":0},
11 {"label":"@", "x":3.5, "y":0}, 11 {"label":"2@", "x":3.5, "y":0},
12 {"label":"#", "x":4.5, "y":0}, 12 {"label":"3#", "x":4.5, "y":0},
13 {"label":"$", "x":5.5, "y":0}, 13 {"label":"4$", "x":5.5, "y":0},
14 {"label":"%", "x":6.5, "y":0}, 14 {"label":"5%", "x":6.5, "y":0},
15 {"label":"^", "x":7.5, "y":0}, 15 {"label":"6^", "x":7.5, "y":0},
16 {"label":"&", "x":10.5, "y":0}, 16 {"label":"7&", "x":10.5, "y":0},
17 {"label":"*", "x":11.5, "y":0}, 17 {"label":"8*", "x":11.5, "y":0},
18 {"label":"(", "x":12.5, "y":0}, 18 {"label":"9(", "x":12.5, "y":0},
19 {"label":")", "x":13.5, "y":0}, 19 {"label":"0)", "x":13.5, "y":0},
20 {"label":"_", "x":14.5, "y":0}, 20 {"label":"-_", "x":14.5, "y":0},
21 {"label":"+", "x":15.5, "y":0}, 21 {"label":"=+", "x":15.5, "y":0},
22 {"label":"Backspace", "x":16.5, "y":0, "w":2}, 22 {"label":"Backspace", "x":16.5, "y":0, "w":2},
23
24 {"label":"Insert", "x":0, "y":1},
23 {"label":"Tab", "x":1.5, "y":1, "w":1.5}, 25 {"label":"Tab", "x":1.5, "y":1, "w":1.5},
24 {"label":"Q", "x":3, "y":1}, 26 {"label":"Q", "x":3, "y":1},
25 {"label":"W", "x":4, "y":1}, 27 {"label":"W", "x":4, "y":1},
@@ -31,10 +33,10 @@
31 {"label":"I", "x":12, "y":1}, 33 {"label":"I", "x":12, "y":1},
32 {"label":"O", "x":13, "y":1}, 34 {"label":"O", "x":13, "y":1},
33 {"label":"P", "x":14, "y":1}, 35 {"label":"P", "x":14, "y":1},
34 {"label":"{", "x":15, "y":1}, 36 {"label":"[{", "x":15, "y":1},
35 {"label":"}", "x":16, "y":1}, 37 {"label":"]}", "x":16, "y":1},
36 {"label":"|", "x":17, "y":1, "w":1.5}, 38 {"label":"\\|", "x":17, "y":1, "w":1.5},
37 {"label":"Mute", "x":19, "y":0.5}, 39
38 {"label":"Delete", "x":0, "y":2}, 40 {"label":"Delete", "x":0, "y":2},
39 {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, 41 {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
40 {"label":"A", "x":3.25, "y":2}, 42 {"label":"A", "x":3.25, "y":2},
@@ -46,9 +48,10 @@
46 {"label":"J", "x":11.25, "y":2}, 48 {"label":"J", "x":11.25, "y":2},
47 {"label":"K", "x":12.25, "y":2}, 49 {"label":"K", "x":12.25, "y":2},
48 {"label":"L", "x":13.25, "y":2}, 50 {"label":"L", "x":13.25, "y":2},
49 {"label":":", "x":14.25, "y":2}, 51 {"label":";:", "x":14.25, "y":2},
50 {"label":"\"", "x":15.25, "y":2}, 52 {"label":"'\"", "x":15.25, "y":2},
51 {"label":"Enter", "x":16.25, "y":2, "w":2.25}, 53 {"label":"Enter", "x":16.25, "y":2, "w":2.25},
54
52 {"label":"Shift", "x":1.5, "y":3, "w":2.25}, 55 {"label":"Shift", "x":1.5, "y":3, "w":2.25},
53 {"label":"Z", "x":3.75, "y":3}, 56 {"label":"Z", "x":3.75, "y":3},
54 {"label":"X", "x":4.75, "y":3}, 57 {"label":"X", "x":4.75, "y":3},
@@ -58,21 +61,99 @@
58 {"label":"B", "x":9.75, "y":3}, 61 {"label":"B", "x":9.75, "y":3},
59 {"label":"N", "x":10.75, "y":3}, 62 {"label":"N", "x":10.75, "y":3},
60 {"label":"M", "x":11.75, "y":3}, 63 {"label":"M", "x":11.75, "y":3},
61 {"label":"<", "x":12.75, "y":3}, 64 {"label":",<", "x":12.75, "y":3},
62 {"label":">", "x":13.75, "y":3}, 65 {"label":".>", "x":13.75, "y":3},
63 {"label":"?", "x":14.75, "y":3}, 66 {"label":"/?", "x":14.75, "y":3},
64 {"label":"Shift", "x":15.75, "y":3, "w":1.75}, 67 {"label":"Shift", "x":15.75, "y":3, "w":1.75},
65 {"label":"Up", "x":17.75, "y":3.25}, 68 {"label":"Up", "x":17.5, "y":3},
69
66 {"label":"Ctrl", "x":1.5, "y":4, "w":1.5}, 70 {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
67 {"label":"Alt", "x":4.5, "y":4, "w":1.5}, 71 {"label":"Alt", "x":4.5, "y":4, "w":1.5},
68 {"label":"Space", "x":6, "y":4, "w":2}, 72 {"label":"Space", "x":6, "y":4, "w":2.25},
69 {"label":"Fn", "x":8, "y":4}, 73 {"label":"Fn", "x":8.25, "y":4},
70 {"label":"Space", "x":9.75, "y":4, "w":2.75}, 74 {"label":"Space", "x":9.75, "y":4, "w":2.75},
71 {"label":"Alt", "x":12.5, "y":4, "w":1.5}, 75 {"label":"Alt", "x":12.5, "y":4, "w":1.5},
72 {"label":"Ctrl", "x":15, "y":4, "w":1.5}, 76 {"label":"Ctrl", "x":15, "y":4, "w":1.5},
73 {"label":"Left", "x":16.75, "y":4.25}, 77 {"label":"Left", "x":16.5, "y":4},
74 {"label":"Down", "x":17.75, "y":4.25}, 78 {"label":"Down", "x":17.5, "y":4},
75 {"label":"Right", "x":18.75, "y":4.25} 79 {"label":"Right", "x":18.5, "y":4}
80 ]
81 },
82 "LAYOUT_split_bs": {
83 "layout": [
84 {"label":"Esc", "x":0, "y":0},
85 {"label":"`~", "x":1.5, "y":0},
86 {"label":"1!", "x":2.5, "y":0},
87 {"label":"2@", "x":3.5, "y":0},
88 {"label":"3#", "x":4.5, "y":0},
89 {"label":"4$", "x":5.5, "y":0},
90 {"label":"5%", "x":6.5, "y":0},
91 {"label":"6^", "x":7.5, "y":0},
92 {"label":"7&", "x":10.5, "y":0},
93 {"label":"8*", "x":11.5, "y":0},
94 {"label":"9(", "x":12.5, "y":0},
95 {"label":"0)", "x":13.5, "y":0},
96 {"label":"-_", "x":14.5, "y":0},
97 {"label":"=+", "x":15.5, "y":0},
98 {"label":"Backspace", "x":16.5, "y":0},
99 {"label":"Backspace", "x":17.5, "y":0},
100
101 {"label":"Insert", "x":0, "y":1},
102 {"label":"Tab", "x":1.5, "y":1, "w":1.5},
103 {"label":"Q", "x":3, "y":1},
104 {"label":"W", "x":4, "y":1},
105 {"label":"E", "x":5, "y":1},
106 {"label":"R", "x":6, "y":1},
107 {"label":"T", "x":7, "y":1},
108 {"label":"Y", "x":10, "y":1},
109 {"label":"U", "x":11, "y":1},
110 {"label":"I", "x":12, "y":1},
111 {"label":"O", "x":13, "y":1},
112 {"label":"P", "x":14, "y":1},
113 {"label":"[{", "x":15, "y":1},
114 {"label":"]}", "x":16, "y":1},
115 {"label":"\\|", "x":17, "y":1, "w":1.5},
116
117 {"label":"Delete", "x":0, "y":2},
118 {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
119 {"label":"A", "x":3.25, "y":2},
120 {"label":"S", "x":4.25, "y":2},
121 {"label":"D", "x":5.25, "y":2},
122 {"label":"F", "x":6.25, "y":2},
123 {"label":"G", "x":7.25, "y":2},
124 {"label":"H", "x":10.25, "y":2},
125 {"label":"J", "x":11.25, "y":2},
126 {"label":"K", "x":12.25, "y":2},
127 {"label":"L", "x":13.25, "y":2},
128 {"label":";:", "x":14.25, "y":2},
129 {"label":"'\"", "x":15.25, "y":2},
130 {"label":"Enter", "x":16.25, "y":2, "w":2.25},
131
132 {"label":"Shift", "x":1.5, "y":3, "w":2.25},
133 {"label":"Z", "x":3.75, "y":3},
134 {"label":"X", "x":4.75, "y":3},
135 {"label":"C", "x":5.75, "y":3},
136 {"label":"V", "x":6.75, "y":3},
137 {"label":"B", "x":7.75, "y":3},
138 {"label":"B", "x":9.75, "y":3},
139 {"label":"N", "x":10.75, "y":3},
140 {"label":"M", "x":11.75, "y":3},
141 {"label":",<", "x":12.75, "y":3},
142 {"label":".>", "x":13.75, "y":3},
143 {"label":"/?", "x":14.75, "y":3},
144 {"label":"Shift", "x":15.75, "y":3, "w":1.75},
145 {"label":"Up", "x":17.5, "y":3},
146
147 {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
148 {"label":"Alt", "x":4.5, "y":4, "w":1.5},
149 {"label":"Space", "x":6, "y":4, "w":2.25},
150 {"label":"Fn", "x":8.25, "y":4},
151 {"label":"Space", "x":9.75, "y":4, "w":2.75},
152 {"label":"Alt", "x":12.5, "y":4, "w":1.5},
153 {"label":"Ctrl", "x":15, "y":4, "w":1.5},
154 {"label":"Left", "x":16.5, "y":4},
155 {"label":"Down", "x":17.5, "y":4},
156 {"label":"Right", "x":18.5, "y":4}
76 ] 157 ]
77 } 158 }
78 } 159 }
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 21:06:11 +0000