From 357a888d805c21c9cb4917f55d558195e8b85db5 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 15 Jun 2020 03:41:28 -0700 Subject: [Keymap] Drashna's Keymap Update - Display Edition (#9282) OLED Display fixes Add support for RGBLIGHT Layers Add gaming layer to corn and kyria RGBLight Startup Animation fixes and improvements (uses matrix_scan now!) Pimoroni Trackball support added (IT'S RGB!!!) Fix issues due to code changes --- users/drashna/oled_stuff.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'users/drashna/oled_stuff.c') diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c index 7580de1d33..6503b970e2 100644 --- a/users/drashna/oled_stuff.c +++ b/users/drashna/oled_stuff.c @@ -170,6 +170,13 @@ void render_bootmagic_status(void) { {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, }; + bool is_bootmagic_on; + #ifdef OLED_DISPLAY_128X64 + is_bootmagic_on = !keymap_config.swap_lctl_lgui; + #else + is_bootmagic_on = keymap_config.swap_lctl_lgui; + #endif + oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NAME), false); #ifdef OLED_DISPLAY_128X64 if (keymap_config.swap_lctl_lgui) @@ -177,11 +184,11 @@ void render_bootmagic_status(void) { oled_write_P(PSTR(" "), false); #endif { - oled_write_P(logo[1][0], false); + oled_write_P(logo[1][0], is_bootmagic_on); #ifdef OLED_DISPLAY_128X64 } else { #endif - oled_write_P(logo[0][0], false); + oled_write_P(logo[0][0], !is_bootmagic_on); } oled_write_P(PSTR(" "), false); #ifdef OLED_DISPLAY_128X64 @@ -192,11 +199,11 @@ void render_bootmagic_status(void) { if (keymap_config.swap_lctl_lgui) #endif { - oled_write_P(logo[1][1], false); + oled_write_P(logo[1][1], is_bootmagic_on); #ifdef OLED_DISPLAY_128X64 } else { #endif - oled_write_P(logo[0][1], false); + oled_write_P(logo[0][1], !is_bootmagic_on); } oled_write_P(PSTR(" "), false); #ifdef OLED_DISPLAY_128X64 @@ -233,7 +240,7 @@ __attribute__((weak)) void oled_driver_render_logo(void) { } void render_status_secondary(void) { -#if !defined(SPLIT_TRANSPORT_MIRROR) || defined(OLED_DRIVER_128x64) +#if !defined(SPLIT_TRANSPORT_MIRROR) || defined(OLED_DISPLAY_128X64) oled_driver_render_logo(); #endif #ifdef SPLIT_TRANSPORT_MIRROR -- cgit v1.2.3