mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-06-20 12:29:58 -04:00
Added super alt-tab
- going to remove it though so I can hold different mods for chrome and windows. Wanted to save the code since I spent time working on it - General code cleanup - introduced klor and rollow keyboard.json - set encoder resolution to 4 for alt tab to work right
This commit is contained in:
Victor
parent
bd72a9b350
commit
edf4c932f2
19 changed files with 172 additions and 129 deletions
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
|
||||
// Shows the currently enabled Layer name
|
||||
void render_default_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
||||
void render_default_layer_state (uint8_t col, uint8_t line, bool moveCursor) {
|
||||
if(moveCursor) {
|
||||
oled_set_cursor(col, line);
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ void render_default_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
|||
|
||||
// Shows the currently enabled Layer name
|
||||
// This only shows the name that is enabled
|
||||
void render_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
||||
void render_layer_state (uint8_t col, uint8_t line, bool moveCursor) {
|
||||
if(moveCursor) {
|
||||
oled_set_cursor(col, line);
|
||||
}
|
||||
|
|
@ -57,22 +57,24 @@ void render_layer_state(uint8_t col, uint8_t line, bool moveCursor) {
|
|||
|
||||
// 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) {
|
||||
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) == _MOUSE_FUNC);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_6), get_highest_layer(layer_state) == _CONFIG);
|
||||
uint8_t current_layer = get_highest_layer(layer_state);
|
||||
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_2), current_layer == _NAVIGATION);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_3), current_layer == _NUMBER);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_4), current_layer == _SYMBOL);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_5), current_layer == _MOUSE_FUNC);
|
||||
oled_write_P(PSTR(OLED_RENDER_LAYER_6), current_layer == _CONFIG);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Shows the Host LED State (Num lock, caps lock , scroll lock)
|
||||
void render_lock_status(uint8_t col, uint8_t line) {
|
||||
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 );
|
||||
|
|
@ -81,59 +83,57 @@ void render_lock_status(uint8_t col, uint8_t line) {
|
|||
|
||||
|
||||
// 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();
|
||||
void render_mod_status (uint8_t col, uint8_t line) {
|
||||
uint8_t current_mods = get_mods() | get_oneshot_mods();
|
||||
|
||||
// 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 );
|
||||
current_mods & MOD_MASK_SHIFT ? oled_write_P(shift_on_upper, false) : oled_write_P(shift_off_upper, false );
|
||||
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 );
|
||||
current_mods & MOD_MASK_CTRL ? oled_write_P(ctrl_on_upper, false ) : oled_write_P(ctrl_off_upper, false );
|
||||
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 );
|
||||
current_mods & MOD_MASK_ALT ? oled_write_P(alt_on_upper, false ) : oled_write_P(alt_off_upper, false );
|
||||
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 );
|
||||
current_mods & MOD_MASK_GUI ? oled_write_P(gui_on_upper, false ) : oled_write_P(gui_off_upper, 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & MOD_MASK_GUI ? oled_write_P(gui_on_lower, false ) : oled_write_P(gui_off_lower, false );
|
||||
}
|
||||
|
||||
|
||||
// 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();
|
||||
void render_mod_status_vertical (uint8_t col, uint8_t line) {
|
||||
uint8_t current_mods = get_mods() | get_oneshot_mods();
|
||||
|
||||
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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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 );
|
||||
current_mods & 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) {
|
||||
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_matrix_on, false) : oled_write_P(rgb_matrix_off, false);
|
||||
|
|
@ -156,18 +156,15 @@ void render_feature_status(uint8_t col, uint8_t line) {
|
|||
#endif //HAPTIC_ENABLE
|
||||
}
|
||||
|
||||
void render_klor_face_small(uint8_t col, uint8_t line) {
|
||||
|
||||
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) {
|
||||
|
||||
void render_oled_32x128 (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()) {
|
||||
|
|
@ -184,7 +181,7 @@ void render_oled_32x128(void) {
|
|||
|
||||
|
||||
// 21 x 8
|
||||
void render_oled_128x64(void) {
|
||||
void render_oled_128x64 (void) {
|
||||
if (is_keyboard_master()) {
|
||||
|
||||
/*
|
||||
|
|
@ -197,7 +194,6 @@ base lyr: current lyr
|
|||
-------------- xxxxx
|
||||
NCS xx xx xx xxxxx
|
||||
*/
|
||||
|
||||
render_default_layer_state(0,0, true);
|
||||
render_layer_state(0,0, false);
|
||||
|
||||
|
|
@ -219,9 +215,8 @@ base lyr: current lyr
|
|||
}
|
||||
|
||||
|
||||
|
||||
// Coordinate the OLED rendering
|
||||
bool oled_task_user(void) {
|
||||
bool oled_task_user (void) {
|
||||
#if defined(OLED_DISPLAY_128X64)
|
||||
render_oled_128x64();
|
||||
#else
|
||||
|
|
@ -230,7 +225,7 @@ bool oled_task_user(void) {
|
|||
return false;
|
||||
}
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
oled_rotation_t oled_init_user (oled_rotation_t rotation) {
|
||||
#if defined(OLED_DISPLAY_128X64)
|
||||
//OLED_ROTATION_180 for KLOR
|
||||
return OLED_ROTATION_180;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue