mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-27 17:51:47 -04:00
Made major changes to OLED
- now I understand how the system works I can make my own fonts/graphics - overhauled the 32x128 OLED screen display. Will still tweak it
This commit is contained in:
Victor
parent
1822862388
commit
7013d39810
5 changed files with 397 additions and 46 deletions
|
|
@ -20,8 +20,6 @@ void render_qmk_logo(void) {
|
|||
|
||||
void render_default_layer_state(void) {
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
|
||||
|
||||
switch (get_highest_layer(default_layer_state)) {
|
||||
|
||||
case _QWERTY:
|
||||
|
|
@ -33,7 +31,7 @@ void render_default_layer_state(void) {
|
|||
break;
|
||||
|
||||
case _GAME:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYOUT_GAME), false);
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_LAYOUT_GAME), false);
|
||||
break;
|
||||
|
||||
}
|
||||
|
|
@ -43,23 +41,49 @@ void render_default_layer_state(void) {
|
|||
|
||||
void render_layer_state(void) {
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_BASE), get_highest_layer(layer_state) == FIRST_DEFAULT_LAYER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_NAVIGATION), get_highest_layer(layer_state) == _NAVIGATION);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_NUMBER), get_highest_layer(layer_state) == _NUMBER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_SYMBOL), get_highest_layer(layer_state) == _SYMBOL);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_CONFIG), get_highest_layer(layer_state) == _CONFIG);
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _NAVIGATION:
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_LAYER_NAVIGATION), false);
|
||||
break;
|
||||
case _NUMBER:
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_LAYER_NUMBER), false);
|
||||
break;
|
||||
case _SYMBOL:
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_LAYER_SYMBOL), false);
|
||||
break;
|
||||
case _CONFIG:
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_LAYER_CONFIG), false);
|
||||
break;
|
||||
default:
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_LAYER_BASE), false);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
void render_keylock_status(void) {
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_KEYLOCK_NAME), false);
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_KEYLOCK_NAME), false);
|
||||
oled_write_P(PSTR(" "), false);
|
||||
oled_write_P(PSTR("N"), host_keyboard_led_state().num_lock);
|
||||
oled_write_P(PSTR("C"), host_keyboard_led_state().caps_lock || is_caps_word_on() );
|
||||
oled_write_ln_P(PSTR("S"), host_keyboard_led_state().scroll_lock );
|
||||
|
||||
if( host_keyboard_led_state().num_lock ) {
|
||||
oled_write_P(num_on, false );
|
||||
}else {
|
||||
oled_write_P(num_off, false );
|
||||
}
|
||||
|
||||
if( host_keyboard_led_state().caps_lock || is_caps_word_on() ) {
|
||||
oled_write_P(caps_on, false );
|
||||
}else {
|
||||
oled_write_P(caps_off, false );
|
||||
}
|
||||
|
||||
if( host_keyboard_led_state().scroll_lock ) {
|
||||
oled_write_ln_P(scroll_on, false );
|
||||
}else {
|
||||
oled_write_ln_P(scroll_off, false );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -69,18 +93,72 @@ void render_mod_status(void) {
|
|||
uint8_t current_mod = get_mods();
|
||||
uint8_t current_osm = get_oneshot_mods();
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_MODS_NAME), false);
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_MODS_NAME), false);
|
||||
oled_write_P(PSTR(" "), false);
|
||||
|
||||
bool isShift = (current_mod | current_osm) & MOD_MASK_SHIFT;
|
||||
bool isCtrl = (current_mod | current_osm) & MOD_MASK_CTRL;
|
||||
bool isAlt = (current_mod | current_osm) & MOD_MASK_ALT;
|
||||
bool isGUI = (current_mod | current_osm) & MOD_MASK_GUI;
|
||||
if( (current_mod | current_osm) & MOD_MASK_SHIFT ) {
|
||||
oled_write_P(shift_on, false );
|
||||
}else {
|
||||
oled_write_P(shift_off, false );
|
||||
}
|
||||
|
||||
oled_write_P(PSTR("S"), isShift );
|
||||
oled_write_P(PSTR("C"), isCtrl );
|
||||
oled_write_P(PSTR("A"), isAlt );
|
||||
oled_write_P(PSTR("G"), isGUI );
|
||||
if( (current_mod | current_osm) & MOD_MASK_CTRL ) {
|
||||
oled_write_P(ctrl_on, false );
|
||||
}else {
|
||||
oled_write_P(ctrl_off, false );
|
||||
}
|
||||
|
||||
if( (current_mod | current_osm) & MOD_MASK_ALT ) {
|
||||
oled_write_P(alt_on, false );
|
||||
}else {
|
||||
oled_write_P(alt_off, false );
|
||||
}
|
||||
|
||||
if( (current_mod | current_osm) & MOD_MASK_GUI ) {
|
||||
oled_write_P(gui_on, false );
|
||||
}else {
|
||||
oled_write_P(gui_off, false );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void render_feature_status(void) {
|
||||
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_FEATURE_NAME), false);
|
||||
|
||||
#if defined(RGB_MATRIX_ENABLE)
|
||||
if (rgb_matrix_is_enabled()) {
|
||||
oled_write_P(rgb_on, false);
|
||||
} else {
|
||||
oled_write_P(rgb_off, false);
|
||||
}
|
||||
#else
|
||||
oled_write_P(rgb_off, false);
|
||||
#endif
|
||||
|
||||
oled_write_P(PSTR(" "), false);
|
||||
|
||||
#if defined(AUDIO_ENABLE)
|
||||
if (is_audio_on()) {
|
||||
oled_write_P(audio_on, false);
|
||||
} else {
|
||||
oled_write_P(audio_off, false);
|
||||
}
|
||||
|
||||
#else
|
||||
oled_write_P(audio_off, false);
|
||||
#endif //AUDIO_ENABLE
|
||||
|
||||
#if defined(HAPTIC_ENABLE)
|
||||
if (haptic_get_enable()) {
|
||||
oled_write_P(haptic_on, false);
|
||||
} else {
|
||||
oled_write_P(haptic_off, false);
|
||||
}
|
||||
|
||||
#else
|
||||
oled_write_P(haptic_off, false);
|
||||
#endif //AUDIO_ENABLE
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -88,9 +166,16 @@ void render_mod_status(void) {
|
|||
void render_oled_main(void) {
|
||||
|
||||
render_default_layer_state();
|
||||
render_keylock_status();
|
||||
render_mod_status();
|
||||
render_layer_state();
|
||||
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
render_keylock_status();
|
||||
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
render_mod_status();
|
||||
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
render_feature_status();
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -119,14 +204,12 @@ bool oled_task_user(void) {
|
|||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
|
||||
#if defined(KEYBOARD_klor_2040)
|
||||
return OLED_ROTATION_0;
|
||||
#else
|
||||
#if !defined(KEYBOARD_klor_2040)
|
||||
if (is_keyboard_master()) {
|
||||
return OLED_ROTATION_270;
|
||||
} else {
|
||||
return OLED_ROTATION_0;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
return OLED_ROTATION_0;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
#include "t4corun.h"
|
||||
|
||||
#define OLED_RENDER_KEYLOCK_NAME "Lock:"
|
||||
#define OLED_RENDER_MODS_NAME "Mods:"
|
||||
|
||||
#define OLED_RENDER_LAYOUT_NAME "Lyout"
|
||||
#define OLED_RENDER_LAYOUT_QWERTY " qrty"
|
||||
#define OLED_RENDER_LAYOUT_COLEMAK_DH " cmDH"
|
||||
#define OLED_RENDER_LAYOUT_GAME " Game"
|
||||
#define OLED_RENDER_KEYLOCK_NAME "Lock"
|
||||
#define OLED_RENDER_MODS_NAME "Mods"
|
||||
#define OLED_RENDER_FEATURE_NAME "Feat"
|
||||
|
||||
#define OLED_RENDER_LAYER_NAME "Layer"
|
||||
#define OLED_RENDER_LAYER_BASE " Def "
|
||||
#define OLED_RENDER_LAYER_NAVIGATION " Nav "
|
||||
#define OLED_RENDER_LAYER_NUMBER " Num "
|
||||
#define OLED_RENDER_LAYER_SYMBOL " Sym "
|
||||
#define OLED_RENDER_LAYER_CONFIG " Cfg "
|
||||
#define OLED_RENDER_LAYOUT_QWERTY "QWRTY"
|
||||
#define OLED_RENDER_LAYOUT_COLEMAK_DH "CLMAK"
|
||||
#define OLED_RENDER_LAYOUT_GAME "GAME"
|
||||
|
||||
#define OLED_RENDER_LAYER_BASE " Def"
|
||||
#define OLED_RENDER_LAYER_NAVIGATION " Nav"
|
||||
#define OLED_RENDER_LAYER_NUMBER " Num"
|
||||
#define OLED_RENDER_LAYER_SYMBOL " Sym"
|
||||
#define OLED_RENDER_LAYER_CONFIG " Cfg"
|
||||
|
||||
void render_crkbd_logo(void);
|
||||
void render_rollow_logo(void);
|
||||
|
|
@ -24,10 +24,44 @@ void render_default_layer_state(void);
|
|||
void render_layer_state(void);
|
||||
void render_keylock_status(void);
|
||||
void render_mod_status(void);
|
||||
void render_feature_status(void);
|
||||
void render_oled_main(void);
|
||||
bool oled_task_user(void);
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation);
|
||||
|
||||
static const char PROGMEM sep_v32[] = {0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0};
|
||||
|
||||
static const char PROGMEM num_on[] = {0x91, 0};
|
||||
static const char PROGMEM num_off[] = {0xDC, 0};
|
||||
|
||||
static const char PROGMEM caps_on[] = {0x93, 0};
|
||||
static const char PROGMEM caps_off[] = {0xD9, 0};
|
||||
|
||||
static const char PROGMEM scroll_on[] = {0x8F, 0};
|
||||
static const char PROGMEM scroll_off[] = {0xD8, 0};
|
||||
|
||||
static const char PROGMEM shift_on[] = {0x8F, 0};
|
||||
static const char PROGMEM shift_off[] = {0xD8, 0};
|
||||
|
||||
static const char PROGMEM ctrl_on[] = {0x93, 0};
|
||||
static const char PROGMEM ctrl_off[] = {0xD9, 0};
|
||||
|
||||
static const char PROGMEM alt_on[] = {0xD6, 0};
|
||||
static const char PROGMEM alt_off[] = {0xDA, 0};
|
||||
|
||||
static const char PROGMEM gui_on[] = {0xD7, 0};
|
||||
static const char PROGMEM gui_off[] = {0xDB, 0};
|
||||
|
||||
static const char PROGMEM rgb_on[] = {0xD4, 0xD5, 0};
|
||||
static const char PROGMEM rgb_off[] = {0xDD, 0xDE, 0};-
|
||||
|
||||
static const char PROGMEM audio_on[] = {0xAF, 0xB0, 0};
|
||||
static const char PROGMEM audio_off[] = {0xCF, 0xD0, 0};
|
||||
|
||||
static const char PROGMEM haptic_on[] = {0xB1, 0xB2, 0};
|
||||
static const char PROGMEM haptic_off[] = {0xB3, 0xB4, 0};
|
||||
|
||||
|
||||
static const char PROGMEM crkbd_logo[] = {
|
||||
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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue