Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keyboard] add oled_task_kb() into keyboards/helix/rev2/rev2.c #16697

Merged
merged 1 commit into from
Mar 21, 2022
Merged

[Keyboard] add oled_task_kb() into keyboards/helix/rev2/rev2.c #16697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions keyboards/helix/rev2/keymaps/default/oled_display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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) {
Expand Down Expand Up @@ -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();
}
Expand Down
24 changes: 24 additions & 0 deletions keyboards/helix/rev2/rev2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be better:

Suggested change
oled_write_P(PSTR("\n"), false);
oled_advance_page(true);

render_helix_logo();
}
return false;
}
#endif /* end of OLED_ENABLE */
4 changes: 4 additions & 0 deletions keyboards/helix/rev2/rev2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down