feat: refactor oled

This commit is contained in:
Maël Villerbu 2024-03-28 23:01:10 +01:00
parent c466ccb757
commit 19641844da
4 changed files with 51 additions and 43 deletions

View file

@ -1,7 +1,7 @@
#include QMK_KEYBOARD_H
#include "tyosa.h"
#include "luna.h"
#include "encoder.h"
#include "oled.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
@ -218,45 +218,3 @@ void matrix_scan_user(void) {
}
/**************** Oled *****************/
// Used to draw on to the oled screen
bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_write_P(PSTR("Layer: "), false);
switch (get_highest_layer(layer_state|default_layer_state)) {
case _COLEMAK_DH:
oled_write_P(PSTR("Base\n"), false);
break;
case _NAV:
oled_write_P(PSTR("Nav\n"), false);
break;
case _SYM:
oled_write_P(PSTR("Sym\n"), false);
break;
case _FUN:
oled_write_P(PSTR("Function\n"), false);
break;
case _NUM:
oled_write_P(PSTR("Num\n"), false);
break;
default:
oled_write_P(PSTR("Undefined\n"), false);
}
oled_write_P(PSTR("Left: "), false);
left_encoder_oled();
oled_write_P(PSTR("Right: "), false);
right_encoder_oled();
} else {
render_luna(0,1);
oled_set_cursor(0,6);
oled_write_P(PSTR(" WPM: "), false);
oled_write(get_u8_str(get_current_wpm(), ' '), false);
}
return false;
}

View file

@ -0,0 +1,48 @@
#include QMK_KEYBOARD_H
#include "tyosa.h"
#include "quantum.h"
#include "luna.h"
#include "encoder.h"
/**************** Oled *****************/
// Used to draw on to the oled screen
bool oled_task_user(void) {
if (is_keyboard_master()) {
oled_write_P(PSTR("Layer: "), false);
switch (get_highest_layer(layer_state|default_layer_state)) {
case _COLEMAK_DH:
oled_write_P(PSTR("Base\n"), false);
break;
case _NAV:
oled_write_P(PSTR("Nav\n"), false);
break;
case _SYM:
oled_write_P(PSTR("Sym\n"), false);
break;
case _FUN:
oled_write_P(PSTR("Function\n"), false);
break;
case _NUM:
oled_write_P(PSTR("Num\n"), false);
break;
default:
oled_write_P(PSTR("Undefined\n"), false);
}
oled_write_P(PSTR("Left: "), false);
left_encoder_oled();
oled_write_P(PSTR("Right: "), false);
right_encoder_oled();
} else {
render_luna(0,1);
oled_set_cursor(0,6);
oled_write_P(PSTR(" WPM: "), false);
oled_write(get_u8_str(get_current_wpm(), ' '), false);
}
return false;
}

View file

@ -0,0 +1 @@
#pragma once

View file

@ -10,6 +10,7 @@ DEFERRED_EXEC_ENABLE = yes
# Inclusions
SRC += tyosa.c
SRC += encoder.c
SRC += oled.c
SRC += luna.c
# AVR optimizations