aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-12-09 19:03:51 +1100
committerGitHub <noreply@github.com>2020-12-09 19:03:51 +1100
commitf440111b4bb1d7a306ee01448837d87a022c35c6 (patch)
treeda69ce74b16bd2f05eff9a82ccbde853e55e15ca /keyboards
parent56933b9b9f00a46980c1201a6ba5d0c5c9932275 (diff)
downloadqmk_firmware-f440111b4bb1d7a306ee01448837d87a022c35c6.tar.gz
qmk_firmware-f440111b4bb1d7a306ee01448837d87a022c35c6.zip
Fix titan60 and h660 error_log complaints (#11124)
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/acekeyboard/titan60/titan60.h4
-rw-r--r--keyboards/hineybush/h660s/h660s.h79
2 files changed, 50 insertions, 33 deletions
diff --git a/keyboards/acekeyboard/titan60/titan60.h b/keyboards/acekeyboard/titan60/titan60.h
index 0958967ee..219a28a8b 100644
--- a/keyboards/acekeyboard/titan60/titan60.h
+++ b/keyboards/acekeyboard/titan60/titan60.h
@@ -27,13 +27,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 27 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
28 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ 28 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
29 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k43, \ 29 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k43, \
30 k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \ 30 k40, k41, k42, k44, k46, k48, k4a, k4d, k4b, k4c, k49 \
31){ \ 31){ \
32 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ 32 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
33 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ 33 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
34 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \ 34 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
35 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ }, \ 35 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ }, \
36 { k40, k41, k42, k43, k44, ___, k46, ___, k48, ___, k4a, k4b, k4c, k4d } \ 36 { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d } \
37} 37}
38 38
39#define LAYOUT_all_ansi_2u_lshift( \ 39#define LAYOUT_all_ansi_2u_lshift( \
diff --git a/keyboards/hineybush/h660s/h660s.h b/keyboards/hineybush/h660s/h660s.h
index ec776ba7a..32099d4b7 100644
--- a/keyboards/hineybush/h660s/h660s.h
+++ b/keyboards/hineybush/h660s/h660s.h
@@ -26,19 +26,20 @@
26 * The second converts the arguments into a two-dimensional array which 26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix. 27 * represents the switch matrix.
28 */ 28 */
29#define LAYOUT_66_ansi_split_bs( \ 29#define LAYOUT_all( \
30 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, k014, \ 30 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, k014, \
31 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 31 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \
32 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k313, \ 32 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
33 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ 33 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
34 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \ 34 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \
35) { \ 35) { \
36 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \ 36 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
37 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \ 37 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
38 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \ 38 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \
39 {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 39 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
40 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \ 40 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \
41} 41}
42
42#define LAYOUT_66_ansi( \ 43#define LAYOUT_66_ansi( \
43 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ 44 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
44 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 45 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \
@@ -52,19 +53,21 @@
52 {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 53 {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
53 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \ 54 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \
54} 55}
55#define LAYOUT_66_ansi_rwkl_split_bs(\ 56
56 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, K113, k013, k014, \ 57#define LAYOUT_66_ansi_split_bs( \
58 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, k014, \
57 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 59 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \
58 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k313, \ 60 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k313, \
59 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ 61 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
60 k400, k401, k402, k407, k410, k411, k412, k413, k414 \ 62 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \
61) { \ 63) { \
62 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \ 64 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
63 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \ 65 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
64 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \ 66 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
65 {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 67 {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
66 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \ 68 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \
67} 69}
70
68#define LAYOUT_66_ansi_rwkl( \ 71#define LAYOUT_66_ansi_rwkl( \
69 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ 72 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
70 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 73 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \
@@ -79,58 +82,72 @@
79 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \ 82 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \
80} 83}
81 84
82// ISO 85#define LAYOUT_66_ansi_rwkl_split_bs( \
83 86 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, k014, \
84// also technically LAYOUT_66_iso
85#define LAYOUT_all( \
86 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, k014, \
87 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 87 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \
88 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \ 88 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k313, \
89 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ 89 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
90 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \ 90 k400, k401, k402, k407, k410, k411, k412, k413, k414 \
91) { \ 91) { \
92 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \ 92 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
93 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \ 93 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
94 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \ 94 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
95 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 95 {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
96 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \ 96 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \
97} 97}
98
98#define LAYOUT_66_iso( \ 99#define LAYOUT_66_iso( \
99 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ 100 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
100 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 101 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
101 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \ 102 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
102 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ 103 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
103 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \ 104 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \
104) { \ 105) { \
105 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \ 106 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
106 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \ 107 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
107 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \ 108 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
108 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 109 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
109 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \ 110 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \
110} 111}
111#define LAYOUT_66_iso_rwkl_split_bs( \ 112
112 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ 113#define LAYOUT_66_iso_split_bs( \
113 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 114 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, k014, \
115 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
114 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \ 116 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
115 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ 117 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
116 k400, k401, k402, k407, k410, k411, k412, k413, k414 \ 118 k400, k401, k402, k407, k409, k410, k411, k412, k413, k414 \
117) { \ 119) { \
118 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \ 120 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
119 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \ 121 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
120 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \ 122 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
121 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 123 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
122 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \ 124 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414} \
123} 125}
126
124#define LAYOUT_66_iso_rwkl( \ 127#define LAYOUT_66_iso_rwkl( \
125 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ 128 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
126 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, k114, \ 129 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
127 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \ 130 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
128 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ 131 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
129 k400, k401, k402, k407, k410, k411, k412, k413, k414 \ 132 k400, k401, k402, k407, k410, k411, k412, k413, k414 \
130) { \ 133) { \
131 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \ 134 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
132 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \ 135 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
133 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \ 136 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
137 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
138 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \
139}
140
141#define LAYOUT_66_iso_rwkl_split_bs( \
142 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, k014, \
143 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k114, \
144 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
145 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \
146 k400, k401, k402, k407, k410, k411, k412, k413, k414 \
147) { \
148 {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
149 {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
150 {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
134 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \ 151 {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
135 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \ 152 {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414} \
136} 153}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 22:19:53 +0000