diff options
| author | Jonas Avellana <14019120+ninjonas@users.noreply.github.com> | 2020-01-31 23:38:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 22:38:05 -0800 |
| commit | 1aee492c0f88b1a96fabdf750a03ed128d9d844a (patch) | |
| tree | fc785cfa639fc3b66720be08e682c3cfaeace41f /users/ninjonas/oled.c | |
| parent | fdabf524f2c0047ec920b88ace07096009cdd759 (diff) | |
[keymap(kyria), refactor] created kyria keymap. refactored ninjonas userspace (#8053)
* [keymap(kyria), refactor] created kyria keymap. refactored ninjonas userspace and keyboards
* [fix(#8053)] removed redundant code based off Duckle29's code review
* [fix(#8053)] fixing typos
* [refactor(#8053)] updating oled timeout
* [fix(8053) resolved code review issues identified by noroadsleft
Diffstat (limited to 'users/ninjonas/oled.c')
| -rw-r--r-- | users/ninjonas/oled.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c index 721038e15b..ac98133bc7 100644 --- a/users/ninjonas/oled.c +++ b/users/ninjonas/oled.c @@ -2,7 +2,7 @@ #include <stdio.h> #include "ninjonas.h" -#ifdef OLED_DRIVER_ENABLE +#if defined(OLED_DRIVER_ENABLE) & !defined(KEYBOARD_kyria_rev1) static uint32_t oled_timer = 0; extern uint8_t is_master; @@ -38,19 +38,28 @@ void render_default_layer_state(void) { } } +void oled_white_space(void){ + oled_write_P(PSTR(" "), false); +} + void render_layer_state(void) { - oled_write_P(PSTR("\nLayer:"), false); - oled_write_P(PSTR(" LOW"), layer_state_is(_LOWER)); - oled_write_P(PSTR(" RAI"), layer_state_is(_RAISE)); - oled_write_P(PSTR(" ADJ"), layer_state_is(_ADJUST)); + oled_write_P(PSTR("\nLayer: "), false); + oled_write_P(PSTR("LOW"), (layer_state_is(_LOWER) & !layer_state_is(_ADJUST))); + oled_white_space(); + oled_write_P(PSTR("RAI"), (layer_state_is(_RAISE) & !layer_state_is(_ADJUST))); + oled_white_space(); + oled_write_P(PSTR("ADJ"), layer_state_is(_ADJUST)); } void render_mod_status(uint8_t modifiers) { - oled_write_P(PSTR("\nMods: "), false); - oled_write_P(PSTR("SHF "), (modifiers & MOD_MASK_SHIFT)); - oled_write_P(PSTR("CTL "), (modifiers & MOD_MASK_CTRL)); - oled_write_P(PSTR("ALT "), (modifiers & MOD_MASK_ALT)); - oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI)); + oled_write_P(PSTR("\nMods: "), false); + oled_write_P(PSTR("SHF"), (modifiers & MOD_MASK_SHIFT)); + oled_white_space(); + oled_write_P(PSTR("CTL"), (modifiers & MOD_MASK_CTRL)); + oled_white_space(); + oled_write_P(PSTR("ALT"), (modifiers & MOD_MASK_ALT)); + oled_white_space(); + oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI)); } void render_status(void){ |