diff options
author | Ryan <fauxpark@gmail.com> | 2021-09-01 19:03:14 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-01 19:03:14 +1000 |
commit | 41c50bb653b840c595fb31541729d892f68666e6 (patch) | |
tree | ba05c7c9654f7be1104b20f3195dd2cf288e004e /keyboards/ktec | |
parent | 971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (diff) | |
download | qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.tar.gz qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.zip |
Change keyboard level include guards to `pragma once` (#14248)
* Change keyboard level include guards to `pragma once`
And clean up a lot of layout macros
* Oops
* Remove dangling endif
Diffstat (limited to 'keyboards/ktec')
-rw-r--r-- | keyboards/ktec/ergodone/config.h | 5 | ||||
-rw-r--r-- | keyboards/ktec/ergodone/ergodone.h | 197 | ||||
-rw-r--r-- | keyboards/ktec/ergodone/expander.h | 5 |
3 files changed, 89 insertions, 118 deletions
diff --git a/keyboards/ktec/ergodone/config.h b/keyboards/ktec/ergodone/config.h index 39e0ae8c7..db626ab80 100644 --- a/keyboards/ktec/ergodone/config.h +++ b/keyboards/ktec/ergodone/config.h | |||
@@ -1,5 +1,4 @@ | |||
1 | #ifndef ERGODOX_ERGODONE_CONFIG_H | 1 | #pragma once |
2 | #define ERGODOX_ERGODONE_CONFIG_H | ||
3 | 2 | ||
4 | #include "config_common.h" | 3 | #include "config_common.h" |
5 | 4 | ||
@@ -77,5 +76,3 @@ | |||
77 | //#define NO_ACTION_MACRO | 76 | //#define NO_ACTION_MACRO |
78 | //#define NO_ACTION_FUNCTION | 77 | //#define NO_ACTION_FUNCTION |
79 | //#define DEBUG_MATRIX_SCAN_RATE | 78 | //#define DEBUG_MATRIX_SCAN_RATE |
80 | |||
81 | #endif | ||
diff --git a/keyboards/ktec/ergodone/ergodone.h b/keyboards/ktec/ergodone/ergodone.h index f88280fa2..1da817e96 100644 --- a/keyboards/ktec/ergodone/ergodone.h +++ b/keyboards/ktec/ergodone/ergodone.h | |||
@@ -1,5 +1,4 @@ | |||
1 | #ifndef ERGODOX_ERGODONE_H | 1 | #pragma once |
2 | #define ERGODOX_ERGODONE_H | ||
3 | 2 | ||
4 | #include "quantum.h" | 3 | #include "quantum.h" |
5 | #include <stdint.h> | 4 | #include <stdint.h> |
@@ -67,116 +66,94 @@ inline void ergodox_right_led_3_set(uint8_t n) {} | |||
67 | inline void ergodox_right_led_set(uint8_t l, uint8_t n) {} | 66 | inline void ergodox_right_led_set(uint8_t l, uint8_t n) {} |
68 | inline void ergodox_led_all_set(uint8_t n) {} | 67 | inline void ergodox_led_all_set(uint8_t n) {} |
69 | 68 | ||
70 | /* | 69 | #define XXX KC_NO |
71 | * LEFT HAND: LINES 76-83 | ||
72 | * RIGHT HAND: LINES 85-92 | ||
73 | */ | ||
74 | #define LAYOUT_ergodox( \ | ||
75 | \ | ||
76 | k00,k01,k02,k03,k04,k05,k06, \ | ||
77 | k10,k11,k12,k13,k14,k15,k16, \ | ||
78 | k20,k21,k22,k23,k24,k25, \ | ||
79 | k30,k31,k32,k33,k34,k35,k36, \ | ||
80 | k40,k41,k42,k43,k44, \ | ||
81 | k55,k56, \ | ||
82 | k54, \ | ||
83 | k53,k52,k51, \ | ||
84 | \ | ||
85 | k07,k08,k09,k0A,k0B,k0C,k0D, \ | ||
86 | k17,k18,k19,k1A,k1B,k1C,k1D, \ | ||
87 | k28,k29,k2A,k2B,k2C,k2D, \ | ||
88 | k37,k38,k39,k3A,k3B,k3C,k3D, \ | ||
89 | k49,k4A,k4B,k4C,k4D, \ | ||
90 | k57,k58, \ | ||
91 | k59, \ | ||
92 | k5C,k5B,k5A ) \ | ||
93 | \ | ||
94 | /* matrix positions */ \ | ||
95 | { \ | ||
96 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ | ||
97 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ | ||
98 | { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \ | ||
99 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ | ||
100 | { k40, k41, k42, k43, k44, KC_NO, KC_NO, KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D }, \ | ||
101 | { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ | ||
102 | } | ||
103 | 70 | ||
104 | /* | 71 | #define LAYOUT_ergodox( \ |
105 | * LEFT HAND: LINES 110-117 | 72 | k00, k01, k02, k03, k04, k05, k06, \ |
106 | * RIGHT HAND: LINES 119-126 | 73 | k10, k11, k12, k13, k14, k15, k16, \ |
107 | */ | 74 | k20, k21, k22, k23, k24, k25, \ |
108 | #define LAYOUT_ergodox_80( \ | 75 | k30, k31, k32, k33, k34, k35, k36, \ |
109 | \ | 76 | k40, k41, k42, k43, k44, \ |
110 | k00,k01,k02,k03,k04,k05,k06, \ | 77 | k55, k56, \ |
111 | k10,k11,k12,k13,k14,k15,k16, \ | 78 | k54, \ |
112 | k20,k21,k22,k23,k24,k25, \ | 79 | k53, k52, k51, \ |
113 | k30,k31,k32,k33,k34,k35,k36, \ | 80 | \ |
114 | k40,k41,k42,k43,k44, \ | 81 | k07, k08, k09, k0A, k0B, k0C, k0D, \ |
115 | k55,k56, \ | 82 | k17, k18, k19, k1A, k1B, k1C, k1D, \ |
116 | k45,k46,k54, \ | 83 | k28, k29, k2A, k2B, k2C, k2D, \ |
117 | k53,k52,k51, \ | 84 | k37, k38, k39, k3A, k3B, k3C, k3D, \ |
118 | \ | 85 | k49, k4A, k4B, k4C, k4D, \ |
119 | k07,k08,k09,k0A,k0B,k0C,k0D, \ | 86 | k57, k58, \ |
120 | k17,k18,k19,k1A,k1B,k1C,k1D, \ | 87 | k59, \ |
121 | k28,k29,k2A,k2B,k2C,k2D, \ | 88 | k5C, k5B, k5A \ |
122 | k37,k38,k39,k3A,k3B,k3C,k3D, \ | 89 | ) { \ |
123 | k49,k4A,k4B,k4C,k4D, \ | 90 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ |
124 | k57,k58, \ | 91 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ |
125 | k59,k47,k48, \ | 92 | { k20, k21, k22, k23, k24, k25, XXX, XXX, k28, k29, k2A, k2B, k2C, k2D }, \ |
126 | k5C,k5B,k5A ) \ | 93 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ |
127 | \ | 94 | { k40, k41, k42, k43, k44, XXX, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D }, \ |
128 | /* matrix positions */ \ | 95 | { XXX, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, XXX } \ |
129 | { \ | 96 | } |
130 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ | ||
131 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ | ||
132 | { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \ | ||
133 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ | ||
134 | { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \ | ||
135 | { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ | ||
136 | } | ||
137 | 97 | ||
138 | /* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ | 98 | #define LAYOUT_ergodox_80( \ |
139 | #define LAYOUT_ergodox_pretty( \ | 99 | k00, k01, k02, k03, k04, k05, k06, \ |
140 | \ | 100 | k10, k11, k12, k13, k14, k15, k16, \ |
141 | L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ | 101 | k20, k21, k22, k23, k24, k25, \ |
142 | L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ | 102 | k30, k31, k32, k33, k34, k35, k36, \ |
143 | L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ | 103 | k40, k41, k42, k43, k44, \ |
144 | L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ | 104 | k55, k56, \ |
145 | L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ | 105 | k45, k46, k54, \ |
146 | L55,L56, R50,R51, \ | 106 | k53, k52, k51, \ |
147 | L54, R52, \ | 107 | \ |
148 | L53,L52,L51, R55,R54,R53 ) \ | 108 | k07, k08, k09, k0A, k0B, k0C, k0D, \ |
149 | \ | 109 | k17, k18, k19, k1A, k1B, k1C, k1D, \ |
150 | /* matrix positions */ \ | 110 | k28, k29, k2A, k2B, k2C, k2D, \ |
151 | { \ | 111 | k37, k38, k39, k3A, k3B, k3C, k3D, \ |
152 | { L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06 }, \ | 112 | k49, k4A, k4B, k4C, k4D, \ |
153 | { L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16 }, \ | 113 | k57, k58, \ |
154 | { L20,L21,L22,L23,L24,L25,KC_NO, KC_NO,R21,R22,R23,R24,R25,R26 }, \ | 114 | k59, k47, k48, \ |
155 | { L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36 }, \ | 115 | k5C, k5B, k5A \ |
156 | { L40,L41,L42,L43,L44,KC_NO,KC_NO, KC_NO,KC_NO,R42,R43,R44,R45,R46 }, \ | 116 | ) { \ |
157 | { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ | 117 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ |
118 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ | ||
119 | { k20, k21, k22, k23, k24, k25, XXX, XXX, k28, k29, k2A, k2B, k2C, k2D }, \ | ||
120 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ | ||
121 | { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \ | ||
122 | { XXX, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, XXX } \ | ||
158 | } | 123 | } |
159 | 124 | ||
160 | /* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ | 125 | #define LAYOUT_ergodox_pretty( \ |
161 | #define LAYOUT_ergodox_pretty_80( \ | 126 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ |
162 | \ | 127 | L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ |
163 | L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \ | 128 | L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ |
164 | L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ | 129 | L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ |
165 | L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \ | 130 | L40, L41, L42, L43, L44, R42, R43, R44, R45, R46, \ |
166 | L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \ | 131 | L55, L56, R50, R51, \ |
167 | L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \ | 132 | L54, R52, \ |
168 | L55,L56, R50,R51, \ | 133 | L53, L52, L51, R55, R54, R53 \ |
169 | L45,L46,L54, R52,R40,R41, \ | 134 | ) { \ |
170 | L53,L52,L51, R55,R54,R53 ) \ | 135 | { L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06 }, \ |
171 | \ | 136 | { L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16 }, \ |
172 | /* matrix positions */ \ | 137 | { L20, L21, L22, L23, L24, L25, XXX, XXX, R21, R22, R23, R24, R25, R26 }, \ |
173 | { \ | 138 | { L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 }, \ |
174 | { L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06 }, \ | 139 | { L40, L41, L42, L43, L44, XXX, XXX, XXX, XXX, R42, R43, R44, R45, R46 }, \ |
175 | { L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16 }, \ | 140 | { XXX, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, XXX } \ |
176 | { L20,L21,L22,L23,L24,L25,KC_NO, KC_NO,R21,R22,R23,R24,R25,R26 }, \ | 141 | } |
177 | { L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36 }, \ | ||
178 | { L40,L41,L42,L43,L44,L45,L46, R40,R41,R42,R43,R44,R45,R46 }, \ | ||
179 | { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \ | ||
180 | } | ||
181 | 142 | ||
182 | #endif | 143 | #define LAYOUT_ergodox_pretty_80( \ |
144 | L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ | ||
145 | L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ | ||
146 | L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ | ||
147 | L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ | ||
148 | L40, L41, L42, L43, L44, R42, R43, R44, R45, R46, \ | ||
149 | L55, L56, R50, R51, \ | ||
150 | L45, L46, L54, R52, R40, R41, \ | ||
151 | L53, L52, L51, R55, R54, R53 \ | ||
152 | ) { \ | ||
153 | { L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06 }, \ | ||
154 | { L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16 }, \ | ||
155 | { L20, L21, L22, L23, L24, L25, XXX, XXX, R21, R22, R23, R24, R25, R26 }, \ | ||
156 | { L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 }, \ | ||
157 | { L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 }, \ | ||
158 | { XXX, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, XXX } \ | ||
159 | } | ||
diff --git a/keyboards/ktec/ergodone/expander.h b/keyboards/ktec/ergodone/expander.h index 8676fed69..071570c40 100644 --- a/keyboards/ktec/ergodone/expander.h +++ b/keyboards/ktec/ergodone/expander.h | |||
@@ -1,5 +1,4 @@ | |||
1 | #ifndef EXPANDER_H | 1 | #pragma once |
2 | #define EXPANDER_H | ||
3 | 2 | ||
4 | #include <stdint.h> | 3 | #include <stdint.h> |
5 | #include "matrix.h" | 4 | #include "matrix.h" |
@@ -44,5 +43,3 @@ uint8_t expander_get_col(uint8_t col); | |||
44 | matrix_row_t expander_read_row(void); | 43 | matrix_row_t expander_read_row(void); |
45 | void expander_unselect_rows(void); | 44 | void expander_unselect_rows(void); |
46 | void expander_select_row(uint8_t row); | 45 | void expander_select_row(uint8_t row); |
47 | |||
48 | #endif | ||