aboutsummaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-11-10 14:10:35 +0000
committerQMK Bot <hello@qmk.fm>2021-11-10 14:10:35 +0000
commited48c0bd8b681123073da08da150c6bb4e7c2706 (patch)
tree152f2fcc0ba45799e2f0dece5930039abb3746d6 /users
parent5523f7093a797400fbd7367f9be50cb40ecdd68e (diff)
parent83ab7d41efc8b400ad2870be7f46e5435b8fd550 (diff)
downloadqmk_firmware-ed48c0bd8b681123073da08da150c6bb4e7c2706.tar.gz
qmk_firmware-ed48c0bd8b681123073da08da150c6bb4e7c2706.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users')
-rw-r--r--users/drashna/config.h20
-rw-r--r--users/drashna/drashna.c58
-rw-r--r--users/drashna/drashna_font.h548
-rw-r--r--users/drashna/wrappers.h75
4 files changed, 670 insertions, 31 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 5e935827b..f54da9e32 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -147,6 +147,9 @@
147// # define OLED_FONT_5X5 147// # define OLED_FONT_5X5
148// # define OLED_FONT_AZTECH 148// # define OLED_FONT_AZTECH
149// # define OLED_FONT_BMPLAIN 149// # define OLED_FONT_BMPLAIN
150// # define OLED_FONT_CRACKERS
151// # define OLED_FONT_HISKYF21
152# define OLED_FONT_DEAD_MEAL
150// # define OLED_FONT_SUPER_DIGG 153// # define OLED_FONT_SUPER_DIGG
151// # define OLED_LOGO_GMK_BAD 154// # define OLED_LOGO_GMK_BAD
152// # define OLED_LOGO_HUE_MANITEE 155// # define OLED_LOGO_HUE_MANITEE
@@ -163,17 +166,12 @@
163# define ONESHOT_TIMEOUT 3000 166# define ONESHOT_TIMEOUT 3000
164#endif // !ONESHOT_TIMEOUT 167#endif // !ONESHOT_TIMEOUT
165 168
166// this makes it possible to do rolling combos (zx) with keys that 169#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
167// convert to other keys on hold (z becomes ctrl when you hold it, 170#define PERMISSIVE_HOLD_PER_KEY
168// and when this option isn't enabled, z rapidly followed by x 171#define TAPPING_FORCE_HOLD_PER_KEY
169// actually sends Ctrl-x. That's bad.) 172#define RETRO_TAPPING_PER_KEY
170#define IGNORE_MOD_TAP_INTERRUPT 173#define TAPPING_TERM_PER_KEY
171#undef PERMISSIVE_HOLD 174
172//#define TAPPING_FORCE_HOLD_PER_KEY
173//#define RETRO_TAPPING_PER_KEY
174#if !defined(KEYBOARD_kyria) && !defined(KEYBOARD_splitkb_kyria)
175# define TAPPING_TERM_PER_KEY
176#endif
177 175
178#ifndef TAPPING_TOGGLE 176#ifndef TAPPING_TOGGLE
179# define TAPPING_TOGGLE 1 177# define TAPPING_TOGGLE 1
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 71539e8b8..7e07a2c7c 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -259,3 +259,61 @@ void matrix_slave_scan_user(void) {
259 matrix_slave_scan_keymap(); 259 matrix_slave_scan_keymap();
260} 260}
261#endif 261#endif
262
263__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
264 switch (keycode) {
265 default:
266 return TAPPING_TERM;
267 }
268}
269
270__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
271 // Immediately select the hold action when another key is tapped:
272 // return true;
273 // Do not select the hold action when another key is tapped.
274 // return false;
275 switch (keycode) {
276 default:
277 return false;
278 }
279}
280
281__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
282 // Immediately select the hold action when another key is pressed.
283 // return true;
284 // Do not select the hold action when another key is pressed.
285 // return false;
286 switch (keycode) {
287 case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
288 return true;
289 default:
290 return false;
291 }
292}
293
294__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
295 // Do not force the mod-tap key press to be handled as a modifier
296 // if any other key was pressed while the mod-tap key is held down.
297 // return true;
298 // Force the mod-tap key press to be handled as a modifier if any
299 // other key was pressed while the mod-tap key is held down.
300 // return false;
301 switch (keycode) {
302 default:
303 return true;
304 }
305}
306
307__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
308 switch (keycode) {
309 default:
310 return false;
311 }
312}
313
314__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
315 switch (keycode) {
316 default:
317 return false;
318 }
319}
diff --git a/users/drashna/drashna_font.h b/users/drashna/drashna_font.h
index 27dc8b1b5..844292a53 100644
--- a/users/drashna/drashna_font.h
+++ b/users/drashna/drashna_font.h
@@ -338,6 +338,297 @@ static const unsigned char font[] PROGMEM = {
338 0x22, 0x3e, 0x08, 0x00, 0x00, 0x00, 338 0x22, 0x3e, 0x08, 0x00, 0x00, 0x00,
339 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 339 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
340 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 340 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
341# elif defined(OLED_FONT_CRACKERS)
342 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
343 0x5E, 0x06, 0x06, 0x00, 0x00, 0x00,
344 0x1E, 0x00, 0x00, 0x1E, 0x00, 0x00,
345 0x20, 0x7C, 0x38, 0x38, 0x7C, 0x08,
346 0x48, 0xFE, 0x64, 0x64, 0x00, 0x00,
347 0x64, 0x60, 0x60, 0x18, 0x0C, 0x0C,
348 0x74, 0x4A, 0x4A, 0x7E, 0x48, 0x00,
349 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00,
350 0x3C, 0x7E, 0x7E, 0x42, 0x00, 0x00,
351 0x42, 0x7E, 0x7E, 0x3C, 0x00, 0x00,
352 0x04, 0x0C, 0x04, 0x06, 0x0C, 0x04,
353 0x10, 0x3C, 0x3C, 0x3C, 0x10, 0x00,
354 0x00, 0x60, 0xE0, 0x00, 0x00, 0x00,
355 0x08, 0x08, 0x08, 0x00, 0x00, 0x00,
356 0x60, 0x60, 0x60, 0x00, 0x00, 0x00,
357 0x60, 0x78, 0x78, 0x1E, 0x06, 0x00,
358 0x3C, 0x3C, 0x7E, 0x42, 0x7E, 0x7E,
359 0x04, 0x7E, 0x7E, 0x7E, 0x00, 0x00,
360 0x76, 0x7A, 0x7E, 0x7E, 0x4C, 0x00,
361 0x4A, 0x7E, 0x7E, 0x7C, 0x00, 0x00,
362 0x0E, 0x08, 0x7E, 0x7E, 0x7E, 0x00,
363 0x4E, 0x4E, 0x4E, 0x7A, 0x1A, 0x00,
364 0x3C, 0x7E, 0x7E, 0x4A, 0x7A, 0x00,
365 0x02, 0x02, 0x0A, 0x7E, 0x7E, 0x7E,
366 0x7E, 0x7E, 0x7E, 0x4A, 0x7E, 0x00,
367 0x0C, 0x4A, 0x7E, 0x7E, 0x3C, 0x00,
368 0x66, 0x66, 0x66, 0x00, 0x00, 0x00,
369 0x66, 0xE6, 0x00, 0x00, 0x00, 0x00,
370 0x08, 0x3C, 0x7E, 0x7E, 0x62, 0x00,
371 0x14, 0x14, 0x14, 0x00, 0x00, 0x00,
372 0x62, 0x7E, 0x7E, 0x3C, 0x08, 0x00,
373 0x02, 0x4A, 0x0E, 0x0E, 0x0C, 0x00,
374 0x3C, 0x7E, 0x7E, 0x4A, 0x72, 0x30,
375 0x7A, 0x4A, 0x7E, 0x7E, 0x7C, 0x00,
376 0x7E, 0x7E, 0x7E, 0x4A, 0x24, 0x00,
377 0x3C, 0x7E, 0x7E, 0x7E, 0x46, 0x00,
378 0x7E, 0x7E, 0x7E, 0x62, 0x3C, 0x00,
379 0x7E, 0x7E, 0x7E, 0x4A, 0x00, 0x00,
380 0x7E, 0x7E, 0x7E, 0x0A, 0x00, 0x00,
381 0x3C, 0x7E, 0x7E, 0x42, 0x62, 0x00,
382 0x7E, 0x7E, 0x7E, 0x18, 0x7E, 0x00,
383 0x7E, 0x7E, 0x7E, 0x00, 0x00, 0x00,
384 0x40, 0x7E, 0x7E, 0x7E, 0x00, 0x00,
385 0x7E, 0x7E, 0x7E, 0x3C, 0x66, 0x00,
386 0x7E, 0x7E, 0x7E, 0x40, 0x00, 0x00,
387 0x7E, 0x3E, 0x3E, 0x7C, 0x3E, 0x3E,
388 0x7E, 0x3E, 0x7E, 0x7C, 0x7E, 0x00,
389 0x3C, 0x3C, 0x7E, 0x62, 0x7E, 0x7E,
390 0x7E, 0x7E, 0x7E, 0x22, 0x0C, 0x00,
391 0x3C, 0x7E, 0x7E, 0x62, 0x7E, 0x7C,
392 0x7E, 0x7E, 0x7E, 0x0A, 0x64, 0x00,
393 0x4C, 0x4E, 0x4E, 0x7A, 0x1A, 0x00,
394 0x02, 0x7E, 0x7E, 0x7E, 0x02, 0x00,
395 0x7E, 0x60, 0x7E, 0x7E, 0x7E, 0x00,
396 0x3E, 0x60, 0x7E, 0x7E, 0x3E, 0x00,
397 0x7E, 0x7C, 0x7C, 0x3E, 0x7C, 0x7C,
398 0x46, 0x7E, 0x08, 0x7E, 0x62, 0x62,
399 0x5E, 0x5E, 0x5E, 0x70, 0x3E, 0x00,
400 0x66, 0x7A, 0x7A, 0x5E, 0x66, 0x00,
401 0x7E, 0x7E, 0x7E, 0x42, 0x00, 0x00,
402 0x06, 0x1E, 0x1E, 0x78, 0x60, 0x00,
403 0x42, 0x7E, 0x7E, 0x7E, 0x00, 0x00,
404 0x0C, 0x06, 0x0C, 0x00, 0x00, 0x00,
405 0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
406 0x02, 0x06, 0x06, 0x04, 0x00, 0x00,
407 0x78, 0x24, 0x7C, 0x7C, 0x78, 0x00,
408 0x7C, 0x7C, 0x7C, 0x48, 0x20, 0x00,
409 0x18, 0x7C, 0x7C, 0x7C, 0x4C, 0x00,
410 0x20, 0x48, 0x7C, 0x7C, 0x7C, 0x00,
411 0x18, 0x7C, 0x7C, 0x74, 0x4C, 0x00,
412 0x78, 0x7C, 0x7C, 0x24, 0x00, 0x00,
413 0x18, 0x7C, 0x7C, 0x44, 0x74, 0x00,
414 0x7C, 0x7C, 0x7C, 0x08, 0x60, 0x00,
415 0x7C, 0x7C, 0x7C, 0x00, 0x00, 0x00,
416 0x40, 0x7C, 0x7C, 0x7C, 0x00, 0x00,
417 0x7C, 0x7C, 0x7C, 0x20, 0x48, 0x00,
418 0x7C, 0x7C, 0x7C, 0x40, 0x00, 0x00,
419 0x7C, 0x3C, 0x3C, 0x78, 0x3C, 0x3C,
420 0x7C, 0x7C, 0x7C, 0x04, 0x78, 0x00,
421 0x18, 0x18, 0x7C, 0x44, 0x7C, 0x7C,
422 0x7C, 0x7C, 0x7C, 0x24, 0x08, 0x00,
423 0x18, 0x18, 0x7C, 0x44, 0x7C, 0x7C,
424 0x7C, 0x7C, 0x7C, 0x04, 0x00, 0x00,
425 0x5C, 0x7C, 0x7C, 0x74, 0x00, 0x00,
426 0x08, 0x7C, 0x7C, 0x7C, 0x48, 0x00,
427 0x7C, 0x60, 0x7C, 0x7C, 0x7C, 0x00,
428 0x3C, 0x60, 0x7C, 0x7C, 0x3C, 0x00,
429 0x7C, 0x78, 0x78, 0x3C, 0x78, 0x78,
430 0x4C, 0x3C, 0x3C, 0x78, 0x64, 0x00,
431 0x4C, 0x4C, 0x4C, 0x78, 0x3C, 0x00,
432 0x5C, 0x74, 0x44, 0x5C, 0x74, 0x00,
433 0x24, 0x7E, 0x42, 0x42, 0x00, 0x00,
434 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00,
435 0x42, 0x7E, 0x24, 0x00, 0x00, 0x00,
436 0x04, 0x06, 0x06, 0x02, 0x04, 0x06,
437 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
438# elif defined(OLED_FONT_EIN)
439 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
440 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
441 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
442 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
443 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
444 0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
445 0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
446 0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
447 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
448 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
449 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
450 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
451 0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
452 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
453 0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
454 0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
455 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
456 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
457 0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
458 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
459 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
460 0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
461 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
462 0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
463 0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
464 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
465 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
466 0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
467 0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
468 0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
469 0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
470 0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
471 0x00, 0x41, 0x5D, 0x59, 0x4E, 0x00,
472 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
473 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
474 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
475 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
476 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
477 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
478 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
479 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
480 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00,
481 0x20, 0x40, 0x40, 0x3F, 0x00, 0x00,
482 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
483 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
484 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
485 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
486 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
487 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
488 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
489 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
490 0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
491 0x01, 0x01, 0x7F, 0x01, 0x01, 0x00,
492 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
493 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
494 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
495 0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
496 0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
497 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
498 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
499 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
500 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
501 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
502 0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
503 0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
504 0x78, 0x14, 0x14, 0x78, 0x00, 0x00,
505 0x7C, 0x54, 0x54, 0x28, 0x00, 0x00,
506 0x38, 0x44, 0x44, 0x28, 0x00, 0x00,
507 0x7C, 0x44, 0x44, 0x38, 0x00, 0x00,
508 0x7C, 0x54, 0x54, 0x44, 0x00, 0x00,
509 0x7C, 0x14, 0x14, 0x04, 0x00, 0x00,
510 0x38, 0x44, 0x54, 0x34, 0x00, 0x00,
511 0x7C, 0x10, 0x10, 0x7C, 0x00, 0x00,
512 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00,
513 0x20, 0x40, 0x40, 0x3C, 0x00, 0x00,
514 0x7C, 0x10, 0x28, 0x44, 0x00, 0x00,
515 0x7C, 0x40, 0x40, 0x40, 0x00, 0x00,
516 0x7C, 0x08, 0x70, 0x08, 0x7C, 0x00,
517 0x7C, 0x08, 0x10, 0x7C, 0x00, 0x00,
518 0x38, 0x44, 0x44, 0x38, 0x00, 0x00,
519 0x7C, 0x14, 0x14, 0x08, 0x00, 0x00,
520 0x38, 0x44, 0x24, 0x58, 0x00, 0x00,
521 0x7C, 0x14, 0x34, 0x48, 0x00, 0x00,
522 0x48, 0x54, 0x54, 0x24, 0x00, 0x00,
523 0x04, 0x7C, 0x04, 0x00, 0x00, 0x00,
524 0x3C, 0x40, 0x40, 0x3C, 0x00, 0x00,
525 0x3C, 0x40, 0x20, 0x1C, 0x00, 0x00,
526 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
527 0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
528 0x0C, 0x10, 0x70, 0x10, 0x0C, 0x00,
529 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
530 0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
531 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
532 0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
533 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
534 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
535# elif defined(OLED_FONT_HISKYF21)
536 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
537 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00,
538 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00,
539 0x28, 0x7C, 0x28, 0x7C, 0x28, 0x00,
540 0x48, 0x54, 0x54, 0xFE, 0x54, 0x54,
541 0x44, 0x20, 0x10, 0x08, 0x44, 0x00,
542 0x28, 0x54, 0x54, 0x54, 0x74, 0x10,
543 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,
544 0x78, 0x84, 0x00, 0x00, 0x00, 0x00,
545 0x84, 0x78, 0x00, 0x00, 0x00, 0x00,
546 0x48, 0x30, 0x30, 0x48, 0x00, 0x00,
547 0x10, 0x38, 0x10, 0x00, 0x00, 0x00,
548 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
549 0x10, 0x10, 0x10, 0x10, 0x00, 0x00,
550 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
551 0x60, 0x10, 0x0C, 0x00, 0x00, 0x00,
552 0x38, 0x44, 0x44, 0x44, 0x44, 0x38,
553 0x08, 0x7C, 0x00, 0x00, 0x00, 0x00,
554 0x64, 0x54, 0x54, 0x54, 0x48, 0x00,
555 0x44, 0x54, 0x54, 0x54, 0x28, 0x00,
556 0x1C, 0x10, 0x10, 0x10, 0x7C, 0x00,
557 0x4C, 0x54, 0x54, 0x54, 0x24, 0x00,
558 0x38, 0x54, 0x54, 0x54, 0x54, 0x20,
559 0x44, 0x24, 0x14, 0x0C, 0x00, 0x00,
560 0x28, 0x54, 0x54, 0x54, 0x54, 0x28,
561 0x08, 0x54, 0x54, 0x54, 0x54, 0x38,
562 0x48, 0x00, 0x00, 0x00, 0x00, 0x00,
563 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00,
564 0x10, 0x28, 0x44, 0x00, 0x00, 0x00,
565 0x28, 0x28, 0x28, 0x28, 0x00, 0x00,
566 0x44, 0x28, 0x10, 0x00, 0x00, 0x00,
567 0x04, 0x54, 0x14, 0x14, 0x08, 0x00,
568 0x38, 0x44, 0x5C, 0x54, 0x48, 0x00,
569 0x60, 0x18, 0x14, 0x14, 0x18, 0x60,
570 0x7C, 0x54, 0x54, 0x54, 0x58, 0x30,
571 0x38, 0x44, 0x44, 0x44, 0x40, 0x00,
572 0x7C, 0x44, 0x44, 0x44, 0x38, 0x00,
573 0x7C, 0x54, 0x54, 0x54, 0x54, 0x40,
574 0x7C, 0x14, 0x14, 0x14, 0x10, 0x00,
575 0x38, 0x44, 0x44, 0x44, 0x70, 0x10,
576 0x7C, 0x10, 0x10, 0x10, 0x10, 0x7C,
577 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00,
578 0x20, 0x40, 0x40, 0x40, 0x40, 0x3C,
579 0x7C, 0x10, 0x10, 0x28, 0x44, 0x00,
580 0x7C, 0x40, 0x40, 0x40, 0x00, 0x00,
581 0x7C, 0x08, 0x10, 0x60, 0x10, 0x08,
582 0x7C, 0x08, 0x10, 0x20, 0x7C, 0x00,
583 0x38, 0x44, 0x44, 0x44, 0x44, 0x38,
584 0x7C, 0x24, 0x24, 0x24, 0x18, 0x00,
585 0x38, 0x44, 0x64, 0x44, 0x38, 0x00,
586 0x7C, 0x14, 0x14, 0x14, 0x68, 0x00,
587 0x48, 0x54, 0x54, 0x54, 0x54, 0x20,
588 0x04, 0x04, 0x7C, 0x04, 0x04, 0x00,
589 0x3C, 0x40, 0x40, 0x40, 0x3C, 0x00,
590 0x0C, 0x30, 0x40, 0x30, 0x0C, 0x00,
591 0x0C, 0x30, 0x40, 0x20, 0x1C, 0x20,
592 0x74, 0x2C, 0x10, 0x28, 0x44, 0x00,
593 0x04, 0x08, 0x70, 0x08, 0x04, 0x00,
594 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
595 0xFC, 0x84, 0x00, 0x00, 0x00, 0x00,
596 0x0C, 0x10, 0x60, 0x00, 0x00, 0x00,
597 0x84, 0xFC, 0x00, 0x00, 0x00, 0x00,
598 0x00, 0x7F, 0x41, 0x7F, 0x00, 0x00,
599 0x40, 0x40, 0x40, 0x40, 0x00, 0x00,
600 0x00, 0x7F, 0x41, 0x7F, 0x00, 0x00,
601 0x60, 0x18, 0x14, 0x14, 0x18, 0x60,
602 0x7C, 0x54, 0x54, 0x54, 0x58, 0x30,
603 0x38, 0x44, 0x44, 0x44, 0x40, 0x00,
604 0x7C, 0x44, 0x44, 0x44, 0x38, 0x00,
605 0x7C, 0x54, 0x54, 0x54, 0x54, 0x40,
606 0x7C, 0x14, 0x14, 0x14, 0x10, 0x00,
607 0x38, 0x44, 0x44, 0x44, 0x70, 0x10,
608 0x7C, 0x10, 0x10, 0x10, 0x10, 0x7C,
609 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00,
610 0x20, 0x40, 0x40, 0x40, 0x40, 0x3C,
611 0x7C, 0x10, 0x10, 0x28, 0x44, 0x00,
612 0x7C, 0x40, 0x40, 0x40, 0x00, 0x00,
613 0x7C, 0x08, 0x10, 0x60, 0x10, 0x08,
614 0x7C, 0x08, 0x10, 0x20, 0x7C, 0x00,
615 0x38, 0x44, 0x44, 0x44, 0x44, 0x38,
616 0x7C, 0x24, 0x24, 0x24, 0x18, 0x00,
617 0x38, 0x44, 0x64, 0x44, 0x38, 0x00,
618 0x7C, 0x14, 0x14, 0x14, 0x68, 0x00,
619 0x48, 0x54, 0x54, 0x54, 0x54, 0x20,
620 0x04, 0x04, 0x7C, 0x04, 0x04, 0x00,
621 0x3C, 0x40, 0x40, 0x40, 0x3C, 0x00,
622 0x0C, 0x30, 0x40, 0x30, 0x0C, 0x00,
623 0x0C, 0x30, 0x40, 0x20, 0x1C, 0x20,
624 0x74, 0x2C, 0x10, 0x28, 0x44, 0x00,
625 0x04, 0x08, 0x70, 0x08, 0x04, 0x00,
626 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
627 0x00, 0x7F, 0x41, 0x7F, 0x00, 0x00,
628 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00,
629 0x00, 0x7F, 0x41, 0x7F, 0x00, 0x00,
630 0x00, 0x7F, 0x41, 0x7F, 0x00, 0x00,
631 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
341# elif defined(OLED_FONT_SUPER_DIGG) 632# elif defined(OLED_FONT_SUPER_DIGG)
342 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 633 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
343 0x58, 0x5C, 0x00, 0x00, 0x00, 0x00, 634 0x58, 0x5C, 0x00, 0x00, 0x00, 0x00,
@@ -435,6 +726,103 @@ static const unsigned char font[] PROGMEM = {
435 0xC2, 0xFE, 0x10, 0x00, 0x00, 0x00, 726 0xC2, 0xFE, 0x10, 0x00, 0x00, 0x00,
436 0x02, 0x01, 0x03, 0x04, 0x06, 0x02, 727 0x02, 0x01, 0x03, 0x04, 0x06, 0x02,
437 0x3C, 0x22, 0x21, 0x22, 0x3C, 0x00, 728 0x3C, 0x22, 0x21, 0x22, 0x3C, 0x00,
729#elif defined (OLED_FONT_ZXPIX)
730 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
731 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00,
732 0x03, 0x00, 0x03, 0x00, 0x00, 0x00,
733 0x12, 0x3F, 0x12, 0x12, 0x3F, 0x12,
734 0x2E, 0x2A, 0x7F, 0x2A, 0x3A, 0x00,
735 0x23, 0x13, 0x08, 0x04, 0x32, 0x31,
736 0x10, 0x2A, 0x25, 0x2A, 0x10, 0x20,
737 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
738 0x1E, 0x21, 0x00, 0x00, 0x00, 0x00,
739 0x21, 0x1E, 0x00, 0x00, 0x00, 0x00,
740 0x08, 0x2A, 0x1C, 0x2A, 0x08, 0x08,
741 0x08, 0x08, 0x3E, 0x08, 0x08, 0x08,
742 0x80, 0x60, 0x00, 0x00, 0x00, 0x00,
743 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
744 0x30, 0x30, 0x00, 0x00, 0x00, 0x00,
745 0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
746 0x1E, 0x31, 0x29, 0x25, 0x23, 0x1E,
747 0x22, 0x21, 0x3F, 0x20, 0x20, 0x20,
748 0x32, 0x29, 0x29, 0x29, 0x29, 0x26,
749 0x12, 0x21, 0x21, 0x25, 0x25, 0x1A,
750 0x18, 0x14, 0x12, 0x3F, 0x10, 0x10,
751 0x17, 0x25, 0x25, 0x25, 0x25, 0x19,
752 0x1E, 0x25, 0x25, 0x25, 0x25, 0x18,
753 0x01, 0x01, 0x31, 0x09, 0x05, 0x03,
754 0x1A, 0x25, 0x25, 0x25, 0x25, 0x1A,
755 0x06, 0x29, 0x29, 0x29, 0x29, 0x1E,
756 0x24, 0x00, 0x00, 0x00, 0x00, 0x00,
757 0x80, 0x64, 0x00, 0x00, 0x00, 0x00,
758 0x08, 0x14, 0x22, 0x00, 0x00, 0x00,
759 0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
760 0x22, 0x14, 0x08, 0x00, 0x00, 0x00,
761 0x02, 0x01, 0x01, 0x29, 0x05, 0x02,
762 0x1E, 0x21, 0x2D, 0x2B, 0x2D, 0x0E,
763 0x3E, 0x09, 0x09, 0x09, 0x09, 0x3E,
764 0x3F, 0x25, 0x25, 0x25, 0x25, 0x1A,
765 0x1E, 0x21, 0x21, 0x21, 0x21, 0x12,
766 0x3F, 0x21, 0x21, 0x21, 0x12, 0x0C,
767 0x3F, 0x25, 0x25, 0x25, 0x25, 0x21,
768 0x3F, 0x05, 0x05, 0x05, 0x05, 0x01,
769 0x1E, 0x21, 0x21, 0x21, 0x29, 0x1A,
770 0x3F, 0x04, 0x04, 0x04, 0x04, 0x3F,
771 0x21, 0x21, 0x3F, 0x21, 0x21, 0x21,
772 0x10, 0x20, 0x20, 0x20, 0x20, 0x1F,
773 0x3F, 0x04, 0x0C, 0x0A, 0x11, 0x20,
774 0x3F, 0x20, 0x20, 0x20, 0x20, 0x20,
775 0x3F, 0x02, 0x04, 0x04, 0x02, 0x3F,
776 0x3F, 0x02, 0x04, 0x08, 0x10, 0x3F,
777 0x1E, 0x21, 0x21, 0x21, 0x21, 0x1E,
778 0x3F, 0x09, 0x09, 0x09, 0x09, 0x06,
779 0x1E, 0x21, 0x29, 0x31, 0x21, 0x1E,
780 0x3F, 0x09, 0x09, 0x09, 0x19, 0x26,
781 0x12, 0x25, 0x25, 0x25, 0x25, 0x18,
782 0x01, 0x01, 0x01, 0x3F, 0x01, 0x01,
783 0x1F, 0x20, 0x20, 0x20, 0x20, 0x1F,
784 0x0F, 0x10, 0x20, 0x20, 0x10, 0x0F,
785 0x1F, 0x20, 0x10, 0x10, 0x20, 0x1F,
786 0x21, 0x12, 0x0C, 0x0C, 0x12, 0x21,
787 0x01, 0x02, 0x0C, 0x38, 0x04, 0x02,
788 0x21, 0x31, 0x29, 0x25, 0x23, 0x21,
789 0x3F, 0x21, 0x00, 0x00, 0x00, 0x00,
790 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
791 0x21, 0x3F, 0x00, 0x00, 0x00, 0x00,
792 0x04, 0x02, 0x3F, 0x02, 0x04, 0x00,
793 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
794 0x01, 0x02, 0x00, 0x00, 0x00, 0x00,
795 0x10, 0x30, 0x2A, 0x2A, 0x3C, 0x00,
796 0x3F, 0x24, 0x24, 0x24, 0x18, 0x00,
797 0x0C, 0x14, 0x22, 0x22, 0x00, 0x00,
798 0x18, 0x24, 0x24, 0x24, 0x3F, 0x00,
799 0x1C, 0x2C, 0x2A, 0x2A, 0x24, 0x00,
800 0x3E, 0x05, 0x01, 0x00, 0x00, 0x00,
801 0x18, 0x28, 0xA4, 0xA4, 0x7C, 0x00,
802 0x3F, 0x04, 0x04, 0x0C, 0x30, 0x00,
803 0x24, 0x3D, 0x20, 0x00, 0x00, 0x00,
804 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
805 0x3F, 0x0C, 0x12, 0x20, 0x00, 0x00,
806 0x1F, 0x20, 0x20, 0x00, 0x00, 0x00,
807 0x3E, 0x02, 0x3C, 0x02, 0x3C, 0x00,
808 0x3E, 0x02, 0x02, 0x02, 0x3C, 0x00,
809 0x0C, 0x14, 0x22, 0x32, 0x0C, 0x00,
810 0xFC, 0x24, 0x24, 0x24, 0x18, 0x00,
811 0x18, 0x24, 0x24, 0x24, 0xFC, 0x80,
812 0x3C, 0x04, 0x02, 0x02, 0x00, 0x00,
813 0x24, 0x2C, 0x2A, 0x2A, 0x10, 0x00,
814 0x02, 0x1F, 0x22, 0x20, 0x00, 0x00,
815 0x1E, 0x20, 0x20, 0x20, 0x1E, 0x00,
816 0x06, 0x18, 0x20, 0x18, 0x06, 0x00,
817 0x1E, 0x30, 0x1C, 0x30, 0x0E, 0x00,
818 0x22, 0x14, 0x08, 0x14, 0x22, 0x00,
819 0x0C, 0x10, 0xA0, 0xA0, 0x7C, 0x00,
820 0x22, 0x32, 0x2A, 0x26, 0x22, 0x22,
821 0x0C, 0x3F, 0x21, 0x00, 0x00, 0x00,
822 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
823 0x21, 0x3F, 0x0C, 0x00, 0x00, 0x00,
824 0x02, 0x01, 0x02, 0x01, 0x00, 0x00,
825 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
438# else // default font 826# else // default font
439 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 827 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
440 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 828 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
@@ -525,7 +913,7 @@ static const unsigned char font[] PROGMEM = {
525 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 913 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
526 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 914 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
527 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 915 0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
528 0x4C, 0x90, 0x10, 0x90, 0x7C, 0x00, 916 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
529 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 917 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
530 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 918 0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
531 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 919 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
@@ -601,6 +989,50 @@ static const unsigned char font[] PROGMEM = {
601 0xE0, 0xE0, 0xC0, 0x80, 0x00, 0x00, 989 0xE0, 0xE0, 0xC0, 0x80, 0x00, 0x00,
602 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 990 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
603 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 991 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
992# elif defined(OLED_LOGO_LOOSE)
993 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
994 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
995 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x00,
996 0xFC, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
997 0x02, 0xF9, 0x01, 0x01, 0x05, 0x09,
998 0x11, 0x22, 0x06, 0xFE, 0xFE, 0xFE,
999 0xFE, 0xFE, 0xFE, 0xFE, 0x46, 0x46,
1000 0x44, 0x44, 0x45, 0x44, 0x29, 0x28,
1001 0x2A, 0x28, 0x11, 0x13, 0x05, 0x07,
1002 0x05, 0x07, 0x05, 0x07, 0x05, 0x07,
1003 0xE5, 0xE7, 0xE5, 0x07, 0x05, 0x07,
1004 0x05, 0x07, 0x05, 0x07, 0x05, 0x07,
1005 0x85, 0xC7, 0xE5, 0xE7, 0xE5, 0xE7,
1006 0xE5, 0xE7, 0xE5, 0xC7, 0x85, 0x07,
1007 0x85, 0xC7, 0xE5, 0xE7, 0xE5, 0xE7,
1008 0xE5, 0xE7, 0xE5, 0xC7, 0x85, 0x07,
1009 0x85, 0xC7, 0xE5, 0xE7, 0xE5, 0xE7,
1010 0xE5, 0xE7, 0xE5, 0xE7, 0xE5, 0x07,
1011 0xE5, 0xE7, 0xE5, 0xE7, 0xE5, 0xE7,
1012 0xE5, 0xE7, 0xE5, 0xE7, 0xE5, 0x00,
1013 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1014# elif defined(OLED_LOGO_SKEEB)
1015 0xC0, 0x20, 0x10, 0x08, 0x04, 0x02,
1016 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
1017 0x01, 0x01, 0x03, 0x07, 0x0F, 0x1F,
1018 0x3F, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF,
1019 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x01,
1020 0xFF, 0xFF, 0x01, 0x01, 0xFF, 0xFF,
1021 0x01, 0x01, 0xFF, 0xFF, 0x19, 0x19,
1022 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
1023 0x01, 0x01, 0xFF, 0xFF, 0x81, 0x81,
1024 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
1025 0x19, 0x19, 0xFF, 0xFF, 0xF9, 0xF9,
1026 0xF9, 0xF9, 0x01, 0x01, 0xF9, 0xF9,
1027 0xF9, 0xF9, 0xFF, 0xFF, 0x99, 0x99,
1028 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
1029 0xF9, 0xF9, 0xFF, 0xFF, 0x19, 0x19,
1030 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
1031 0x67, 0x67, 0xFF, 0xFF, 0xFF, 0xFF,
1032 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F,
1033 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x01,
1034 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
1035 0x02, 0x04, 0x08, 0x10, 0x20, 0xC0,
604# else 1036# else
605 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1037 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
606 0x40, 0x40, 0x40, 0xF0, 0xF8, 0xF8, 1038 0x40, 0x40, 0x40, 0xF0, 0xF8, 0xF8,
@@ -705,6 +1137,50 @@ static const unsigned char font[] PROGMEM = {
705 0x1C, 0x9D, 0xDF, 0xDF, 0xDF, 0x00, 1137 0x1C, 0x9D, 0xDF, 0xDF, 0xDF, 0x00,
706 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1138 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
707 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1139 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1140# elif defined(OLED_LOGO_LOOSE)
1141 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1142 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
1143 0xFF, 0xFF, 0xE3, 0xC1, 0xC1, 0x00,
1144 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
1145 0x00, 0xFF, 0x00, 0x00, 0x80, 0x00,
1146 0x1C, 0x3E, 0x7F, 0xFF, 0xFF, 0xFF,
1147 0xFF, 0xFF, 0xFF, 0xFF, 0x22, 0x22,
1148 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
1149 0x22, 0x22, 0x22, 0x14, 0x14, 0x14,
1150 0x14, 0x14, 0x08, 0x08, 0x00, 0x00,
1151 0xFF, 0xFF, 0xFF, 0x80, 0x80, 0x80,
1152 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
1153 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0xBE,
1154 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
1155 0xFF, 0xFF, 0xFF, 0xFF, 0x81, 0xBD,
1156 0x81, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
1157 0x8F, 0x9F, 0x9C, 0x9C, 0x9C, 0x9C,
1158 0x9C, 0x9C, 0x9C, 0xFC, 0xF8, 0x00,
1159 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0x9C,
1160 0x9C, 0x9C, 0x9C, 0x80, 0x80, 0x00,
1161 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1162# elif defined(OLED_LOGO_SKEEB)
1163 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
1164 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1165 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1166 0x00, 0x00, 0x00, 0x01, 0x03, 0x07,
1167 0x0F, 0x0F, 0x0F, 0x0F, 0x08, 0x08,
1168 0x0F, 0x0F, 0x0E, 0x0E, 0x0F, 0x0F,
1169 0x08, 0x08, 0x0F, 0x0F, 0x08, 0x08,
1170 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
1171 0x08, 0x08, 0x0F, 0x0F, 0x09, 0x09,
1172 0x09, 0x09, 0xF9, 0xF9, 0x09, 0x09,
1173 0x08, 0x08, 0x0F, 0x0F, 0x0F, 0x0F,
1174 0x0F, 0x0F, 0x08, 0x08, 0x0F, 0x0F,
1175 0x0F, 0x0F, 0x0F, 0x0F, 0x09, 0x09,
1176 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
1177 0x09, 0x09, 0x0F, 0x0F, 0x08, 0x08,
1178 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
1179 0x08, 0x08, 0x0F, 0x0F, 0x0F, 0x0F,
1180 0x07, 0x03, 0x01, 0x00, 0x00, 0x00,
1181 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1182 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1183 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
708# else 1184# else
709 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1185 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
710 0x49, 0x49, 0x49, 0xFF, 0xFF, 0xFF, 1186 0x49, 0x49, 0x49, 0xFF, 0xFF, 0xFF,
@@ -738,7 +1214,7 @@ static const unsigned char font[] PROGMEM = {
738 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 1214 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
739 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 1215 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
740 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 1216 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
741 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1217 0x00, 0x44, 0x28, 0xFF, 0x5A, 0x24,
742 0xF0, 0xFE, 0xF1, 0x91, 0xF6, 0xF0, 1218 0xF0, 0xFE, 0xF1, 0x91, 0xF6, 0xF0,
743 0xF0, 0xFC, 0xF2, 0x92, 0xFC, 0xF0, 1219 0xF0, 0xFC, 0xF2, 0x92, 0xFC, 0xF0,
744 1220
@@ -809,16 +1285,42 @@ static const unsigned char font[] PROGMEM = {
809 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 1285 0x07, 0x07, 0x03, 0x01, 0x00, 0x00,
810 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1286 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
811 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1287 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
812#else 1288# elif defined(OLED_LOGO_LOOSE)
813 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
814 0x01, 0x01, 0x01, 0x07, 0x0F, 0x0F,
815 0x7F, 0x0F, 0x7F, 0x0F, 0x0F, 0x7E,
816 0x0F, 0x0F, 0x7F, 0x0F, 0x7F, 0x0F,
817 0x0F, 0x07, 0x01, 0x01, 0x01, 0x00,
818 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
819 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
820 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1289 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1290 0x00, 0x00, 0x01, 0x03, 0x07, 0x0F,
1291 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00,
1292 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
1293 0x20, 0x47, 0x48, 0x50, 0x40, 0x41,
1294 0x42, 0x24, 0x30, 0x3F, 0x3F, 0x3F,
1295 0x3F, 0x3F, 0x3F, 0x3F, 0x31, 0x31,
1296 0x11, 0x51, 0x11, 0x11, 0x4A, 0x0A,
1297 0x2A, 0x0A, 0x44, 0x64, 0x50, 0x70,
1298 0x50, 0x70, 0x50, 0x70, 0x50, 0x70,
1299 0x53, 0x73, 0x53, 0x73, 0x53, 0x73,
1300 0x53, 0x73, 0x53, 0x73, 0x53, 0x70,
1301 0x50, 0x71, 0x53, 0x73, 0x53, 0x73,
1302 0x53, 0x73, 0x53, 0x71, 0x50, 0x70,
1303 0x50, 0x71, 0x53, 0x73, 0x53, 0x73,
1304 0x53, 0x73, 0x53, 0x71, 0x50, 0x70,
1305 0x53, 0x73, 0x53, 0x73, 0x53, 0x73,
1306 0x53, 0x73, 0x53, 0x73, 0x51, 0x70,
1307 0x53, 0x73, 0x53, 0x73, 0x53, 0x73,
1308 0x53, 0x73, 0x53, 0x73, 0x53, 0x00,
821 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1309 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1310# elif defined(OLED_LOGO_SKEEB)
1311 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
1312 0xFF, 0x08, 0x08, 0x08, 0x08, 0x08,
1313 0x08, 0x08, 0x08, 0x08, 0x08, 0xFF,
1314 0x08, 0x08, 0x0F, 0x0F, 0x08, 0x08,
1315 0x03, 0x04, 0x08, 0x10, 0x20, 0x40,
1316 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
1317 0x40, 0x20, 0x10, 0x08, 0x04, 0x03,
1318 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
1319 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
1320 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8,
1321 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8,
1322 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x80,
1323 0x01, 0x02, 0xFC, 0xF8, 0x00, 0x00,
822 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1324 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
823 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1325 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
824 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1326 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -826,14 +1328,18 @@ static const unsigned char font[] PROGMEM = {
826 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1328 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
827 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1329 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
828 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1330 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1331 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
1332#else
829 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1333 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1334 0x01, 0x01, 0x01, 0x07, 0x0F, 0x0F,
1335 0x7F, 0x0F, 0x7F, 0x0F, 0x0F, 0x7E,
1336 0x0F, 0x0F, 0x7F, 0x0F, 0x7F, 0x0F,
1337 0x0F, 0x07, 0x01, 0x01, 0x01, 0x00,
830 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1338 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1339 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
831 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1340 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
832 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1341 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
833 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1342 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
834#endif
835
836// third icon section
837 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1343 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
838 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1344 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
839 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1345 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -845,6 +1351,20 @@ static const unsigned char font[] PROGMEM = {
845 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1351 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
846 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1352 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
847 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1353 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1354#endif
1355
1356// third icon section
1357 0x1F, 0x05, 0x00, 0x02, 0x1F, 0x00,
1358 0x1F, 0x05, 0x00, 0x1D, 0x17, 0x00,
1359 0x1F, 0x05, 0x00, 0x15, 0x1F, 0x00,
1360 0x1F, 0x05, 0x00, 0x07, 0x1C, 0x00,
1361 0x1F, 0x05, 0x00, 0x17, 0x1D, 0x00,
1362 0x1F, 0x05, 0x00, 0x1F, 0x1D, 0x00,
1363 0x1F, 0x05, 0x00, 0x01, 0x1F, 0x00,
1364 0x1F, 0x05, 0x00, 0x1F, 0x1F, 0x00,
1365 0x1F, 0x05, 0x00, 0x07, 0x1F, 0x00,
1366 0x1F, 0x05, 0x00, 0x70, 0x77, 0x00,
1367 0x1F, 0x05, 0x00, 0x00, 0x77, 0x00,
848 1368
849// fourth icon section 1369// fourth icon section
850 0x00, 0x1C, 0x1C, 0x3E, 0x7F, 0x7F, 1370 0x00, 0x1C, 0x1C, 0x3E, 0x7F, 0x7F,
@@ -874,7 +1394,7 @@ static const unsigned char font[] PROGMEM = {
874 0x00, 0x00, 0x1C, 0x14, 0x1C, 0x08, 1394 0x00, 0x00, 0x1C, 0x14, 0x1C, 0x08,
875 0x18, 0x08, 0x18, 0x00, 0x00, 0x00, 1395 0x18, 0x08, 0x18, 0x00, 0x00, 0x00,
876 0x00, 0x70, 0xC8, 0xEE, 0xF9, 0x70, 1396 0x00, 0x70, 0xC8, 0xEE, 0xF9, 0x70,
877 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1397 0x1F, 0x05, 0x00, 0x10, 0x77, 0x40,
878 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1398 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
879 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1399 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
880 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1400 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/users/drashna/wrappers.h b/users/drashna/wrappers.h
index 8ac252926..c1ae81557 100644
--- a/users/drashna/wrappers.h
+++ b/users/drashna/wrappers.h
@@ -167,13 +167,76 @@ NOTE: These are all the same length. If you do a search/replace
167#define _________________HALMAK_R3_________________ KC_G, KC_P, KC_X, KC_K, KC_Y 167#define _________________HALMAK_R3_________________ KC_G, KC_P, KC_X, KC_K, KC_Y
168 168
169 169
170#define _________________HALMAK_L1_________________ KC_W, KC_L, KC_R, KC_B, KC_Z 170#define __________________ISRT_L1__________________ KC_W, KC_C, KC_L, KC_M, KC_K
171#define _________________HALMAK_L2_________________ KC_S, KC_H, KC_N, KC_T, KC_COMM 171#define __________________ISRT_L2__________________ KC_I, KC_S, KC_R, KC_T, KC_G
172#define _________________HALMAK_L3_________________ KC_F, KC_M, KC_V, KC_V, KC_SLASH 172#define __________________ISRT_L3__________________ KC_Q, KC_V, KC_W, KC_D, KC_J
173 173
174#define _________________HALMAK_R1_________________ KC_SCLN, KC_Q, KC_U, KC_D, KC_J 174#define __________________ISRT_R1__________________ KC_Z, KC_F, KC_U, KC_COMM, KC_QUOTE
175#define _________________HALMAK_R2_________________ KC_DOT, KC_A, KC_E, KC_O, KC_I, KC_QUOTE 175#define __________________ISRT_R2__________________ KC_P, KC_N, KC_E, KC_A, KC_O, KC_SCLN
176#define _________________HALMAK_R3_________________ KC_G, KC_P, KC_X, KC_K, KC_Y 176#define __________________ISRT_R3__________________ KC_B, KC_H, KC_SLSH, KC_DOT, KC_X
177
178
179#define __________________SOUL_L1__________________ KC_Q, KC_W, KC_L, KC_D, KC_P
180#define __________________SOUL_L2__________________ KC_A, KC_S, KC_R, KC_T, KC_G
181#define __________________SOUL_L3__________________ KC_Z, KC_X, KC_C, KC_V, KC_J
182
183#define __________________SOUL_R1__________________ KC_K, KC_M, KC_U, KC_Y, KC_SCLN
184#define __________________SOUL_R2__________________ KC_F, KC_N, KC_E, KC_I, KC_O, KC_QUOTE
185#define __________________SOUL_R3__________________ KC_B, KC_H, KC_COMM, KC_DOT, KC_SLSH
186
187
188#define __________________NIRO_L1__________________ KC_Q, KC_W, KC_U, KC_D, KC_P
189#define __________________NIRO_L2__________________ KC_A, KC_S, KC_E, KC_T, KC_G
190#define __________________NIRO_L3__________________ KC_Z, KC_X, KC_C, KC_V, KC_B
191
192#define __________________NIRO_R1__________________ KC_J, KC_F, KC_Y, KC_L, KC_SCLN
193#define __________________NIRO_R2__________________ KC_H, KC_N, KC_I, KC_R, KC_O, KC_QUOTE
194#define __________________NIRO_R3__________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
195
196
197#define _________________ASSET_L1__________________ KC_Q, KC_W, KC_J, KC_F, KC_G
198#define _________________ASSET_L2__________________ KC_A, KC_S, KC_E, KC_T, KC_D
199#define _________________ASSET_L3__________________ KC_Z, KC_X, KC_C, KC_V, KC_B
200
201#define _________________ASSET_R1__________________ KC_Y, KC_P, KC_U, KC_L, KC_SCLN
202#define _________________ASSET_R2__________________ KC_H, KC_N, KC_I, KC_O, KC_R, KC_QUOTE
203#define _________________ASSET_R3__________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
204
205
206#define _________________MTGAP_L1__________________ KC_Y, KC_P, KC_O, KC_U, KC_J
207#define _________________MTGAP_L2__________________ KC_I, KC_N, KC_E, KC_A, KC_COMM
208#define _________________MTGAP_L3__________________ KC_Q, KC_Z, KC_SLSH, KC_DOT, KC_SCLN
209
210#define _________________MTGAP_R1__________________ KC_K, KC_D, KC_L, KC_C, KC_W
211#define _________________MTGAP_R2__________________ KC_M, KC_H, KC_T, KC_S, KC_R, KC_QUOTE
212#define _________________MTGAP_R3__________________ KC_B, KC_F, KC_G, KC_V, KC_X
213
214
215#define _________________MINIMAK_L1________________ KC_Q, KC_W, KC_D, KC_R, KC_K
216#define _________________MINIMAK_L2________________ KC_A, KC_S, KC_T, KC_F, KC_G
217#define _________________MINIMAK_L3________________ KC_Z, KC_X, KC_C, KC_V, KC_B
218
219#define _________________MINIMAK_R1________________ KC_Y, KC_U, KC_I, KC_O, KC_P
220#define _________________MINIMAK_R2________________ KC_H, KC_J, KC_E, KC_L, KC_SCLN, KC_QUOT
221#define _________________MINIMAK_R3________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
222
223
224#define ________________MINIMAK_8_L1_______________ KC_Q, KC_W, KC_D, KC_R, KC_K
225#define ________________MINIMAK_8_L2_______________ KC_A, KC_S, KC_T, KC_F, KC_G
226#define ________________MINIMAK_8_L3_______________ KC_Z, KC_X, KC_C, KC_V, KC_B
227
228#define ________________MINIMAK_8_R1_______________ KC_Y, KC_U, KC_I, KC_L, KC_P
229#define ________________MINIMAK_8_R2_______________ KC_H, KC_N, KC_E, KC_O, KC_SCLN, KC_QUOT
230#define ________________MINIMAK_8_R3_______________ KC_J, KC_M, KC_COMM, KC_DOT, KC_SLSH
231
232
233#define _______________MINIMAK_12_L1_______________ KC_Q, KC_W, KC_D, KC_F, KC_K
234#define _______________MINIMAK_12_L2_______________ KC_A, KC_S, KC_T, KC_R, KC_G
235#define _______________MINIMAK_12_L3_______________ KC_Z, KC_X, KC_C, KC_V, KC_B
236
237#define _______________MINIMAK_12_R1_______________ KC_Y, KC_U, KC_I, KC_L, KC_SCLN
238#define _______________MINIMAK_12_R2_______________ KC_H, KC_N, KC_E, KC_O, KC_P, KC_QUOT
239#define _______________MINIMAK_12_R3_______________ KC_J, KC_M, KC_COMM, KC_DOT, KC_SLSH
177 240
178 241
179#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 242#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 03:01:21 +0000