diff options
author | Ole Westendorff <owestend@gmail.com> | 2020-11-09 21:26:16 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-09 21:26:16 -0800 |
commit | aa90cf1da895aaa280cc19068037c74de644bd27 (patch) | |
tree | 8da97d45113b2c38bb790873feccd06e80eac6ff | |
parent | 7595f538562437fa6d13ede5be7a5a4b5d582c6b (diff) | |
download | qmk_firmware-aa90cf1da895aaa280cc19068037c74de644bd27.tar.gz qmk_firmware-aa90cf1da895aaa280cc19068037c74de644bd27.zip |
XD68: add 65_ansi_split_bs layout (#10835)
* XD68: add 65_ansi_split_bs layuout
* change number of keys in info.json
* Apply suggestions from code review
-rw-r--r-- | keyboards/xd68/info.json | 73 | ||||
-rw-r--r-- | keyboards/xd68/rules.mk | 2 | ||||
-rwxr-xr-x | keyboards/xd68/xd68.h | 31 |
3 files changed, 105 insertions, 1 deletions
diff --git a/keyboards/xd68/info.json b/keyboards/xd68/info.json index 01b5bb201..a2ee19d7d 100644 --- a/keyboards/xd68/info.json +++ b/keyboards/xd68/info.json | |||
@@ -78,6 +78,79 @@ | |||
78 | {"label":"Right", "x":15, "y":4} | 78 | {"label":"Right", "x":15, "y":4} |
79 | ] | 79 | ] |
80 | }, | 80 | }, |
81 | "LAYOUT_65_ansi_split_bs": { | ||
82 | "layout": [ | ||
83 | {"label":"Esc", "x":0, "y":0}, | ||
84 | {"label":"1", "x":1, "y":0}, | ||
85 | {"label":"2", "x":2, "y":0}, | ||
86 | {"label":"3", "x":3, "y":0}, | ||
87 | {"label":"4", "x":4, "y":0}, | ||
88 | {"label":"5", "x":5, "y":0}, | ||
89 | {"label":"6", "x":6, "y":0}, | ||
90 | {"label":"7", "x":7, "y":0}, | ||
91 | {"label":"8", "x":8, "y":0}, | ||
92 | {"label":"9", "x":9, "y":0}, | ||
93 | {"label":"0", "x":10, "y":0}, | ||
94 | {"label":"-", "x":11, "y":0}, | ||
95 | {"label":"=", "x":12, "y":0}, | ||
96 | {"label":"Grave.", "x":13, "y":0}, | ||
97 | {"label":"Backspace", "x":14, "y":0}, | ||
98 | {"label":"Home", "x":15, "y":0}, | ||
99 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
100 | {"label":"Q", "x":1.5, "y":1}, | ||
101 | {"label":"W", "x":2.5, "y":1}, | ||
102 | {"label":"E", "x":3.5, "y":1}, | ||
103 | {"label":"R", "x":4.5, "y":1}, | ||
104 | {"label":"T", "x":5.5, "y":1}, | ||
105 | {"label":"Y", "x":6.5, "y":1}, | ||
106 | {"label":"U", "x":7.5, "y":1}, | ||
107 | {"label":"I", "x":8.5, "y":1}, | ||
108 | {"label":"O", "x":9.5, "y":1}, | ||
109 | {"label":"P", "x":10.5, "y":1}, | ||
110 | {"label":"[", "x":11.5, "y":1}, | ||
111 | {"label":"]", "x":12.5, "y":1}, | ||
112 | {"label":"\\", "x":13.5, "y":1, "w":1.5}, | ||
113 | {"label":"Page Up", "x":15, "y":1}, | ||
114 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
115 | {"label":"A", "x":1.75, "y":2}, | ||
116 | {"label":"S", "x":2.75, "y":2}, | ||
117 | {"label":"D", "x":3.75, "y":2}, | ||
118 | {"label":"F", "x":4.75, "y":2}, | ||
119 | {"label":"G", "x":5.75, "y":2}, | ||
120 | {"label":"H", "x":6.75, "y":2}, | ||
121 | {"label":"J", "x":7.75, "y":2}, | ||
122 | {"label":"K", "x":8.75, "y":2}, | ||
123 | {"label":"L", "x":9.75, "y":2}, | ||
124 | {"label":";", "x":10.75, "y":2}, | ||
125 | {"label":"'", "x":11.75, "y":2}, | ||
126 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||
127 | {"label":"Page Down", "x":15, "y":2}, | ||
128 | {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||
129 | {"label":"Z", "x":2.25, "y":3}, | ||
130 | {"label":"X", "x":3.25, "y":3}, | ||
131 | {"label":"C", "x":4.25, "y":3}, | ||
132 | {"label":"V", "x":5.25, "y":3}, | ||
133 | {"label":"B", "x":6.25, "y":3}, | ||
134 | {"label":"N", "x":7.25, "y":3}, | ||
135 | {"label":"M", "x":8.25, "y":3}, | ||
136 | {"label":",", "x":9.25, "y":3}, | ||
137 | {"label":".", "x":10.25, "y":3}, | ||
138 | {"label":"/", "x":11.25, "y":3}, | ||
139 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
140 | {"label":"Up", "x":14, "y":3}, | ||
141 | {"label":"End", "x":15, "y":3}, | ||
142 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||
143 | {"label":"GUI", "x":1.25, "y":4, "w":1.25}, | ||
144 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||
145 | {"label":"Space", "x":3.75, "y":4, "w":6.25}, | ||
146 | {"label":"Menu", "x":10, "y":4}, | ||
147 | {"label":"Ctrl", "x":11, "y":4}, | ||
148 | {"label":"Fn", "x":12, "y":4}, | ||
149 | {"label":"Left", "x":13, "y":4}, | ||
150 | {"label":"Down", "x":14, "y":4}, | ||
151 | {"label":"Right", "x":15, "y":4} | ||
152 | ] | ||
153 | }, | ||
81 | "LAYOUT_65_iso": { | 154 | "LAYOUT_65_iso": { |
82 | "key_count": 69, | 155 | "key_count": 69, |
83 | "layout": [ | 156 | "layout": [ |
diff --git a/keyboards/xd68/rules.mk b/keyboards/xd68/rules.mk index 8d52ba327..e47967395 100644 --- a/keyboards/xd68/rules.mk +++ b/keyboards/xd68/rules.mk | |||
@@ -32,4 +32,4 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | |||
32 | HD44780_ENABLE = no # Enable support for HD44780 based LCDs | 32 | HD44780_ENABLE = no # Enable support for HD44780 based LCDs |
33 | UNICODE_ENABLE = no # Unicode | 33 | UNICODE_ENABLE = no # Unicode |
34 | 34 | ||
35 | LAYOUTS = 65_ansi 65_iso | 35 | LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso |
diff --git a/keyboards/xd68/xd68.h b/keyboards/xd68/xd68.h index f4347928f..c4cd20db5 100755 --- a/keyboards/xd68/xd68.h +++ b/keyboards/xd68/xd68.h | |||
@@ -69,6 +69,37 @@ | |||
69 | {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e} \ | 69 | {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e} \ |
70 | } | 70 | } |
71 | 71 | ||
72 | /* XD68 ANSI layout with split backspace | ||
73 | * ,----------------------------------------------------------------. | ||
74 | * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d| 49| 0e | | ||
75 | * |----------------------------------------------------------------| | ||
76 | * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e | | ||
77 | * |----------------------------------------------------------------| | ||
78 | * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d | 2e | | ||
79 | * |----------------------------------------------------------------| | ||
80 | * | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e | | ||
81 | * |----------------------------------------------------------------| | ||
82 | * | 40 | 41 | 42 | 45 | 48| 4a| 4b| 4c| 4d| 4e | | ||
83 | * `----------------------------------------------------------------' | ||
84 | */ | ||
85 | // The first section contains all of the arguments | ||
86 | // The second converts the arguments into a two-dimensional array | ||
87 | |||
88 | #define LAYOUT_65_ansi_split_bs( \ | ||
89 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k49, k0e, \ | ||
90 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ | ||
91 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, \ | ||
92 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ | ||
93 | k40, k41, k42, k45, k48, k4a, k4b, k4c, k4d, k4e \ | ||
94 | ) \ | ||
95 | { \ | ||
96 | {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ | ||
97 | {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ | ||
98 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \ | ||
99 | {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ | ||
100 | {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, k49, k48, k4a, k4c, k4d, k4e} \ | ||
101 | } | ||
102 | |||
72 | /* XD68 ISO layout | 103 | /* XD68 ISO layout |
73 | * ,----------------------------------------------------------------. | 104 | * ,----------------------------------------------------------------. |
74 | * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | | 105 | * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | |