~ruther/qmk_firmware

aea9005236eea62b34a48bebd210359a1b4515e9 — QMK Bot 3 years ago b19d739 + 7eb6f86
Merge remote-tracking branch 'origin/master' into develop
M keyboards/helix/rev2/keymaps/default/oled_display.c => keyboards/helix/rev2/keymaps/default/oled_display.c +2 -4
@@ 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();
    }

M keyboards/helix/rev2/rev2.c => keyboards/helix/rev2/rev2.c +24 -0
@@ 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 */

M keyboards/helix/rev2/rev2.h => keyboards/helix/rev2/rev2.h +4 -0
@@ 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()