~ruther/qmk_firmware

5e4c34f8903adc105a15bf4f054915192582a1c0 — QMK Bot 4 years ago c14abd8 + f93597d
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 4 insertions(+), 49 deletions(-)

M keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
M keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c => keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c +4 -49
@@ 25,6 25,10 @@
#include <string.h>
#include "layer_number.h"

char *sprints(char *buf, char *src);
char *sprintd(char *buf, char *leadstr, int data);
char *sprint2d(char *buf, char *leadstr, int data);

extern int current_default_layer;

void init_helix_oled(void) {


@@ 64,55 68,6 @@ void matrix_update(struct CharacterMatrix *dest,
}
#    endif

static char *sprint_decimal(char *buf, int data) {
    if (data > 9) {
        buf = sprint_decimal(buf, data/10);
    }
    *buf++ = "0123456789"[data%10];
    *buf = '\0';
    return buf;
}

static char *sprint_hex(char *buf, uint32_t data) {
    if (data > 0xf) {
        buf = sprint_hex(buf, data/0x10);
    }
    *buf++ = "0123456789abcdef"[data & 0xf];
    *buf = '\0';
    return buf;
}

char *sprints(char *buf, char *src) {
    while (*src) {
        *buf++ = *src++;
    }
    *buf = '\0';
    return buf;
}

char *sprintx(char *buf, char *leadstr, uint32_t data) {
    buf = sprints(buf, leadstr);
    buf = sprint_hex(buf, data);
    return buf;
}

char *sprintd(char *buf, char *leadstr, int data) {
    buf = sprints(buf, leadstr);
    buf = sprint_decimal(buf, data);
    return buf;
}

char *sprint2d(char *buf, char *leadstr, int data) {
    buf = sprints(buf, leadstr);
    if (data > 99) {
        return sprint_decimal(buf, data);
    }
    if (data < 10) {
        *buf++ = ' ';
    }
    return sprint_decimal(buf, data);
}

#    ifdef SSD1306OLED
static void render_logo(struct CharacterMatrix *matrix) {
#    else