mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-03 06:04:19 -04:00
OLED overhaul
- adjusted and consolidated font after playing around - cleaned up luna code so its easier to read and configure - overhauled the layout, making it less busy but still functional - adjusted the combos to move tab and add back mb1
This commit is contained in:
Victor
parent
409bf5b702
commit
8a520c259d
9 changed files with 275 additions and 560 deletions
|
|
@ -6,7 +6,10 @@
|
|||
|
||||
|
||||
// Shows the currently enabled Layer name
|
||||
void render_default_layer_state(void) {
|
||||
void render_default_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
||||
if(moveCursor) {
|
||||
oled_set_cursor(col, line);
|
||||
}
|
||||
|
||||
switch (get_highest_layer(default_layer_state)) {
|
||||
case _DEFAULT_LAYER_2:
|
||||
|
|
@ -14,235 +17,221 @@ void render_default_layer_state(void) {
|
|||
break;
|
||||
case _DEFAULT_LAYER_3:
|
||||
oled_write_P(PSTR(OLED_RENDER_DEFAULT_LAYER3), false);
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
oled_write_P(PSTR(OLED_RENDER_DEFAULT_LAYER1), false);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Shows the currently enabled Layer name
|
||||
void render_layer_state(void) {
|
||||
// This only shows the name that is enabled
|
||||
void render_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
||||
if(moveCursor) {
|
||||
oled_set_cursor(col, line);
|
||||
}
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_2), get_highest_layer(layer_state) == _NAVIGATION);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_3), get_highest_layer(layer_state) == _NUMBER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), get_highest_layer(layer_state) == _SYMBOL);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), get_highest_layer(layer_state) == _CONFIG);
|
||||
|
||||
/*
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _NAVIGATION:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_2), get_highest_layer(layer_state) == _NAVIGATION);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_2), false);
|
||||
break;
|
||||
case _NUMBER:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_3), get_highest_layer(layer_state) == _NUMBER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_3), false);
|
||||
break;
|
||||
case _SYMBOL:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), get_highest_layer(layer_state) == _SYMBOL);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), false);
|
||||
break;
|
||||
case _CONFIG:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), get_highest_layer(layer_state) == _CONFIG);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), false);
|
||||
break;
|
||||
default:
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_1), false);
|
||||
break;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
// Graphic to show which layer on the stack is enabled
|
||||
void render_layer_state_graphic(void) {
|
||||
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _NAVIGATION:
|
||||
oled_write_P(lyr_nav, false );
|
||||
break;
|
||||
case _NUMBER:
|
||||
oled_write_P(lyr_num, false );
|
||||
break;
|
||||
case _SYMBOL:
|
||||
oled_write_P(lyr_sym, false );
|
||||
break;
|
||||
case _CONFIG:
|
||||
oled_write_P(lyr_cfg, false );
|
||||
break;
|
||||
default:
|
||||
oled_write_P(lyr_def, false );
|
||||
break;
|
||||
// Shows the currently enabled Layer name
|
||||
// Renders a list of all the layers and highlights the active one
|
||||
void render_layer_state_list(uint8_t col, uint8_t line, bool moveCursor) {
|
||||
if(moveCursor) {
|
||||
oled_set_cursor(col, line);
|
||||
}
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_2), get_highest_layer(layer_state) == _NAVIGATION);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_3), get_highest_layer(layer_state) == _NUMBER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), get_highest_layer(layer_state) == _SYMBOL);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), get_highest_layer(layer_state) == _CONFIG);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Shows the Host LED State (Num lock, caps lock , scroll lock)
|
||||
void render_keylock_status(bool vertical) {
|
||||
|
||||
/*
|
||||
if (vertical) {
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_KEYLOCK_NAME), false);
|
||||
oled_write_P(PSTR(" "), false);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
void render_lock_status(uint8_t col, uint8_t line) {
|
||||
oled_set_cursor(col, line);
|
||||
host_keyboard_led_state().num_lock ? oled_write_P(num_on, false ) : oled_write_P(num_off, false );
|
||||
host_keyboard_led_state().caps_lock || is_caps_word_on() ? oled_write_P(caps_on, false ) : oled_write_P(caps_off, false );
|
||||
host_keyboard_led_state().scroll_lock ? oled_write_P(scroll_on, false ) : oled_write_P(scroll_off, false );
|
||||
}
|
||||
|
||||
// Indicates which modifies are enabled
|
||||
void render_mod_status(bool vertical) {
|
||||
|
||||
// Indicates which modifies are enabled
|
||||
void render_mod_status(uint8_t col, uint8_t line) {
|
||||
uint8_t current_mod = get_mods();
|
||||
uint8_t current_osm = get_oneshot_mods();
|
||||
|
||||
oled_set_cursor(1,1);
|
||||
// draw the top line
|
||||
oled_set_cursor(col, line);
|
||||
(current_mod | current_osm) & MOD_MASK_SHIFT ? oled_write_P(shift_on_upper, false) : oled_write_P(shift_off_upper, false );
|
||||
oled_set_cursor(1,2);
|
||||
(current_mod | current_osm) & MOD_MASK_SHIFT ? oled_write_P(shift_on_lower, false) : oled_write_P(shift_off_lower, false );
|
||||
|
||||
oled_set_cursor(1,4);
|
||||
oled_write_P(mod_sep, false);
|
||||
(current_mod | current_osm) & MOD_MASK_CTRL ? oled_write_P(ctrl_on_upper, false ) : oled_write_P(ctrl_off_upper, false );
|
||||
oled_set_cursor(1,5);
|
||||
(current_mod | current_osm) & MOD_MASK_CTRL ? oled_write_P(ctrl_on_lower, false ) : oled_write_P(ctrl_off_lower, false );
|
||||
|
||||
oled_set_cursor(1,7);
|
||||
oled_write_P(mod_sep, false);
|
||||
(current_mod | current_osm) & MOD_MASK_ALT ? oled_write_P(alt_on_upper, false ) : oled_write_P(alt_off_upper, false );
|
||||
oled_set_cursor(1,8);
|
||||
(current_mod | current_osm) & MOD_MASK_ALT ? oled_write_P(alt_on_lower, false ) : oled_write_P(alt_off_lower, false );
|
||||
|
||||
oled_set_cursor(1,10);
|
||||
oled_write_P(mod_sep, false);
|
||||
(current_mod | current_osm) & MOD_MASK_GUI ? oled_write_P(gui_on_upper, false ) : oled_write_P(gui_off_upper, false );
|
||||
oled_set_cursor(1,11);
|
||||
(current_mod | current_osm) & MOD_MASK_GUI ? oled_write_P(gui_on_lower, false ) : oled_write_P(gui_off_lower, false );
|
||||
|
||||
// draw the lower line
|
||||
oled_set_cursor(col, line + 1);
|
||||
(current_mod | current_osm) & MOD_MASK_SHIFT ? oled_write_P(shift_on_lower, false) : oled_write_P(shift_off_lower, false );
|
||||
oled_write_P(mod_sep, false);
|
||||
(current_mod | current_osm) & MOD_MASK_CTRL ? oled_write_P(ctrl_on_lower, false ) : oled_write_P(ctrl_off_lower, false );
|
||||
oled_write_P(mod_sep, false);
|
||||
(current_mod | current_osm) & MOD_MASK_ALT ? oled_write_P(alt_on_lower, false ) : oled_write_P(alt_off_lower, false );
|
||||
oled_write_P(mod_sep, false);
|
||||
(current_mod | current_osm) & MOD_MASK_GUI ? oled_write_P(gui_on_lower, false ) : oled_write_P(gui_off_lower, false );
|
||||
}
|
||||
|
||||
|
||||
// Indicates which features are turned on or off
|
||||
void render_feature_status(bool vertical) {
|
||||
// Indicates which modifies are enabled
|
||||
void render_mod_status_vertical(uint8_t col, uint8_t line) {
|
||||
uint8_t current_mod = get_mods();
|
||||
uint8_t current_osm = get_oneshot_mods();
|
||||
|
||||
if (vertical) {
|
||||
oled_write_ln_P(PSTR(OLED_RENDER_FEATURE_NAME), false);
|
||||
oled_write_P(PSTR(" "), false);
|
||||
}
|
||||
oled_set_cursor(col,line);
|
||||
(current_mod | current_osm) & MOD_MASK_SHIFT ? oled_write_P(shift_on_upper, false) : oled_write_P(shift_off_upper, false );
|
||||
oled_set_cursor(col,line+1);
|
||||
(current_mod | current_osm) & MOD_MASK_SHIFT ? oled_write_P(shift_on_lower, false) : oled_write_P(shift_off_lower, false );
|
||||
|
||||
oled_set_cursor(col,line+3);
|
||||
(current_mod | current_osm) & MOD_MASK_CTRL ? oled_write_P(ctrl_on_upper, false ) : oled_write_P(ctrl_off_upper, false );
|
||||
oled_set_cursor(col,line+4);
|
||||
(current_mod | current_osm) & MOD_MASK_CTRL ? oled_write_P(ctrl_on_lower, false ) : oled_write_P(ctrl_off_lower, false );
|
||||
|
||||
oled_set_cursor(col,line+6);
|
||||
(current_mod | current_osm) & MOD_MASK_ALT ? oled_write_P(alt_on_upper, false ) : oled_write_P(alt_off_upper, false );
|
||||
oled_set_cursor(col,line+7);
|
||||
(current_mod | current_osm) & MOD_MASK_ALT ? oled_write_P(alt_on_lower, false ) : oled_write_P(alt_off_lower, false );
|
||||
|
||||
oled_set_cursor(col,line+9);
|
||||
(current_mod | current_osm) & MOD_MASK_GUI ? oled_write_P(gui_on_upper, false ) : oled_write_P(gui_off_upper, false );
|
||||
oled_set_cursor(col,line+10);
|
||||
(current_mod | current_osm) & MOD_MASK_GUI ? oled_write_P(gui_on_lower, false ) : oled_write_P(gui_off_lower, false );
|
||||
}
|
||||
|
||||
void render_feature_status(uint8_t col, uint8_t line) {
|
||||
oled_set_cursor(col,line);
|
||||
#if defined(RGB_MATRIX_ENABLE)
|
||||
rgb_matrix_is_enabled() ? oled_write_P(rgb_on, false) : oled_write_P(rgb_off, false);
|
||||
rgb_matrix_is_enabled() ? oled_write_P(rgb_matrix_on, false) : oled_write_P(rgb_matrix_off, false);
|
||||
#else
|
||||
oled_write_P(rgb_off, false);
|
||||
oled_write_P(rgb_matrix_off, false);
|
||||
#endif //RGB_MATRIX_ENABLED
|
||||
|
||||
// only works on master side
|
||||
host_keyboard_led_state().scroll_lock ? oled_write_P(dragscr_on, false) : oled_write_P(dragscr_off, false);
|
||||
|
||||
if (vertical) {
|
||||
oled_write_P(PSTR(" "), false);
|
||||
}
|
||||
|
||||
oled_set_cursor(col+3,line);
|
||||
#if defined(AUDIO_ENABLE)
|
||||
is_audio_on() ? oled_write_P(sound_on, false) : oled_write_P(sound_off, false);
|
||||
#else
|
||||
oled_write_P(sound_off, false);
|
||||
#endif //AUDIO_ENABLE
|
||||
|
||||
oled_set_cursor(col+6,line);
|
||||
#if defined(HAPTIC_ENABLE)
|
||||
haptic_get_enable() ? oled_write_P(haptic_on, false) : oled_write_P(haptic_off, false);
|
||||
#else
|
||||
oled_write_P(haptic_off, false);
|
||||
#endif //HAPTIC_ENABLE
|
||||
}
|
||||
|
||||
void render_klor_face_small(uint8_t col, uint8_t line) {
|
||||
|
||||
oled_set_cursor(col,line);
|
||||
oled_write_P(klor_small_face_1, false);
|
||||
|
||||
oled_set_cursor(col,line+1);
|
||||
oled_write_P(klor_small_face_2, false);
|
||||
|
||||
}
|
||||
|
||||
void render_oled_32x128(void) {
|
||||
|
||||
// Coordinate the OLED rendering
|
||||
bool oled_task_user(void) {
|
||||
//process_record_user is only processed on master side
|
||||
//split side OLED does not respond to key presses custom behaviors
|
||||
if (is_keyboard_master()) {
|
||||
render_default_layer_state(0,1,true);
|
||||
render_layer_state_list(0,2,true);
|
||||
#if defined(WPM_ENABLE)
|
||||
render_luna();
|
||||
#endif //WPM_ENABLE
|
||||
} else {
|
||||
render_mod_status_vertical(1,1);
|
||||
render_lock_status(1,14);
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(OLED_DISPLAY_128X64)
|
||||
|
||||
|
||||
// 21 x 8
|
||||
void render_oled_128x64(void) {
|
||||
if (is_keyboard_master()) {
|
||||
|
||||
oled_set_cursor(0,0);
|
||||
render_layer_state();
|
||||
/*
|
||||
base lyr: current lyr
|
||||
---------------------
|
||||
|
||||
mod mod mod mod
|
||||
mod mod mod mod
|
||||
|
||||
-------------- xxxxx
|
||||
NCS xx xx xx xxxxx
|
||||
*/
|
||||
|
||||
render_default_layer_state(0,0, true);
|
||||
render_layer_state(0,0, false);
|
||||
|
||||
oled_set_cursor(0,1);
|
||||
oled_write_P(sep_v, false);
|
||||
|
||||
oled_set_cursor(0,4);
|
||||
render_mod_status(false);
|
||||
render_mod_status(1,3);
|
||||
|
||||
oled_set_cursor(0,5);
|
||||
oled_write_P(sep_v, false);
|
||||
oled_set_cursor(0,6);
|
||||
oled_write_P(sep_short_v, false);
|
||||
|
||||
oled_set_cursor(0,7);
|
||||
render_keylock_status(false);
|
||||
|
||||
oled_set_cursor(13,7);
|
||||
render_feature_status(false);
|
||||
|
||||
oled_set_cursor(15,3);
|
||||
oled_write_P(klor_small_face_1, false);
|
||||
|
||||
oled_set_cursor(15,4);
|
||||
oled_write_P(klor_small_face_2, false);
|
||||
render_lock_status(1,7);
|
||||
render_feature_status(5,7);
|
||||
render_klor_face_small(15,6);
|
||||
} else {
|
||||
|
||||
oled_set_cursor(0,0);
|
||||
oled_write_raw_P(klor_face, sizeof(klor_face));
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
//process_record_user is only processed on master side
|
||||
//split side OLED does not respond to key presses custom behaviors
|
||||
if (is_keyboard_master()) {
|
||||
|
||||
oled_set_cursor(0,0);
|
||||
render_default_layer_state();
|
||||
render_layer_state();
|
||||
|
||||
//render_keylock_status(true);
|
||||
|
||||
/*
|
||||
oled_set_cursor(0,3);
|
||||
render_feature_status(true);
|
||||
*/
|
||||
|
||||
#if defined(WPM_ENABLE)
|
||||
|
||||
render_luna();
|
||||
|
||||
#endif //WPM_ENABLE
|
||||
|
||||
} else {
|
||||
|
||||
oled_set_cursor(0,0);
|
||||
render_mod_status(true);
|
||||
|
||||
oled_set_cursor(1,14);
|
||||
render_keylock_status(true);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Coordinate the OLED rendering
|
||||
bool oled_task_user(void) {
|
||||
#if defined(OLED_DISPLAY_128X64)
|
||||
render_oled_128x64();
|
||||
#else
|
||||
render_oled_32x128();
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
|
||||
//OLED_ROTATION_270 for Rollow/Corne/Swoop
|
||||
//OLED_ROTATION_180 for KLOR
|
||||
|
||||
#if defined(OLED_DISPLAY_128X64)
|
||||
//OLED_ROTATION_180 for KLOR
|
||||
return OLED_ROTATION_180;
|
||||
#else
|
||||
//OLED_ROTATION_270 for Rollow/Corne/Swoop
|
||||
return OLED_ROTATION_270;
|
||||
#endif
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue