diff options
| author | jack <jack@pngu.org> | 2024-08-29 20:21:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-29 20:21:53 -0600 |
| commit | d4811c19b06029c1925d46b073f5478e72352194 (patch) | |
| tree | f433df32757da828f068e3c0d22271fe2d9aacb9 /keyboards | |
| parent | 496f4480907e45be7b04a318b62d1ed6d2aa7f08 (diff) | |
Fix wrong OLED code for a few keyboards (#24344)
* Initial
* Other keyboards too
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/keycapsss/kimiko/keymaps/default/keymap.c | 212 | ||||
| -rw-r--r-- | keyboards/keycapsss/kimiko/rev2/rev2.c | 4 | ||||
| -rw-r--r-- | keyboards/splitkb/aurora/helix/helix.c | 82 | ||||
| -rw-r--r-- | keyboards/splitkb/aurora/lily58/lily58.c | 80 | ||||
| -rw-r--r-- | keyboards/splitkb/aurora/sofle_v2/sofle_v2.c | 80 | ||||
| -rw-r--r-- | keyboards/splitkb/aurora/sweep/sweep.c | 80 |
6 files changed, 163 insertions, 375 deletions
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c index 32b4a7d6eb..c61fdfc03a 100644 --- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c +++ b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c | |||
| @@ -122,216 +122,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
| 122 | return state; | 122 | return state; |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | #ifdef OLED_ENABLE | ||
| 126 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | ||
| 127 | if (is_keyboard_master()) { | ||
| 128 | return OLED_ROTATION_270; | ||
| 129 | } else { | ||
| 130 | return OLED_ROTATION_270; | ||
| 131 | } | ||
| 132 | } | ||
| 133 | |||
| 134 | void render_space(void) { | ||
| 135 | oled_write_P(PSTR(" "), false); | ||
| 136 | } | ||
| 137 | |||
| 138 | void render_mod_status_gui_alt(uint8_t modifiers) { | ||
| 139 | static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0}; | ||
| 140 | static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0}; | ||
| 141 | static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0}; | ||
| 142 | static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0}; | ||
| 143 | |||
| 144 | static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0}; | ||
| 145 | static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0}; | ||
| 146 | static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0}; | ||
| 147 | static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0}; | ||
| 148 | |||
| 149 | // fillers between the modifier icons bleed into the icon frames | ||
| 150 | static const char PROGMEM off_off_1[] = {0xc5, 0}; | ||
| 151 | static const char PROGMEM off_off_2[] = {0xc6, 0}; | ||
| 152 | static const char PROGMEM on_off_1[] = {0xc7, 0}; | ||
| 153 | static const char PROGMEM on_off_2[] = {0xc8, 0}; | ||
| 154 | static const char PROGMEM off_on_1[] = {0xc9, 0}; | ||
| 155 | static const char PROGMEM off_on_2[] = {0xca, 0}; | ||
| 156 | static const char PROGMEM on_on_1[] = {0xcb, 0}; | ||
| 157 | static const char PROGMEM on_on_2[] = {0xcc, 0}; | ||
| 158 | |||
| 159 | if(modifiers & MOD_MASK_GUI) { | ||
| 160 | oled_write_P(gui_on_1, false); | ||
| 161 | } else { | ||
| 162 | oled_write_P(gui_off_1, false); | ||
| 163 | } | ||
| 164 | |||
| 165 | if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { | ||
| 166 | oled_write_P(on_on_1, false); | ||
| 167 | } else if(modifiers & MOD_MASK_GUI) { | ||
| 168 | oled_write_P(on_off_1, false); | ||
| 169 | } else if(modifiers & MOD_MASK_ALT) { | ||
| 170 | oled_write_P(off_on_1, false); | ||
| 171 | } else { | ||
| 172 | oled_write_P(off_off_1, false); | ||
| 173 | } | ||
| 174 | |||
| 175 | if(modifiers & MOD_MASK_ALT) { | ||
| 176 | oled_write_P(alt_on_1, false); | ||
| 177 | } else { | ||
| 178 | oled_write_P(alt_off_1, false); | ||
| 179 | } | ||
| 180 | |||
| 181 | if(modifiers & MOD_MASK_GUI) { | ||
| 182 | oled_write_P(gui_on_2, false); | ||
| 183 | } else { | ||
| 184 | oled_write_P(gui_off_2, false); | ||
| 185 | } | ||
| 186 | |||
| 187 | if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { | ||
| 188 | oled_write_P(on_on_2, false); | ||
| 189 | } else if(modifiers & MOD_MASK_GUI) { | ||
| 190 | oled_write_P(on_off_2, false); | ||
| 191 | } else if(modifiers & MOD_MASK_ALT) { | ||
| 192 | oled_write_P(off_on_2, false); | ||
| 193 | } else { | ||
| 194 | oled_write_P(off_off_2, false); | ||
| 195 | } | ||
| 196 | |||
| 197 | if(modifiers & MOD_MASK_ALT) { | ||
| 198 | oled_write_P(alt_on_2, false); | ||
| 199 | } else { | ||
| 200 | oled_write_P(alt_off_2, false); | ||
| 201 | } | ||
| 202 | } | ||
| 203 | |||
| 204 | void render_mod_status_ctrl_shift(uint8_t modifiers) { | ||
| 205 | static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0}; | ||
| 206 | static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0}; | ||
| 207 | static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0}; | ||
| 208 | static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0}; | ||
| 209 | |||
| 210 | static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0}; | ||
| 211 | static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0}; | ||
| 212 | static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0}; | ||
| 213 | static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0}; | ||
| 214 | |||
| 215 | // fillers between the modifier icons bleed into the icon frames | ||
| 216 | static const char PROGMEM off_off_1[] = {0xc5, 0}; | ||
| 217 | static const char PROGMEM off_off_2[] = {0xc6, 0}; | ||
| 218 | static const char PROGMEM on_off_1[] = {0xc7, 0}; | ||
| 219 | static const char PROGMEM on_off_2[] = {0xc8, 0}; | ||
| 220 | static const char PROGMEM off_on_1[] = {0xc9, 0}; | ||
| 221 | static const char PROGMEM off_on_2[] = {0xca, 0}; | ||
| 222 | static const char PROGMEM on_on_1[] = {0xcb, 0}; | ||
| 223 | static const char PROGMEM on_on_2[] = {0xcc, 0}; | ||
| 224 | |||
| 225 | if(modifiers & MOD_MASK_CTRL) { | ||
| 226 | oled_write_P(ctrl_on_1, false); | ||
| 227 | } else { | ||
| 228 | oled_write_P(ctrl_off_1, false); | ||
| 229 | } | ||
| 230 | |||
| 231 | if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { | ||
| 232 | oled_write_P(on_on_1, false); | ||
| 233 | } else if(modifiers & MOD_MASK_CTRL) { | ||
| 234 | oled_write_P(on_off_1, false); | ||
| 235 | } else if(modifiers & MOD_MASK_SHIFT) { | ||
| 236 | oled_write_P(off_on_1, false); | ||
| 237 | } else { | ||
| 238 | oled_write_P(off_off_1, false); | ||
| 239 | } | ||
| 240 | |||
| 241 | if(modifiers & MOD_MASK_SHIFT) { | ||
| 242 | oled_write_P(shift_on_1, false); | ||
| 243 | } else { | ||
| 244 | oled_write_P(shift_off_1, false); | ||
| 245 | } | ||
| 246 | |||
| 247 | if(modifiers & MOD_MASK_CTRL) { | ||
| 248 | oled_write_P(ctrl_on_2, false); | ||
| 249 | } else { | ||
| 250 | oled_write_P(ctrl_off_2, false); | ||
| 251 | } | ||
| 252 | |||
| 253 | if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { | ||
| 254 | oled_write_P(on_on_2, false); | ||
| 255 | } else if(modifiers & MOD_MASK_CTRL) { | ||
| 256 | oled_write_P(on_off_2, false); | ||
| 257 | } else if(modifiers & MOD_MASK_SHIFT) { | ||
| 258 | oled_write_P(off_on_2, false); | ||
| 259 | } else { | ||
| 260 | oled_write_P(off_off_2, false); | ||
| 261 | } | ||
| 262 | |||
| 263 | if(modifiers & MOD_MASK_SHIFT) { | ||
| 264 | oled_write_P(shift_on_2, false); | ||
| 265 | } else { | ||
| 266 | oled_write_P(shift_off_2, false); | ||
| 267 | } | ||
| 268 | } | ||
| 269 | |||
| 270 | void render_logo(void) { | ||
| 271 | static const char PROGMEM corne_logo[] = { | ||
| 272 | 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, | ||
| 273 | 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0}; | ||
| 274 | oled_write_P(corne_logo, false); | ||
| 275 | // oled_write_P(PSTR("Kimiko"), false); | ||
| 276 | } | ||
| 277 | |||
| 278 | void render_layer_state(void) { | ||
| 279 | static const char PROGMEM default_layer[] = { | ||
| 280 | 0x20, 0x94, 0x95, 0x96, 0x20, | ||
| 281 | 0x20, 0xb4, 0xb5, 0xb6, 0x20, | ||
| 282 | 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0}; | ||
| 283 | static const char PROGMEM raise_layer[] = { | ||
| 284 | 0x20, 0x97, 0x98, 0x99, 0x20, | ||
| 285 | 0x20, 0xb7, 0xb8, 0xb9, 0x20, | ||
| 286 | 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0}; | ||
| 287 | static const char PROGMEM lower_layer[] = { | ||
| 288 | 0x20, 0x9a, 0x9b, 0x9c, 0x20, | ||
| 289 | 0x20, 0xba, 0xbb, 0xbc, 0x20, | ||
| 290 | 0x20, 0xda, 0xdb, 0xdc, 0x20, 0}; | ||
| 291 | static const char PROGMEM adjust_layer[] = { | ||
| 292 | 0x20, 0x9d, 0x9e, 0x9f, 0x20, | ||
| 293 | 0x20, 0xbd, 0xbe, 0xbf, 0x20, | ||
| 294 | 0x20, 0xdd, 0xde, 0xdf, 0x20, 0}; | ||
| 295 | if(layer_state_is(_ADJUST)) { | ||
| 296 | oled_write_P(adjust_layer, false); | ||
| 297 | } else if(layer_state_is(_LOWER)) { | ||
| 298 | oled_write_P(lower_layer, false); | ||
| 299 | } else if(layer_state_is(_RAISE)) { | ||
| 300 | oled_write_P(raise_layer, false); | ||
| 301 | } else { | ||
| 302 | oled_write_P(default_layer, false); | ||
| 303 | } | ||
| 304 | } | ||
| 305 | |||
| 306 | void render_status_main(void) { | ||
| 307 | render_space(); | ||
| 308 | render_space(); | ||
| 309 | render_logo(); | ||
| 310 | render_space(); | ||
| 311 | render_layer_state(); | ||
| 312 | render_space(); | ||
| 313 | render_mod_status_gui_alt(get_mods()|get_oneshot_mods()); | ||
| 314 | render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods()); | ||
| 315 | } | ||
| 316 | |||
| 317 | void render_status_secondary(void) { | ||
| 318 | render_space(); | ||
| 319 | render_space(); | ||
| 320 | render_logo(); | ||
| 321 | render_space(); | ||
| 322 | } | ||
| 323 | |||
| 324 | bool oled_task_user(void) { | ||
| 325 | if (is_keyboard_master()) { | ||
| 326 | render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | ||
| 327 | } else { | ||
| 328 | render_status_secondary(); | ||
| 329 | } | ||
| 330 | return false; | ||
| 331 | } | ||
| 332 | |||
| 333 | #endif | ||
| 334 | |||
| 335 | #if defined(ENCODER_MAP_ENABLE) | 125 | #if defined(ENCODER_MAP_ENABLE) |
| 336 | const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | 126 | const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { |
| 337 | [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, | 127 | [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, |
| @@ -340,5 +130,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | |||
| 340 | [_ADJUST] = { ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(UG_SATD, UG_SATU) }, | 130 | [_ADJUST] = { ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(UG_SATD, UG_SATU) }, |
| 341 | }; | 131 | }; |
| 342 | #endif // ENCODER_MAP_ENABLE | 132 | #endif // ENCODER_MAP_ENABLE |
| 343 | |||
| 344 | |||
diff --git a/keyboards/keycapsss/kimiko/rev2/rev2.c b/keyboards/keycapsss/kimiko/rev2/rev2.c index c5765812c0..a7031b7a47 100644 --- a/keyboards/keycapsss/kimiko/rev2/rev2.c +++ b/keyboards/keycapsss/kimiko/rev2/rev2.c | |||
| @@ -76,7 +76,7 @@ void render_mod_status_gui_alt(uint8_t modifiers) { | |||
| 76 | oled_write_P(gui_off_2, false); | 76 | oled_write_P(gui_off_2, false); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { | 79 | if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { |
| 80 | oled_write_P(on_on_2, false); | 80 | oled_write_P(on_on_2, false); |
| 81 | } else if (modifiers & MOD_MASK_GUI) { | 81 | } else if (modifiers & MOD_MASK_GUI) { |
| 82 | oled_write_P(on_off_2, false); | 82 | oled_write_P(on_off_2, false); |
| @@ -142,7 +142,7 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 142 | oled_write_P(ctrl_off_2, false); | 142 | oled_write_P(ctrl_off_2, false); |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { | 145 | if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { |
| 146 | oled_write_P(on_on_2, false); | 146 | oled_write_P(on_on_2, false); |
| 147 | } else if (modifiers & MOD_MASK_CTRL) { | 147 | } else if (modifiers & MOD_MASK_CTRL) { |
| 148 | oled_write_P(on_off_2, false); | 148 | oled_write_P(on_off_2, false); |
diff --git a/keyboards/splitkb/aurora/helix/helix.c b/keyboards/splitkb/aurora/helix/helix.c index 3d3094cbd1..3d3002efef 100644 --- a/keyboards/splitkb/aurora/helix/helix.c +++ b/keyboards/splitkb/aurora/helix/helix.c | |||
| @@ -81,7 +81,7 @@ void render_mod_status_gui_alt(uint8_t modifiers) { | |||
| 81 | oled_write_P(gui_off_2, false); | 81 | oled_write_P(gui_off_2, false); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { | 84 | if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { |
| 85 | oled_write_P(on_on_2, false); | 85 | oled_write_P(on_on_2, false); |
| 86 | } else if(modifiers & MOD_MASK_GUI) { | 86 | } else if(modifiers & MOD_MASK_GUI) { |
| 87 | oled_write_P(on_off_2, false); | 87 | oled_write_P(on_off_2, false); |
| @@ -147,7 +147,7 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 147 | oled_write_P(ctrl_off_2, false); | 147 | oled_write_P(ctrl_off_2, false); |
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { | 150 | if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { |
| 151 | oled_write_P(on_on_2, false); | 151 | oled_write_P(on_on_2, false); |
| 152 | } else if(modifiers & MOD_MASK_CTRL) { | 152 | } else if(modifiers & MOD_MASK_CTRL) { |
| 153 | oled_write_P(on_off_2, false); | 153 | oled_write_P(on_off_2, false); |
| @@ -166,13 +166,13 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 166 | 166 | ||
| 167 | void render_logo(void) { | 167 | void render_logo(void) { |
| 168 | static const char PROGMEM aurora_logo[] = { | 168 | static const char PROGMEM aurora_logo[] = { |
| 169 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, | 169 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, |
| 170 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, | 170 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, |
| 171 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, | 171 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, |
| 172 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, | 172 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, |
| 173 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, | 173 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, |
| 174 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, | 174 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, |
| 175 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, | 175 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, |
| 176 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 | 176 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 |
| 177 | }; | 177 | }; |
| 178 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); | 178 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); |
| @@ -242,37 +242,37 @@ bool oled_task_kb(void) { | |||
| 242 | } else { | 242 | } else { |
| 243 | // clang-format off | 243 | // clang-format off |
| 244 | static const char PROGMEM aurora_art[] = { | 244 | static const char PROGMEM aurora_art[] = { |
| 245 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, | 245 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, |
| 246 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, | 246 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, |
| 247 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, | 247 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, |
| 248 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, | 248 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, |
| 249 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, | 249 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, |
| 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, | 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, |
| 251 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, | 251 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, |
| 252 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, | 252 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, |
| 253 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, | 253 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, |
| 254 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, | 254 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, |
| 255 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, | 255 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, |
| 256 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, | 256 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, |
| 257 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, | 257 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, |
| 258 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, | 258 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, |
| 259 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, | 259 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, |
| 260 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, | 260 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, |
| 261 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, | 261 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, |
| 262 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, | 262 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, |
| 263 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, | 263 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, |
| 264 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, | 264 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, |
| 265 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, | 265 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, |
| 266 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, | 266 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, |
| 267 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, | 267 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, |
| 268 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, | 268 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, |
| 269 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, | 269 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, |
| 270 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, | 270 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, |
| 271 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, | 271 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, |
| 272 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, | 272 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, |
| 273 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, | 273 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, |
| 274 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, | 274 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, |
| 275 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, | 275 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, |
| 276 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 | 276 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 |
| 277 | }; | 277 | }; |
| 278 | // clang-format on | 278 | // clang-format on |
| @@ -306,4 +306,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { | |||
| 306 | } | 306 | } |
| 307 | return true; | 307 | return true; |
| 308 | } | 308 | } |
| 309 | #endif \ No newline at end of file | 309 | #endif |
diff --git a/keyboards/splitkb/aurora/lily58/lily58.c b/keyboards/splitkb/aurora/lily58/lily58.c index 83e4ecbe08..43cf1175be 100644 --- a/keyboards/splitkb/aurora/lily58/lily58.c +++ b/keyboards/splitkb/aurora/lily58/lily58.c | |||
| @@ -85,7 +85,7 @@ void render_mod_status_gui_alt(uint8_t modifiers) { | |||
| 85 | oled_write_P(gui_off_2, false); | 85 | oled_write_P(gui_off_2, false); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { | 88 | if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { |
| 89 | oled_write_P(on_on_2, false); | 89 | oled_write_P(on_on_2, false); |
| 90 | } else if(modifiers & MOD_MASK_GUI) { | 90 | } else if(modifiers & MOD_MASK_GUI) { |
| 91 | oled_write_P(on_off_2, false); | 91 | oled_write_P(on_off_2, false); |
| @@ -151,7 +151,7 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 151 | oled_write_P(ctrl_off_2, false); | 151 | oled_write_P(ctrl_off_2, false); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { | 154 | if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { |
| 155 | oled_write_P(on_on_2, false); | 155 | oled_write_P(on_on_2, false); |
| 156 | } else if(modifiers & MOD_MASK_CTRL) { | 156 | } else if(modifiers & MOD_MASK_CTRL) { |
| 157 | oled_write_P(on_off_2, false); | 157 | oled_write_P(on_off_2, false); |
| @@ -170,13 +170,13 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 170 | 170 | ||
| 171 | void render_logo(void) { | 171 | void render_logo(void) { |
| 172 | static const char PROGMEM aurora_logo[] = { | 172 | static const char PROGMEM aurora_logo[] = { |
| 173 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, | 173 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, |
| 174 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, | 174 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, |
| 175 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, | 175 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, |
| 176 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, | 176 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, |
| 177 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, | 177 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, |
| 178 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, | 178 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, |
| 179 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, | 179 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, |
| 180 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 | 180 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 |
| 181 | }; | 181 | }; |
| 182 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); | 182 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); |
| @@ -246,37 +246,37 @@ bool oled_task_kb(void) { | |||
| 246 | } else { | 246 | } else { |
| 247 | // clang-format off | 247 | // clang-format off |
| 248 | static const char PROGMEM aurora_art[] = { | 248 | static const char PROGMEM aurora_art[] = { |
| 249 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, | 249 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, |
| 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, | 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, |
| 251 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, | 251 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, |
| 252 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, | 252 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, |
| 253 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, | 253 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, |
| 254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, | 254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, |
| 255 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, | 255 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, |
| 256 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, | 256 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, |
| 257 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, | 257 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, |
| 258 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, | 258 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, |
| 259 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, | 259 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, |
| 260 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, | 260 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, |
| 261 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, | 261 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, |
| 262 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, | 262 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, |
| 263 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, | 263 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, |
| 264 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, | 264 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, |
| 265 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, | 265 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, |
| 266 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, | 266 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, |
| 267 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, | 267 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, |
| 268 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, | 268 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, |
| 269 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, | 269 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, |
| 270 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, | 270 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, |
| 271 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, | 271 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, |
| 272 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, | 272 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, |
| 273 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, | 273 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, |
| 274 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, | 274 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, |
| 275 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, | 275 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, |
| 276 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, | 276 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, |
| 277 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, | 277 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, |
| 278 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, | 278 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, |
| 279 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, | 279 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, |
| 280 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 | 280 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 |
| 281 | }; | 281 | }; |
| 282 | // clang-format on | 282 | // clang-format on |
diff --git a/keyboards/splitkb/aurora/sofle_v2/sofle_v2.c b/keyboards/splitkb/aurora/sofle_v2/sofle_v2.c index 4d51b88bba..4afc89736c 100644 --- a/keyboards/splitkb/aurora/sofle_v2/sofle_v2.c +++ b/keyboards/splitkb/aurora/sofle_v2/sofle_v2.c | |||
| @@ -85,7 +85,7 @@ void render_mod_status_gui_alt(uint8_t modifiers) { | |||
| 85 | oled_write_P(gui_off_2, false); | 85 | oled_write_P(gui_off_2, false); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { | 88 | if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { |
| 89 | oled_write_P(on_on_2, false); | 89 | oled_write_P(on_on_2, false); |
| 90 | } else if(modifiers & MOD_MASK_GUI) { | 90 | } else if(modifiers & MOD_MASK_GUI) { |
| 91 | oled_write_P(on_off_2, false); | 91 | oled_write_P(on_off_2, false); |
| @@ -151,7 +151,7 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 151 | oled_write_P(ctrl_off_2, false); | 151 | oled_write_P(ctrl_off_2, false); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { | 154 | if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { |
| 155 | oled_write_P(on_on_2, false); | 155 | oled_write_P(on_on_2, false); |
| 156 | } else if(modifiers & MOD_MASK_CTRL) { | 156 | } else if(modifiers & MOD_MASK_CTRL) { |
| 157 | oled_write_P(on_off_2, false); | 157 | oled_write_P(on_off_2, false); |
| @@ -170,13 +170,13 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 170 | 170 | ||
| 171 | void render_logo(void) { | 171 | void render_logo(void) { |
| 172 | static const char PROGMEM aurora_logo[] = { | 172 | static const char PROGMEM aurora_logo[] = { |
| 173 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, | 173 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, |
| 174 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, | 174 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, |
| 175 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, | 175 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, |
| 176 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, | 176 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, |
| 177 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, | 177 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, |
| 178 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, | 178 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, |
| 179 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, | 179 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, |
| 180 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 | 180 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 |
| 181 | }; | 181 | }; |
| 182 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); | 182 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); |
| @@ -246,37 +246,37 @@ bool oled_task_kb(void) { | |||
| 246 | } else { | 246 | } else { |
| 247 | // clang-format off | 247 | // clang-format off |
| 248 | static const char PROGMEM aurora_art[] = { | 248 | static const char PROGMEM aurora_art[] = { |
| 249 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, | 249 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, |
| 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, | 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, |
| 251 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, | 251 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, |
| 252 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, | 252 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, |
| 253 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, | 253 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, |
| 254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, | 254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, |
| 255 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, | 255 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, |
| 256 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, | 256 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, |
| 257 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, | 257 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, |
| 258 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, | 258 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, |
| 259 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, | 259 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, |
| 260 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, | 260 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, |
| 261 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, | 261 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, |
| 262 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, | 262 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, |
| 263 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, | 263 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, |
| 264 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, | 264 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, |
| 265 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, | 265 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, |
| 266 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, | 266 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, |
| 267 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, | 267 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, |
| 268 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, | 268 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, |
| 269 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, | 269 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, |
| 270 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, | 270 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, |
| 271 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, | 271 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, |
| 272 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, | 272 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, |
| 273 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, | 273 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, |
| 274 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, | 274 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, |
| 275 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, | 275 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, |
| 276 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, | 276 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, |
| 277 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, | 277 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, |
| 278 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, | 278 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, |
| 279 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, | 279 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, |
| 280 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 | 280 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 |
| 281 | }; | 281 | }; |
| 282 | // clang-format on | 282 | // clang-format on |
diff --git a/keyboards/splitkb/aurora/sweep/sweep.c b/keyboards/splitkb/aurora/sweep/sweep.c index 80abd94eea..afe7e9136f 100644 --- a/keyboards/splitkb/aurora/sweep/sweep.c +++ b/keyboards/splitkb/aurora/sweep/sweep.c | |||
| @@ -85,7 +85,7 @@ void render_mod_status_gui_alt(uint8_t modifiers) { | |||
| 85 | oled_write_P(gui_off_2, false); | 85 | oled_write_P(gui_off_2, false); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) { | 88 | if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) { |
| 89 | oled_write_P(on_on_2, false); | 89 | oled_write_P(on_on_2, false); |
| 90 | } else if(modifiers & MOD_MASK_GUI) { | 90 | } else if(modifiers & MOD_MASK_GUI) { |
| 91 | oled_write_P(on_off_2, false); | 91 | oled_write_P(on_off_2, false); |
| @@ -151,7 +151,7 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 151 | oled_write_P(ctrl_off_2, false); | 151 | oled_write_P(ctrl_off_2, false); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) { | 154 | if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) { |
| 155 | oled_write_P(on_on_2, false); | 155 | oled_write_P(on_on_2, false); |
| 156 | } else if(modifiers & MOD_MASK_CTRL) { | 156 | } else if(modifiers & MOD_MASK_CTRL) { |
| 157 | oled_write_P(on_off_2, false); | 157 | oled_write_P(on_off_2, false); |
| @@ -170,13 +170,13 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) { | |||
| 170 | 170 | ||
| 171 | void render_logo(void) { | 171 | void render_logo(void) { |
| 172 | static const char PROGMEM aurora_logo[] = { | 172 | static const char PROGMEM aurora_logo[] = { |
| 173 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, | 173 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, |
| 174 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, | 174 | 0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, |
| 175 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, | 175 | 0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, |
| 176 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, | 176 | 0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, |
| 177 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, | 177 | 0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, |
| 178 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, | 178 | 0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, |
| 179 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, | 179 | 0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, |
| 180 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 | 180 | 0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 |
| 181 | }; | 181 | }; |
| 182 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); | 182 | oled_write_raw_P(aurora_logo, sizeof(aurora_logo)); |
| @@ -246,37 +246,37 @@ bool oled_task_kb(void) { | |||
| 246 | } else { | 246 | } else { |
| 247 | // clang-format off | 247 | // clang-format off |
| 248 | static const char PROGMEM aurora_art[] = { | 248 | static const char PROGMEM aurora_art[] = { |
| 249 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, | 249 | 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, |
| 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, | 250 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, |
| 251 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, | 251 | 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, |
| 252 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, | 252 | 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, |
| 253 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, | 253 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, |
| 254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, | 254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, |
| 255 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, | 255 | 0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, |
| 256 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, | 256 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, |
| 257 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, | 257 | 0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, |
| 258 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, | 258 | 0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, |
| 259 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, | 259 | 0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, |
| 260 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, | 260 | 0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, |
| 261 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, | 261 | 0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, |
| 262 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, | 262 | 0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, |
| 263 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, | 263 | 0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, |
| 264 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, | 264 | 0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, |
| 265 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, | 265 | 0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, |
| 266 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, | 266 | 0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, |
| 267 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, | 267 | 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, |
| 268 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, | 268 | 0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, |
| 269 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, | 269 | 0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, |
| 270 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, | 270 | 0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, |
| 271 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, | 271 | 0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, |
| 272 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, | 272 | 0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, |
| 273 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, | 273 | 0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, |
| 274 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, | 274 | 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, |
| 275 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, | 275 | 0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, |
| 276 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, | 276 | 0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, |
| 277 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, | 277 | 0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, |
| 278 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, | 278 | 0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, |
| 279 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, | 279 | 0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, |
| 280 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 | 280 | 0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00 |
| 281 | }; | 281 | }; |
| 282 | // clang-format on | 282 | // clang-format on |
