Merge remote-tracking branch 'origin/master' into develop

1 files changed, 97 insertions, 94 deletions

diff --git a/users/drashna/oled/oled_stuff.h b/users/drashna/oled/oled_stuff.h
index 4dea4b7be4..17bd9319d1 100644
--- a/users/drashna/oled/oled_stuff.h
+++ b/users/drashna/oled/oled_stuff.h
@@ -18,132 +18,135 @@
 
 #include "quantum.h"
 #include "oled_driver.h"
+#ifdef DEFFERED_EXEC_ENABLE
 extern deferred_token kittoken;
+#endif
 
 void            oled_driver_render_logo(void);
 bool            process_record_user_oled(uint16_t keycode, keyrecord_t *record);
 oled_rotation_t oled_init_keymap(oled_rotation_t rotation);
 void            oled_timer_reset(void);
-void            render_keylogger_status(void);
-void            render_default_layer_state(void);
-void            render_layer_state(void);
-void            render_keylock_status(led_t led_usb_state);
-void            render_matrix_scan_rate(uint8_t padding);
-void            render_mod_status(uint8_t modifiers);
-void            render_bootmagic_status(void);
-void            render_user_status(void);
+void            render_keylogger_status(uint8_t col, uint8_t line);
+void            render_default_layer_state(uint8_t col, uint8_t line);
+void            render_layer_state(uint8_t col, uint8_t line);
+void            render_keylock_status(led_t led_usb_state, uint8_t col, uint8_t line);
+void            render_matrix_scan_rate(uint8_t padding, uint8_t col, uint8_t line);
+void            render_mod_status(uint8_t modifiers, uint8_t col, uint8_t line);
+void            render_bootmagic_status(uint8_t col, uint8_t line);
+void            render_user_status(uint8_t col, uint8_t line);
 void            oled_driver_render_logo(void);
-void            render_wpm(uint8_t padding);
-void            render_pointing_dpi_status(uint16_t cpi, uint8_t padding);
+void            render_wpm(uint8_t padding, uint8_t col, uint8_t line);
+void            render_pointing_dpi_status(uint16_t cpi, uint8_t padding, uint8_t col, uint8_t line);
 void            oled_driver_render_logo_left(void);
 void            oled_driver_render_logo_right(void);
 void            oled_render_large_display(bool side);
-void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset);
+void            render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset);
+void            render_kitty(uint8_t col, uint8_t line);
+void            render_unicode_mode(uint8_t col, uint8_t line);
+void            render_rgb_hsv(uint8_t col, uint8_t line);
 
 void oled_pan_section(bool left, uint16_t y_start, uint16_t y_end, uint16_t x_start, uint16_t x_end);
 
-
 #if defined(OLED_DISPLAY_128X128) || defined(OLED_DISPLAY_128X64)
 #    define OLED_DISPLAY_VERBOSE
 
-#    define OLED_RENDER_KEYLOGGER         "Keylogger: "
+#    define OLED_RENDER_KEYLOGGER "Keylogger: "
 #    ifndef OLED_KEYLOGGER_LENGTH
-#        define OLED_KEYLOGGER_LENGTH         9
+#        define OLED_KEYLOGGER_LENGTH 9
 #    endif
-#    define OLED_RENDER_LAYOUT_NAME       "Layout: "
-#    define OLED_RENDER_LAYOUT_QWERTY     "Qwerty"
+#    define OLED_RENDER_LAYOUT_NAME "Layout: "
+#    define OLED_RENDER_LAYOUT_QWERTY "Qwerty"
 #    define OLED_RENDER_LAYOUT_COLEMAK_DH "Colemak DH"
-#    define OLED_RENDER_LAYOUT_COLEMAK    "Colemak"
-#    define OLED_RENDER_LAYOUT_DVORAK     "Dvorak"
-#    define OLED_RENDER_LAYOUT_WORKMAN    "Workman"
-#    define OLED_RENDER_LAYOUT_NORMAN     "Norman"
-#    define OLED_RENDER_LAYOUT_MALTRON    "Matron"
-#    define OLED_RENDER_LAYOUT_EUCALYN    "Eucalyn"
-#    define OLED_RENDER_LAYOUT_CARPLAX    "Carplax"
-
-#    define OLED_RENDER_LAYER_NAME        "Layer:"
-#    define OLED_RENDER_LAYER_LOWER       "Lower"
-#    define OLED_RENDER_LAYER_RAISE       "Raise"
-#    define OLED_RENDER_LAYER_ADJUST      "Adjust"
-#    define OLED_RENDER_LAYER_MODS        "Mods"
-
-#    define OLED_RENDER_LOCK_NAME         "Lock: "
-#    define OLED_RENDER_LOCK_NUML         "NUM"
-#    define OLED_RENDER_LOCK_CAPS         "CAPS"
-#    define OLED_RENDER_LOCK_SCLK         "SCLK"
-
-#    define OLED_RENDER_MODS_NAME         "Mods"
-#    define OLED_RENDER_MODS_SFT          "Sft"
-#    define OLED_RENDER_MODS_CTL          "Ctl"
-#    define OLED_RENDER_MODS_ALT          "Alt"
-#    define OLED_RENDER_MODS_GUI          "GUI"
-
-#    define OLED_RENDER_BOOTMAGIC_NAME    "Boot  "
-#    define OLED_RENDER_BOOTMAGIC_NKRO    "NKRO"
-#    define OLED_RENDER_BOOTMAGIC_NOGUI   "nGUI"
-#    define OLED_RENDER_BOOTMAGIC_GRV     "GRV"
+#    define OLED_RENDER_LAYOUT_COLEMAK "Colemak"
+#    define OLED_RENDER_LAYOUT_DVORAK "Dvorak"
+#    define OLED_RENDER_LAYOUT_WORKMAN "Workman"
+#    define OLED_RENDER_LAYOUT_NORMAN "Norman"
+#    define OLED_RENDER_LAYOUT_MALTRON "Matron"
+#    define OLED_RENDER_LAYOUT_EUCALYN "Eucalyn"
+#    define OLED_RENDER_LAYOUT_CARPLAX "Carplax"
+
+#    define OLED_RENDER_LAYER_NAME "Layer:"
+#    define OLED_RENDER_LAYER_LOWER "Lower"
+#    define OLED_RENDER_LAYER_RAISE "Raise"
+#    define OLED_RENDER_LAYER_ADJUST "Adjust"
+#    define OLED_RENDER_LAYER_MODS "Mods"
+
+#    define OLED_RENDER_LOCK_NAME "Lock: "
+#    define OLED_RENDER_LOCK_NUML "NUM"
+#    define OLED_RENDER_LOCK_CAPS "CAPS"
+#    define OLED_RENDER_LOCK_SCLK "SCLK"
+
+#    define OLED_RENDER_MODS_NAME "Mods"
+#    define OLED_RENDER_MODS_SFT "Sft"
+#    define OLED_RENDER_MODS_CTL "Ctl"
+#    define OLED_RENDER_MODS_ALT "Alt"
+#    define OLED_RENDER_MODS_GUI "GUI"
+
+#    define OLED_RENDER_BOOTMAGIC_NAME "Boot  "
+#    define OLED_RENDER_BOOTMAGIC_NKRO "NKRO"
+#    define OLED_RENDER_BOOTMAGIC_NOGUI "nGUI"
+#    define OLED_RENDER_BOOTMAGIC_GRV "GRV"
 #    define OLED_RENDER_BOOTMAGIC_ONESHOT "1SHT"
-#    define OLED_RENDER_BOOTMAGIC_SWAP    "SWAP"
-#    define OLED_RENDER_BOOTMAGIC_CAPS    "CAPS"
+#    define OLED_RENDER_BOOTMAGIC_SWAP "SWAP"
+#    define OLED_RENDER_BOOTMAGIC_CAPS "CAPS"
 
-#    define OLED_RENDER_USER_NAME         "USER:"
-#    define OLED_RENDER_USER_ANIM         "Anim"
-#    define OLED_RENDER_USER_LAYR         "Layr"
-#    define OLED_RENDER_USER_NUKE         "Nuke"
+#    define OLED_RENDER_USER_NAME "USER:"
+#    define OLED_RENDER_USER_ANIM "Anim"
+#    define OLED_RENDER_USER_LAYR "Layr"
+#    define OLED_RENDER_USER_NUKE "Nuke"
 
-#    define OLED_RENDER_WPM_COUNTER       "WPM: "
+#    define OLED_RENDER_WPM_COUNTER "WPM: "
 #else
-#    define OLED_RENDER_KEYLOGGER         "KLogr"
+#    define OLED_RENDER_KEYLOGGER "KLogr"
 #    ifndef OLED_KEYLOGGER_LENGTH
-#        define OLED_KEYLOGGER_LENGTH         5
+#        define OLED_KEYLOGGER_LENGTH 5
 #    endif
 
-#    define OLED_RENDER_LAYOUT_NAME       "Lyout"
-#    define OLED_RENDER_LAYOUT_QWERTY     " QRTY"
+#    define OLED_RENDER_LAYOUT_NAME "Lyout"
+#    define OLED_RENDER_LAYOUT_QWERTY " QRTY"
 #    define OLED_RENDER_LAYOUT_COLEMAK_DH " cmDH"
