summaryrefslogtreecommitdiff
path: root/keyboards/dailycraft
diff options
context:
space:
mode:
authorStefan Kerkmann <karlk90@pm.me>2023-04-03 10:33:45 +0200
committerGitHub <noreply@github.com>2023-04-03 18:33:45 +1000
commitfcf8b804ed95a98561bd4c1d6c85604be0f7cc7b (patch)
tree6b6917d99ced027d614e7b461e1cd1939833a9cd /keyboards/dailycraft
parent2d9140af53e4e5bbc5cd50a2b6f3eda20ed8f71e (diff)
[Core] Refactor `keyevent_t` for 1ms timing resolution (#15847)
Diffstat (limited to 'keyboards/dailycraft')
-rw-r--r--keyboards/dailycraft/owl8/keymaps/via/keymap.c28
-rw-r--r--keyboards/dailycraft/stickey4/keymaps/via/keymap.c28
-rw-r--r--keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c56
3 files changed, 64 insertions, 48 deletions
diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
index 6e3f6ea90b..667392b946 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
@@ -52,46 +52,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 52
53keyevent_t encoder1_ccw = { 53keyevent_t encoder1_ccw = {
54 .key = (keypos_t){.row = 0, .col = 12}, 54 .key = (keypos_t){.row = 0, .col = 12},
55 .pressed = false 55 .pressed = false,
56 .type = KEY_EVENT
56}; 57};
57 58
58keyevent_t encoder1_cw = { 59keyevent_t encoder1_cw = {
59 .key = (keypos_t){.row = 0, .col = 13}, 60 .key = (keypos_t){.row = 0, .col = 13},
60 .pressed = false 61 .pressed = false,
62 .type = KEY_EVENT
61}; 63};
62 64
63keyevent_t encoder2_ccw = { 65keyevent_t encoder2_ccw = {
64 .key = (keypos_t){.row = 0, .col = 14}, 66 .key = (keypos_t){.row = 0, .col = 14},
65 .pressed = false 67 .pressed = false,
68 .type = KEY_EVENT
66}; 69};
67 70
68keyevent_t encoder2_cw = { 71keyevent_t encoder2_cw = {
69 .key = (keypos_t){.row = 0, .col = 15}, 72 .key = (keypos_t){.row = 0, .col = 15},
70 .pressed = false 73 .pressed = false,
74 .type = KEY_EVENT
71}; 75};
72 76
73void matrix_scan_user(void) { 77void matrix_scan_user(void) {
74 if (IS_PRESSED(encoder1_ccw)) { 78 if (IS_PRESSED(encoder1_ccw)) {
75 encoder1_ccw.pressed = false; 79 encoder1_ccw.pressed = false;
76 encoder1_ccw.time = (timer_read() | 1); 80 encoder1_ccw.time = timer_read();
77 action_exec(encoder1_ccw); 81 action_exec(encoder1_ccw);
78 } 82 }
79 83
80 if (IS_PRESSED(encoder1_cw)) { 84 if (IS_PRESSED(encoder1_cw)) {
81 encoder1_cw.pressed = false; 85 encoder1_cw.pressed = false;
82 encoder1_cw.time = (timer_read() | 1); 86 encoder1_cw.time = timer_read();
83 action_exec(encoder1_cw); 87 action_exec(encoder1_cw);
84 } 88 }
85 89
86 if (IS_PRESSED(encoder2_ccw)) { 90 if (IS_PRESSED(encoder2_ccw)) {
87 encoder2_ccw.pressed = false; 91 encoder2_ccw.pressed = false;
88 encoder2_ccw.time = (timer_read() | 1); 92 encoder2_ccw.time = timer_read();
89 action_exec(encoder2_ccw); 93 action_exec(encoder2_ccw);
90 } 94 }
91 95
92 if (IS_PRESSED(encoder2_cw)) { 96 if (IS_PRESSED(encoder2_cw)) {
93 encoder2_cw.pressed = false; 97 encoder2_cw.pressed = false;
94 encoder2_cw.time = (timer_read() | 1); 98 encoder2_cw.time = timer_read();
95 action_exec(encoder2_cw); 99 action_exec(encoder2_cw);
96 } 100 }
97} 101}
@@ -100,21 +104,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
100 if (index == 0) { /* First encoder */ 104 if (index == 0) { /* First encoder */
101 if (clockwise) { 105 if (clockwise) {
102 encoder1_cw.pressed = true; 106 encoder1_cw.pressed = true;
103 encoder1_cw.time = (timer_read() | 1); 107 encoder1_cw.time = timer_read();
104 action_exec(encoder1_cw); 108 action_exec(encoder1_cw);
105 } else { 109 } else {
106 encoder1_ccw.pressed = true; 110 encoder1_ccw.pressed = true;
107 encoder1_ccw.time = (timer_read() | 1); 111 encoder1_ccw.time = timer_read();
108 action_exec(encoder1_ccw); 112 action_exec(encoder1_ccw);
109 } 113 }
110 } else if (index == 1) { 114 } else if (index == 1) {
111 if (clockwise) { 115 if (clockwise) {
112 encoder2_cw.pressed = true; 116 encoder2_cw.pressed = true;
113 encoder2_cw.time = (timer_read() | 1); 117 encoder2_cw.time = timer_read();
114 action_exec(encoder2_cw); 118 action_exec(encoder2_cw);
115 } else { 119 } else {
116 encoder2_ccw.pressed = true; 120 encoder2_ccw.pressed = true;
117 encoder2_ccw.time = (timer_read() | 1); 121 encoder2_ccw.time = timer_read();
118 action_exec(encoder2_ccw); 122 action_exec(encoder2_ccw);
119 } 123 }
120 } 124 }
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
index 602d3fb10d..30d8ad188e 100644
--- a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
@@ -44,46 +44,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44 44
45keyevent_t encoder1_ccw = { 45keyevent_t encoder1_ccw = {
46 .key = (keypos_t){.row = 0, .col = 4}, 46 .key = (keypos_t){.row = 0, .col = 4},
47 .pressed = false 47 .pressed = false,
48 .type = KEY_EVENT
48}; 49};
49 50
50keyevent_t encoder1_cw = { 51keyevent_t encoder1_cw = {
51 .key = (keypos_t){.row = 0, .col = 5}, 52 .key = (keypos_t){.row = 0, .col = 5},
52 .pressed = false 53 .pressed = false,
54 .type = KEY_EVENT
53}; 55};
54 56
55keyevent_t encoder2_ccw = { 57keyevent_t encoder2_ccw = {
56 .key = (keypos_t){.row = 0, .col = 6}, 58 .key = (keypos_t){.row = 0, .col = 6},
57 .pressed = false 59 .pressed = false,
60 .type = KEY_EVENT
58}; 61};
59 62
60keyevent_t encoder2_cw = { 63keyevent_t encoder2_cw = {
61 .key = (keypos_t){.row = 0, .col = 7}, 64 .key = (keypos_t){.row = 0, .col = 7},
62 .pressed = false 65 .pressed = false,
66 .type = KEY_EVENT
63}; 67};
64 68
65void matrix_scan_user(void) { 69void matrix_scan_user(void) {
66 if (IS_PRESSED(encoder1_ccw)) { 70 if (IS_PRESSED(encoder1_ccw)) {
67 encoder1_ccw.pressed = false; 71 encoder1_ccw.pressed = false;
68 encoder1_ccw.time = (timer_read() | 1); 72 encoder1_ccw.time = timer_read();
69 action_exec(encoder1_ccw); 73 action_exec(encoder1_ccw);
70 } 74 }
71 75
72 if (IS_PRESSED(encoder1_cw)) { 76 if (IS_PRESSED(encoder1_cw)) {
73 encoder1_cw.pressed = false; 77 encoder1_cw.pressed = false;
74 encoder1_cw.time = (timer_read() | 1); 78 encoder1_cw.time = timer_read();
75 action_exec(encoder1_cw); 79 action_exec(encoder1_cw);
76 } 80 }
77 81
78 if (IS_PRESSED(encoder2_ccw)) { 82 if (IS_PRESSED(encoder2_ccw)) {
79 encoder2_ccw.pressed = false; 83 encoder2_ccw.pressed = false;
80 encoder2_ccw.time = (timer_read() | 1); 84 encoder2_ccw.time = timer_read();
81 action_exec(encoder2_ccw); 85 action_exec(encoder2_ccw);
82 } 86 }
83 87
84 if (IS_PRESSED(encoder2_cw)) { 88 if (IS_PRESSED(encoder2_cw)) {
85 encoder2_cw.pressed = false; 89 encoder2_cw.pressed = false;
86 encoder2_cw.time = (timer_read() | 1); 90 encoder2_cw.time = timer_read();
87 action_exec(encoder2_cw); 91 action_exec(encoder2_cw);
88 } 92 }
89} 93}
@@ -92,21 +96,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
92 if (index == 0) { /* First encoder */ 96 if (index == 0) { /* First encoder */
93 if (clockwise) { 97 if (clockwise) {
94 encoder1_cw.pressed = true; 98 encoder1_cw.pressed = true;
95 encoder1_cw.time = (timer_read() | 1); 99 encoder1_cw.time = timer_read();
96 action_exec(encoder1_cw); 100 action_exec(encoder1_cw);
97 } else { 101 } else {
98 encoder1_ccw.pressed = true; 102 encoder1_ccw.pressed = true;
99 encoder1_ccw.time = (timer_read() | 1); 103 encoder1_ccw.time = timer_read();
100 action_exec(encoder1_ccw); 104 action_exec(encoder1_ccw);
101 } 105 }
102 } else if (index == 1) { 106 } else if (index == 1) {
103 if (clockwise) { 107 if (clockwise) {
104 encoder2_cw.pressed = true; 108 encoder2_cw.pressed = true;
105 encoder2_cw.time = (timer_read() | 1); 109 encoder2_cw.time = timer_read();
106 action_exec(encoder2_cw); 110 action_exec(encoder2_cw);
107 } else { 111 } else {
108 encoder2_ccw.pressed = true; 112 encoder2_ccw.pressed = true;
109 encoder2_ccw.time = (timer_read() | 1); 113 encoder2_ccw.time = timer_read();
110 action_exec(encoder2_ccw); 114 action_exec(encoder2_ccw);
111 } 115 }
112 } 116 }
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index 97f94366a8..5655d2ca48 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -82,91 +82,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 82
83keyevent_t encoder1_ccw = { 83keyevent_t encoder1_ccw = {
84 .key = (keypos_t){.row = 4, .col = 0}, 84 .key = (keypos_t){.row = 4, .col = 0},
85 .pressed = false 85 .pressed = false,
86 .type = KEY_EVENT
86}; 87};
87 88
88keyevent_t encoder1_cw = { 89keyevent_t encoder1_cw = {
89 .key = (keypos_t){.row = 4, .col = 1}, 90 .key = (keypos_t){.row = 4, .col = 1},
90 .pressed = false 91 .pressed = false,
92 .type = KEY_EVENT
91}; 93};
92 94
93keyevent_t encoder2_ccw = { 95keyevent_t encoder2_ccw = {
94 .key = (keypos_t){.row = 4, .col = 2}, 96 .key = (keypos_t){.row = 4, .col = 2},
95 .pressed = false 97 .pressed = false,
98 .type = KEY_EVENT
96}; 99};
97 100
98keyevent_t encoder2_cw = { 101keyevent_t encoder2_cw = {
99 .key = (keypos_t){.row = 4, .col = 3}, 102 .key = (keypos_t){.row = 4, .col = 3},
100 .pressed = false 103 .pressed = false,
104 .type = KEY_EVENT
101}; 105};
102 106
103keyevent_t encoder3_ccw = { 107keyevent_t encoder3_ccw = {
104 .key = (keypos_t){.row = 9, .col = 1}, 108 .key = (keypos_t){.row = 9, .col = 1},
105 .pressed = false 109 .pressed = false,
110 .type = KEY_EVENT
106}; 111};
107 112
108keyevent_t encoder3_cw = { 113keyevent_t encoder3_cw = {
109 .key = (keypos_t){.row = 9, .col = 0}, 114 .key = (keypos_t){.row = 9, .col = 0},
110 .pressed = false 115 .pressed = false,
116 .type = KEY_EVENT
111}; 117};
112 118
113keyevent_t encoder4_ccw = { 119keyevent_t encoder4_ccw = {
114 .key = (keypos_t){.row = 9, .col = 3}, 120 .key = (keypos_t){.row = 9, .col = 3},
115 .pressed = false 121 .pressed = false,
122 .type = KEY_EVENT
116}; 123};
117 124
118keyevent_t encoder4_cw = { 125keyevent_t encoder4_cw = {
119 .key = (keypos_t){.row = 9, .col = 2}, 126 .key = (keypos_t){.row = 9, .col = 2},
120 .pressed = false 127 .pressed = false,
128 .type = KEY_EVENT
121}; 129};
122 130
123 131
124void matrix_scan_user(void) { 132void matrix_scan_user(void) {
125 if (IS_PRESSED(encoder1_ccw)) { 133 if (IS_PRESSED(encoder1_ccw)) {
126 encoder1_ccw.pressed = false; 134 encoder1_ccw.pressed = false;
127 encoder1_ccw.time = (timer_read() | 1); 135 encoder1_ccw.time = timer_read();
128 action_exec(encoder1_ccw); 136 action_exec(encoder1_ccw);
129 } 137 }
130 138
131 if (IS_PRESSED(encoder1_cw)) { 139 if (IS_PRESSED(encoder1_cw)) {
132 encoder1_cw.pressed = false; 140 encoder1_cw.pressed = false;
133 encoder1_cw.time = (timer_read() | 1); 141 encoder1_cw.time = timer_read();
134 action_exec(encoder1_cw); 142 action_exec(encoder1_cw);
135 } 143 }
136 144
137 if (IS_PRESSED(encoder2_ccw)) { 145 if (IS_PRESSED(encoder2_ccw)) {
138 encoder2_ccw.pressed = false; 146 encoder2_ccw.pressed = false;
139 encoder2_ccw.time = (timer_read() | 1); 147 encoder2_ccw.time = timer_read();
140 action_exec(encoder2_ccw); 148 action_exec(encoder2_ccw);
141 } 149 }
142 150
143 if (IS_PRESSED(encoder2_cw)) { 151 if (IS_PRESSED(encoder2_cw)) {
144 encoder2_cw.pressed = false; 152 encoder2_cw.pressed = false;
145 encoder2_cw.time = (timer_read() | 1); 153 encoder2_cw.time = timer_read();
146 action_exec(encoder2_cw); 154 action_exec(encoder2_cw);
147 } 155 }
148 156
149 if (IS_PRESSED(encoder3_ccw)) { 157 if (IS_PRESSED(encoder3_ccw)) {
150 encoder3_ccw.pressed = false; 158 encoder3_ccw.pressed = false;
151 encoder3_ccw.time = (timer_read() | 1); 159 encoder3_ccw.time = timer_read();
152 action_exec(encoder3_ccw); 160 action_exec(encoder3_ccw);
153 } 161 }
154 162
155 if (IS_PRESSED(encoder3_cw)) { 163 if (IS_PRESSED(encoder3_cw)) {
156 encoder3_cw.pressed = false; 164 encoder3_cw.pressed = false;
157 encoder3_cw.time = (timer_read() | 1); 165 encoder3_cw.time = timer_read();
158 action_exec(encoder3_cw); 166 action_exec(encoder3_cw);
159 } 167 }
160 168
161 if (IS_PRESSED(encoder4_ccw)) { 169 if (IS_PRESSED(encoder4_ccw)) {
162 encoder4_ccw.pressed = false; 170 encoder4_ccw.pressed = false;
163 encoder4_ccw.time = (timer_read() | 1); 171 encoder4_ccw.time = timer_read();
164 action_exec(encoder4_ccw); 172 action_exec(encoder4_ccw);
165 } 173 }
166 174
167 if (IS_PRESSED(encoder4_cw)) { 175 if (IS_PRESSED(encoder4_cw)) {
168 encoder4_cw.pressed = false; 176 encoder4_cw.pressed = false;
169 encoder4_cw.time = (timer_read() | 1); 177 encoder4_cw.time = timer_read();
170 action_exec(encoder4_cw); 178 action_exec(encoder4_cw);
171 } 179 }
172} 180}
@@ -175,41 +183,41 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
175 if (index == 0) { 183 if (index == 0) {
176 if (clockwise) { 184 if (clockwise) {
177 encoder1_cw.pressed = true; 185 encoder1_cw.pressed = true;
178 encoder1_cw.time = (timer_read() | 1); 186 encoder1_cw.time = timer_read();
179 action_exec(encoder1_cw); 187 action_exec(encoder1_cw);
180 } else { 188 } else {
181 encoder1_ccw.pressed = true; 189 encoder1_ccw.pressed = true;
182 encoder1_ccw.time = (timer_read() | 1); 190 encoder1_ccw.time = timer_read();
183 action_exec(encoder1_ccw); 191 action_exec(encoder1_ccw);
184 } 192 }
185 } else if (index == 1) { 193 } else if (index == 1) {
186 if (clockwise) { 194 if (clockwise) {
187 encoder2_cw.pressed = true; 195 encoder2_cw.pressed = true;
188 encoder2_cw.time = (timer_read() | 1); 196 encoder2_cw.time = timer_read();
189 action_exec(encoder2_cw); 197 action_exec(encoder2_cw);
190 } else { 198 } else {
191 encoder2_ccw.pressed = true; 199 encoder2_ccw.pressed = true;
192 encoder2_ccw.time = (timer_read() | 1); 200 encoder2_ccw.time = timer_read();
193 action_exec(encoder2_ccw); 201 action_exec(encoder2_ccw);
194 } 202 }
195 } else if (index == 2) { 203 } else if (index == 2) {
196 if (clockwise) { 204 if (clockwise) {
197 encoder3_cw.pressed = true; 205 encoder3_cw.pressed = true;
198 encoder3_cw.time = (timer_read() | 1); 206 encoder3_cw.time = timer_read();
199 action_exec(encoder3_cw); 207 action_exec(encoder3_cw);
200 } else { 208 } else {
201 encoder3_ccw.pressed = true; 209 encoder3_ccw.pressed = true;
202 encoder3_ccw.time = (timer_read() | 1); 210 encoder3_ccw.time = timer_read();
203 action_exec(encoder3_ccw); 211 action_exec(encoder3_ccw);
204 } 212 }
205 } else if (index == 3) { 213 } else if (index == 3) {
206 if (clockwise) { 214 if (clockwise) {
207 encoder4_cw.pressed = true; 215 encoder4_cw.pressed = true;
208 encoder4_cw.time = (timer_read() | 1); 216 encoder4_cw.time = timer_read();
209 action_exec(encoder4_cw); 217 action_exec(encoder4_cw);
210 } else { 218 } else {
211 encoder4_ccw.pressed = true; 219 encoder4_ccw.pressed = true;
212 encoder4_ccw.time = (timer_read() | 1); 220 encoder4_ccw.time = timer_read();
213 action_exec(encoder4_ccw); 221 action_exec(encoder4_ccw);
214 } 222 }
215 } 223 }
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:38:14 +0000