summaryrefslogtreecommitdiff
path: root/users/drashna/oled
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2022-09-25 13:04:00 -0700
committerGitHub <noreply@github.com>2022-09-25 13:04:00 -0700
commit5abb125b025750d7015d1a9cafc5a861cedfa9b3 (patch)
treeda18da9141a0efcd3e3ca099742af0da4fa78903 /users/drashna/oled
parent34490f098ae1e556ceeaa6a684b3f0deb8b75cfb (diff)
[Keymap] develop updates for Drashna Keymaps (#18472)
Diffstat (limited to 'users/drashna/oled')
-rw-r--r--users/drashna/oled/oled_stuff.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 68801b80a4..7aee350baf 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -23,9 +23,6 @@
#ifdef AUDIO_CLICKY
# include "process_clicky.h"
#endif
-#if defined(AUTOCORRECTION_ENABLE)
-# include "keyrecords/autocorrection/autocorrection.h"
-#endif
#include <string.h>
bool is_oled_enabled = true;
@@ -458,10 +455,6 @@ void render_bootmagic_status(uint8_t col, uint8_t line) {
#endif
}
-#if defined(CUSTOM_POINTING_DEVICE)
-extern bool tap_toggling;
-#endif
-
void render_user_status(uint8_t col, uint8_t line) {
#ifdef AUDIO_ENABLE
bool is_audio_on = false, l_is_clicky_on = false;
@@ -490,9 +483,9 @@ void render_user_status(uint8_t col, uint8_t line) {
# if !defined(OLED_DISPLAY_VERBOSE)
oled_write_P(PSTR(" "), false);
# endif
-#elif defined(CUSTOM_POINTING_DEVICE)
+#elif defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
static const char PROGMEM mouse_lock[3] = {0xF2, 0xF3, 0};
- oled_write_P(mouse_lock, tap_toggling);
+ oled_write_P(mouse_lock, get_auto_mouse_toggle());
#endif
#ifdef AUDIO_ENABLE
static const char PROGMEM audio_status[2][3] = {{0xE0, 0xE1, 0}, {0xE2, 0xE3, 0}};
@@ -771,8 +764,8 @@ void render_unicode_mode(uint8_t col, uint8_t line) {
uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
static uint32_t anim_frame_duration = 500;
-#ifdef CUSTOM_POINTING_DEVICE
- if (tap_toggling) {
+#if defined(POINTING_DEVICE_ENABLE) && defined(POINTING_DEVICE_AUTO_MOUSE_ENABLE)
+ if (get_auto_mouse_toggle()) {
animation_frame = (animation_frame + 1) % OLED_RTOGI_FRAMES;
animation_type = 3;
anim_frame_duration = 300;