-#    define OLED_RENDER_LAYOUT_COLEMAK    " COLE"
-#    define OLED_RENDER_LAYOUT_DVORAK     " DVRK"
-#    define OLED_RENDER_LAYOUT_WORKMAN    " WKMN"
-#    define OLED_RENDER_LAYOUT_NORMAN     " NORM"
-#    define OLED_RENDER_LAYOUT_MALTRON    " MLTN"
-#    define OLED_RENDER_LAYOUT_EUCALYN    " ECLN"
-#    define OLED_RENDER_LAYOUT_CARPLAX    " CRPX"
-
-#    define OLED_RENDER_LAYER_NAME        "LAYER"
-#    define OLED_RENDER_LAYER_LOWER       "Lower"
-#    define OLED_RENDER_LAYER_RAISE       "Raise"
-#    define OLED_RENDER_LAYER_ADJUST      "Adjst"
-#    define OLED_RENDER_LAYER_MODS        " Mods"
-
-#    define OLED_RENDER_LOCK_NAME         "Lock:"
-#    define OLED_RENDER_LOCK_NUML         "NumL"
-#    define OLED_RENDER_LOCK_CAPS         "CapL"
-#    define OLED_RENDER_LOCK_SCLK         "ScrL"
-
-#    define OLED_RENDER_MODS_NAME         "Mods: "
-#    define OLED_RENDER_MODS_SFT          "Shft"
-#    define OLED_RENDER_MODS_CTL          "Ctrl"
-#    define OLED_RENDER_MODS_ALT          "Alt\n"
-#    define OLED_RENDER_MODS_GUI          "GUI\n"
-
-#    define OLED_RENDER_BOOTMAGIC_NAME    "BTMGK"
-#    define OLED_RENDER_BOOTMAGIC_NKRO    "NKRO"
-#    define OLED_RENDER_BOOTMAGIC_NOGUI   "nGUI"
-#    define OLED_RENDER_BOOTMAGIC_GRV     "GRV"
+#    define OLED_RENDER_LAYOUT_COLEMAK " COLE"
+#    define OLED_RENDER_LAYOUT_DVORAK " DVRK"
+#    define OLED_RENDER_LAYOUT_WORKMAN " WKMN"
+#    define OLED_RENDER_LAYOUT_NORMAN " NORM"
+#    define OLED_RENDER_LAYOUT_MALTRON " MLTN"
+#    define OLED_RENDER_LAYOUT_EUCALYN " ECLN"
+#    define OLED_RENDER_LAYOUT_CARPLAX " CRPX"
+
+#    define OLED_RENDER_LAYER_NAME "LAYER"
+#    define OLED_RENDER_LAYER_LOWER "Lower"
+#    define OLED_RENDER_LAYER_RAISE "Raise"
+#    define OLED_RENDER_LAYER_ADJUST "Adjst"
+#    define OLED_RENDER_LAYER_MODS " Mods"
+
+#    define OLED_RENDER_LOCK_NAME "Lock:"
+#    define OLED_RENDER_LOCK_NUML "NumL"
+#    define OLED_RENDER_LOCK_CAPS "CapL"
+#    define OLED_RENDER_LOCK_SCLK "ScrL"
+
+#    define OLED_RENDER_MODS_NAME "Mods: "
+#    define OLED_RENDER_MODS_SFT "Shft"
+#    define OLED_RENDER_MODS_CTL "Ctrl"
+#    define OLED_RENDER_MODS_ALT "Alt\n"
+#    define OLED_RENDER_MODS_GUI "GUI\n"
+
+#    define OLED_RENDER_BOOTMAGIC_NAME "BTMGK"
+#    define OLED_RENDER_BOOTMAGIC_NKRO "NKRO"
+#    define OLED_RENDER_BOOTMAGIC_NOGUI "nGUI"
+#    define OLED_RENDER_BOOTMAGIC_GRV "GRV"
 #    define OLED_RENDER_BOOTMAGIC_ONESHOT "1SHT"
-#    define OLED_RENDER_BOOTMAGIC_SWAP    "SWAP"
-#    define OLED_RENDER_BOOTMAGIC_CAPS    "CAPS"
+#    define OLED_RENDER_BOOTMAGIC_SWAP "SWAP"
+#    define OLED_RENDER_BOOTMAGIC_CAPS "CAPS"
 
-#    define OLED_RENDER_USER_NAME         "USER:"
-#    define OLED_RENDER_USER_ANIM         "Anim"
-#    define OLED_RENDER_USER_LAYR         "Layr"
-#    define OLED_RENDER_USER_NUKE         "Nuke"
+#    define OLED_RENDER_USER_NAME "USER:"
+#    define OLED_RENDER_USER_ANIM "Anim"
+#    define OLED_RENDER_USER_LAYR "Layr"
+#    define OLED_RENDER_USER_NUKE "Nuke"
 
-#    define OLED_RENDER_WPM_COUNTER       "WPM: "
+#    define OLED_RENDER_WPM_COUNTER "WPM: "
 #endif
 
-
-extern char                      keylog_str[OLED_KEYLOGGER_LENGTH];
+extern char keylog_str[OLED_KEYLOGGER_LENGTH];
 
 #ifndef OLED_WPM_GRAPH_MAX_WPM
 #    define OLED_WPM_GRAPH_MAX_WPM 120