summaryrefslogtreecommitdiffstats
path: root/users/drashna/oled/oled_stuff.c
diff options
context:
space:
mode:
Diffstat (limited to 'users/drashna/oled/oled_stuff.c')
-rw-r--r--users/drashna/oled/oled_stuff.c290
1 files changed, 57 insertions, 233 deletions
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 752829e0fa..2a26b8b638 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -19,6 +19,9 @@
#ifdef UNICODE_COMMON_ENABLE
# include "process_unicode_common.h"
#endif
+# ifdef AUDIO_CLICKY
+# include "process_clicky.h"
+# endif
#include <string.h>
extern bool host_driver_disabled;
@@ -26,7 +29,9 @@ extern bool host_driver_disabled;
uint32_t oled_timer = 0;
char keylog_str[OLED_KEYLOGGER_LENGTH] = {0};
static uint16_t log_timer = 0;
+#ifdef OLED_DISPLAY_VERBOSE
static const char PROGMEM display_border[3] = {0x0, 0xFF, 0x0};
+#endif
deferred_token kittoken;
@@ -101,12 +106,6 @@ bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
return true;
}
-void update_log(void) {
- if (timer_elapsed(log_timer) > 750) {
- // add_keylog(0);
- }
-}
-
/**
* @brief Renders keylogger buffer to oled
*
@@ -448,20 +447,24 @@ void render_bootmagic_status(void) {
#endif
}
-#if defined(POINTING_DEVICE_ENABLE)
+#if defined(CUSTOM_POINTING_DEVICE)
extern bool tap_toggling;
#endif
void render_user_status(void) {
#ifdef AUDIO_ENABLE
- bool is_audio_on = false, is_clicky_on = false;
+ bool is_audio_on = false, l_is_clicky_on = false;
# ifdef SPLIT_KEYBOARD
- is_audio_on = user_state.audio_enable;
- is_clicky_on = user_state.audio_clicky_enable;
+ is_audio_on = user_state.audio_enable;
+# ifdef AUDIO_CLICKY
+ l_is_clicky_on = user_state.audio_clicky_enable;
+# endif
# else
is_audio_on = is_audio_on();
- is_clicky_on = is_clicky_on();
+# ifdef AUDIO_CLICKY
+ l_is_clicky_on = is_clicky_on();
+# endif
# endif
#endif
#if defined(OLED_DISPLAY_VERBOSE)
@@ -476,7 +479,7 @@ void render_user_status(void) {
# if !defined(OLED_DISPLAY_VERBOSE)
oled_write_P(PSTR(" "), false);
# endif
-#elif defined(POINTING_DEVICE_ENABLE)
+#elif defined(CUSTOM_POINTING_DEVICE)
static const char PROGMEM mouse_lock[3] = {0xF2, 0xF3, 0};
oled_write_P(mouse_lock, tap_toggling);
#endif
@@ -486,7 +489,7 @@ void render_user_status(void) {
# ifdef AUDIO_CLICKY
static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}};
- oled_write_P(audio_clicky_status[is_clicky_on && is_audio_on], false);
+ oled_write_P(audio_clicky_status[l_is_clicky_on && is_audio_on], false);
# if !defined(OLED_DISPLAY_VERBOSE)
oled_write_P(PSTR(" "), false);
# endif
@@ -540,6 +543,7 @@ void render_wpm(uint8_t padding) {
// vertical_offset = 0;
void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset) {
+#ifdef WPM_ENABLE
static uint16_t timer = 0;
static uint8_t x = OLED_DISPLAY_HEIGHT - 1;
uint8_t currwpm = get_current_wpm();
@@ -588,6 +592,7 @@ void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset) {
timer = timer_read(); // refresh the timer for the next iteration
}
+#endif
}
#if defined(POINTING_DEVICE_ENABLE)
@@ -625,7 +630,7 @@ __attribute__((weak)) void oled_driver_render_logo_right(void) {
//#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms
// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#define OLED_ANIM_SIZE 32 // number of bytes in array, minimize for adequate firmware size, max is 1024
+#define OLED_ANIM_SIZE 36
#define OLED_ANIM_ROWS 4
#define OLED_ANIM_MAX_FRAMES 3
#if (OLED_SLEEP_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_WAKE_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_KAKI_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_RTOGI_FRAMES > OLED_ANIM_MAX_FRAMES)
@@ -645,247 +650,67 @@ void render_kitty(void) {
// sleep frames
{
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08,
- 0xa8, 0x48, 0xa8, 0x18, 0x08, 0x00, 0x00, 0x00,
- 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03,
- 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x80,
- 0x44, 0x84, 0x06, 0x05, 0x04, 0x80, 0x40, 0x20,
- 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20,
- 0x18, 0x04, 0x04, 0x02, 0x7a, 0x86, 0x01, 0x80,
- 0x80, 0x01, 0x03, 0x05, 0x07, 0x01, 0x00, 0x00,
- 0x80, 0x83, 0x45, 0xfa, 0x3c, 0xe0, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08,
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28,
- 0x28, 0x29, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39,
- 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xa8, 0x48, 0xa8, 0x18, 0x08, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x80, 0x44, 0x84, 0x06, 0x05, 0x04, 0x80, 0x40, 0x20, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x18, 0x04, 0x04, 0x02, 0x7a, 0x86, 0x01, 0x80, 0x80, 0x01, 0x03, 0x05, 0x07, 0x01, 0x00, 0x00, 0x80, 0x83, 0x45, 0xfa, 0x3c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28, 0x28, 0x29, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39, 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 }
},
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x22, 0x22, 0x3a, 0x2a, 0x26, 0x22, 0x80, 0xc0,
- 0x80, 0x00, 0x24, 0x34, 0x2c, 0xe4, 0x60, 0x10,
- 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x38,
- 0x04, 0x02, 0x02, 0x01, 0x79, 0x87, 0x01, 0x80,
- 0x81, 0x83, 0x05, 0x05, 0x03, 0x01, 0x00, 0x00,
- 0x80, 0x43, 0x05, 0xfa, 0x3c, 0xe0, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08,
- 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28,
- 0x28, 0x28, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39,
- 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x3a, 0x2a, 0x26, 0x22, 0x80, 0xc0, 0x80, 0x00, 0x24, 0x34, 0x2c, 0xe4, 0x60, 0x10, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x38, 0x04, 0x02, 0x02, 0x01, 0x79, 0x87, 0x01, 0x80, 0x81, 0x83, 0x05, 0x05, 0x03, 0x01, 0x00, 0x00, 0x80, 0x43, 0x05, 0xfa, 0x3c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28, 0x28, 0x28, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39, 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 }
}
},
// wake frames
{
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80,
- 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x7f, 0x80, 0x40, 0x40, 0x5c, 0x00, 0x01,
- 0x41, 0x01, 0x00, 0x5c, 0x40, 0x40, 0x80, 0x7f,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x00,
- 0x80, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40,
- 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
- 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
- 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10,
- 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80, 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x40, 0x40, 0x5c, 0x00, 0x01, 0x41, 0x01, 0x00, 0x5c, 0x40, 0x40, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x00, 0x80, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
},
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80,
- 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x7f, 0x90, 0x12, 0x0a, 0x02, 0xf4, 0x09,
- 0x0d, 0xf1, 0x04, 0x02, 0x0a, 0x12, 0x90, 0x7f,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x01,
- 0x81, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40,
- 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
- 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
- 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10,
- 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80, 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x90, 0x12, 0x0a, 0x02, 0xf4, 0x09, 0x0d, 0xf1, 0x04, 0x02, 0x0a, 0x12, 0x90, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x01, 0x81, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
}
},
// kaki frames
{
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40,
- 0x80, 0x80, 0x80, 0x00, 0xfc, 0x84, 0x08, 0x08,
- 0x10, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60,
- 0x80, 0x00, 0x00, 0x91, 0xa1, 0x80, 0x00, 0x00,
- 0x22, 0x84, 0x40, 0x50, 0x48, 0xc1, 0x3e, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0x40, 0x41, 0x82, 0xe2, 0x12, 0x0a, 0x06, 0x00,
- 0x80, 0x88, 0x4f, 0x02, 0x22, 0xe2, 0x9f, 0x40,
- 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
- 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
- 0x0f, 0x18, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10,
- 0x14, 0x14, 0x1f, 0x1a, 0x0a, 0x0a, 0x04, 0x00
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x80, 0x80, 0x00, 0xfc, 0x84, 0x08, 0x08, 0x10, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60, 0x80, 0x00, 0x00, 0x91, 0xa1, 0x80, 0x00, 0x00, 0x22, 0x84, 0x40, 0x50, 0x48, 0xc1, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x41, 0x82, 0xe2, 0x12, 0x0a, 0x06, 0x00, 0x80, 0x88, 0x4f, 0x02, 0x22, 0xe2, 0x9f, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1a, 0x0a, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00 }
},
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x06, 0x1a, 0x22, 0xc2, 0x04, 0x04,
- 0x04, 0x07, 0x00, 0xc0, 0x20, 0x10, 0x80, 0x80,
- 0x01, 0x01, 0x02, 0xfc, 0xfe, 0x02, 0x3c, 0x20,
- 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d,
- 0x55, 0x50, 0x94, 0xf0, 0x10, 0x09, 0x08, 0x00,
- 0x80, 0x00, 0x06, 0x09, 0x1b, 0xee, 0x00, 0x00,
- 0x00, 0x00, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
- 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
- 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c,
- 0x14, 0x16, 0x15, 0x14, 0x14, 0x14, 0x14, 0x08
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x06, 0x1a, 0x22, 0xc2, 0x04, 0x04, 0x04, 0x07, 0x00, 0xc0, 0x20, 0x10, 0x80, 0x80, 0x01, 0x01, 0x02, 0xfc, 0xfe, 0x02, 0x3c, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x09, 0x08, 0x00, 0x80, 0x00, 0x06, 0x09, 0x1b, 0xee, 0x00, 0x00, 0x00, 0x00, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x16, 0x15, 0x14, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
},
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x20, 0x40,
- 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x01,
- 0x02, 0x04, 0x04, 0x03, 0x80, 0x40, 0x40, 0x20,
- 0x00, 0x01, 0x02, 0x8c, 0x70, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d,
- 0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d,
- 0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01,
- 0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
- 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
- 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c,
- 0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x01, 0x02, 0x04, 0x04, 0x03, 0x80, 0x40, 0x40, 0x20, 0x00, 0x01, 0x02, 0x8c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d, 0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01, 0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
}
},
// rtogi frames
{
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02,
- 0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
- 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x08, 0x88, 0xc7, 0xc4, 0x62, 0x23, 0x11, 0x3f
- },
- {
- 0x80, 0x40, 0x20, 0x10, 0x88, 0xcc, 0x43, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0,
- 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c,
- 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- },
- {
- 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
- 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04,
- 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x88, 0xc7, 0xc4, 0x62, 0x23, 0x11, 0x3f, 0x00, 0x00, 0x00, 0x00 },
+ { 0x80, 0x40, 0x20, 0x10, 0x88, 0xcc, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
},
{
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02,
- 0x01, 0x1f, 0xa0, 0x20, 0x40, 0x80, 0x00, 0xf0
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
- 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x24,
- 0x24, 0x28, 0x6b, 0x40, 0xa0, 0x99, 0x86, 0xff
- },
- {
- 0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0,
- 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c,
- 0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01
- },
- {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04,
- 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- }
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1f, 0xa0, 0x20, 0x40, 0x80, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x28, 0x6b, 0x40, 0xa0, 0x99, 0x86, 0xff, 0x00, 0x00, 0x00, 0x00 },
+ { 0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 },
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}
}
};
@@ -899,7 +724,7 @@ void render_kitty(void) {
uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
static uint32_t anim_frame_duration = 500;
-#ifdef POINTING_DEVICE_ENABLE
+#ifdef CUSTOM_POINTING_DEVICE
if (tap_toggling) {
animation_frame = (animation_frame + 1) % OLED_RTOGI_FRAMES;
animation_type = 3;
@@ -953,7 +778,7 @@ void oled_driver_render_logo_left(void) {
render_matrix_scan_rate(2);
# endif
oled_set_cursor(7, 2);
-# if defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)
+# if (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && defined(POINTING_DEVICE_ENABLE)
render_pointing_dpi_status(charybdis_get_pointer_sniping_enabled() ? charybdis_get_pointer_sniping_dpi() : charybdis_get_pointer_default_dpi(), 1);
// credit and thanks to jaspertandy on discord for these images
@@ -1054,7 +879,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
__attribute__((weak)) bool oled_task_keymap(void) { return true; }
bool oled_task_user(void) {
- update_log();
if (is_keyboard_master()) {
#ifndef OLED_DISPLAY_TEST
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:34:02 +0000