diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2022-03-21 17:05:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 01:05:38 -0700 |
| commit | 7eb6f86bc0aac3ff83abe4365cd11c5c195dc403 (patch) | |
| tree | f173d7d1ee2004bdcd8b140390403533e19a269f | |
| parent | 669ad3c8052fa36e03c105cb00b60b178aaf20cc (diff) | |
| download | qmk_firmware-7eb6f86bc0aac3ff83abe4365cd11c5c195dc403.tar.gz qmk_firmware-7eb6f86bc0aac3ff83abe4365cd11c5c195dc403.zip | |
[Keyboard] add oled_task_kb() into keyboards/helix/rev2/rev2.c (#16697)
| -rw-r--r-- | keyboards/helix/rev2/keymaps/default/oled_display.c | 6 | ||||
| -rw-r--r-- | keyboards/helix/rev2/rev2.c | 24 | ||||
| -rw-r--r-- | keyboards/helix/rev2/rev2.h | 4 |
3 files changed, 30 insertions, 4 deletions
diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c index 4ee3f002d6..824d2e4d86 100644 --- a/keyboards/helix/rev2/keymaps/default/oled_display.c +++ b/keyboards/helix/rev2/keymaps/default/oled_display.c @@ -74,9 +74,6 @@ void matrix_update(struct CharacterMatrix *dest, # ifdef SSD1306OLED static void render_logo(struct CharacterMatrix *matrix) { -# else -static void render_logo(void) { -# endif static const char helix_logo[] PROGMEM ={ 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, @@ -85,6 +82,7 @@ static void render_logo(void) { 0}; oled_write_P(helix_logo, false); } +# endif # ifdef SSD1306OLED static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) { @@ -219,7 +217,7 @@ bool oled_task_user(void) { if (is_keyboard_master()) { render_status(); } else { - render_logo(); + render_helix_logo(); render_rgbled_status(false); render_layer_status(); } diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c index f579027c71..ba29f3c7de 100644 --- a/keyboards/helix/rev2/rev2.c +++ b/keyboards/helix/rev2/rev2.c @@ -64,3 +64,27 @@ void matrix_slave_scan_user(void) { matrix_scan_user(); } #endif + +#ifdef OLED_ENABLE +void render_helix_logo(void) { + static const char helix_logo[] PROGMEM ={ + 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, + 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, + 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4, + 0}; + oled_write_P(helix_logo, false); +} + +bool oled_task_kb(void) { + if (oled_task_user()) { + /* keymap/user level oled_task_user() dose not exist */ + led_t led_state = host_keyboard_led_state(); + oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR(" "), false); + oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR(" "), false); + oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR(" "), false); + oled_write_P(PSTR("\n"), false); + render_helix_logo(); + } + return false; +} +#endif /* end of OLED_ENABLE */ diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h index 5c7cc93d17..fccbaf1ac4 100644 --- a/keyboards/helix/rev2/rev2.h +++ b/keyboards/helix/rev2/rev2.h @@ -20,6 +20,10 @@ bool is_mac_mode(void); void set_mac_mode_kb(bool macmode); +#ifdef OLED_ENABLE +void render_helix_logo(void); +#endif + #ifndef SPLIT_KEYBOARD extern bool is_helix_master(void); #define is_keyboard_master() is_helix_master() |