aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/keycapsss
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keycapsss')
-rw-r--r--keyboards/keycapsss/kimiko/keymaps/default/keymap.c212
-rw-r--r--keyboards/keycapsss/kimiko/rev2/rev2.c4
2 files changed, 2 insertions, 214 deletions
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
index 32b4a7d6eb..c61fdfc03a 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
@@ -122,216 +122,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return state;
}
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master()) {
- return OLED_ROTATION_270;
- } else {
- return OLED_ROTATION_270;
- }
-}
-
-void render_space(void) {
- oled_write_P(PSTR(" "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
- static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
- static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
- static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
- static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
- static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
- static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
- static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
- static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
- // fillers between the modifier icons bleed into the icon frames
- static const char PROGMEM off_off_1[] = {0xc5, 0};
- static const char PROGMEM off_off_2[] = {0xc6, 0};
- static const char PROGMEM on_off_1[] = {0xc7, 0};
- static const char PROGMEM on_off_2[] = {0xc8, 0};
- static const char PROGMEM off_on_1[] = {0xc9, 0};
- static const char PROGMEM off_on_2[] = {0xca, 0};
- static const char PROGMEM on_on_1[] = {0xcb, 0};
- static const char PROGMEM on_on_2[] = {0xcc, 0};
-
- if(modifiers & MOD_MASK_GUI) {
- oled_write_P(gui_on_1, false);
- } else {
- oled_write_P(gui_off_1, false);
- }
-
- if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
- oled_write_P(on_on_1, false);
- } else if(modifiers & MOD_MASK_GUI) {
- oled_write_P(on_off_1, false);
- } else if(modifiers & MOD_MASK_ALT) {
- oled_write_P(off_on_1, false);
- } else {
- oled_write_P(off_off_1, false);
- }
-
- if(modifiers & MOD_MASK_ALT) {
- oled_write_P(alt_on_1, false);
- } else {
- oled_write_P(alt_off_1, false);
- }
-
- if(modifiers & MOD_MASK_GUI) {
- oled_write_P(gui_on_2, false);
- } else {
- oled_write_P(gui_off_2, false);
- }
-
- if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
- oled_write_P(on_on_2, false);
- } else if(modifiers & MOD_MASK_GUI) {
- oled_write_P(on_off_2, false);
- } else if(modifiers & MOD_MASK_ALT) {
- oled_write_P(off_on_2, false);
- } else {
- oled_write_P(off_off_2, false);
- }
-
- if(modifiers & MOD_MASK_ALT) {
- oled_write_P(alt_on_2, false);
- } else {
- oled_write_P(alt_off_2, false);
- }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
- static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
- static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
- static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
- static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
- static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
- static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
- static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
- static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
- // fillers between the modifier icons bleed into the icon frames
- static const char PROGMEM off_off_1[] = {0xc5, 0};
- static const char PROGMEM off_off_2[] = {0xc6, 0};
- static const char PROGMEM on_off_1[] = {0xc7, 0};
- static const char PROGMEM on_off_2[] = {0xc8, 0};
- static const char PROGMEM off_on_1[] = {0xc9, 0};
- static const char PROGMEM off_on_2[] = {0xca, 0};
- static const char PROGMEM on_on_1[] = {0xcb, 0};
- static const char PROGMEM on_on_2[] = {0xcc, 0};
-
- if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(ctrl_on_1, false);
- } else {
- oled_write_P(ctrl_off_1, false);
- }
-
- if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
- oled_write_P(on_on_1, false);
- } else if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(on_off_1, false);
- } else if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(off_on_1, false);
- } else {
- oled_write_P(off_off_1, false);
- }
-
- if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(shift_on_1, false);
- } else {
- oled_write_P(shift_off_1, false);
- }
-
- if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(ctrl_on_2, false);
- } else {
- oled_write_P(ctrl_off_2, false);
- }
-
- if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
- oled_write_P(on_on_2, false);
- } else if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(on_off_2, false);
- } else if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(off_on_2, false);
- } else {
- oled_write_P(off_off_2, false);
- }
-
- if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(shift_on_2, false);
- } else {
- oled_write_P(shift_off_2, false);
- }
-}
-
-void render_logo(void) {
- static const char PROGMEM corne_logo[] = {
- 0xA0, 0xA1, 0xA2, 0xA3, 0xA4,
- 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
- oled_write_P(corne_logo, false);
- // oled_write_P(PSTR("Kimiko"), false);
-}
-
-void render_layer_state(void) {
- static const char PROGMEM default_layer[] = {
- 0x20, 0x94, 0x95, 0x96, 0x20,
- 0x20, 0xb4, 0xb5, 0xb6, 0x20,
- 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
- static const char PROGMEM raise_layer[] = {
- 0x20, 0x97, 0x98, 0x99, 0x20,
- 0x20, 0xb7, 0xb8, 0xb9, 0x20,
- 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
- static const char PROGMEM lower_layer[] = {
- 0x20, 0x9a, 0x9b, 0x9c, 0x20,
- 0x20, 0xba, 0xbb, 0xbc, 0x20,
- 0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
- static const char PROGMEM adjust_layer[] = {
- 0x20, 0x9d, 0x9e, 0x9f, 0x20,
- 0x20, 0xbd, 0xbe, 0xbf, 0x20,
- 0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
- if(layer_state_is(_ADJUST)) {
- oled_write_P(adjust_layer, false);
- } else if(layer_state_is(_LOWER)) {
- oled_write_P(lower_layer, false);
- } else if(layer_state_is(_RAISE)) {
- oled_write_P(raise_layer, false);
- } else {
- oled_write_P(default_layer, false);
- }
-}
-
-void render_status_main(void) {
- render_space();
- render_space();
- render_logo();
- render_space();
- render_layer_state();
- render_space();
- render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
- render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-void render_status_secondary(void) {
- render_space();
- render_space();
- render_logo();
- render_space();
-}
-
-bool oled_task_user(void) {
- if (is_keyboard_master()) {
- render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
- } else {
- render_status_secondary();
- }
- return false;
-}
-
-#endif
-
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
@@ -340,5 +130,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_ADJUST] = { ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(UG_SATD, UG_SATU) },
};
#endif // ENCODER_MAP_ENABLE
-
-
diff --git a/keyboards/keycapsss/kimiko/rev2/rev2.c b/keyboards/keycapsss/kimiko/rev2/rev2.c
index c5765812c0..a7031b7a47 100644
--- a/keyboards/keycapsss/kimiko/rev2/rev2.c
+++ b/keyboards/keycapsss/kimiko/rev2/rev2.c
@@ -76,7 +76,7 @@ void render_mod_status_gui_alt(uint8_t modifiers) {
oled_write_P(gui_off_2, false);
}
- if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
+ if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
oled_write_P(on_on_2, false);
} else if (modifiers & MOD_MASK_GUI) {
oled_write_P(on_off_2, false);
@@ -142,7 +142,7 @@ void render_mod_status_ctrl_shift(uint8_t modifiers) {
oled_write_P(ctrl_off_2, false);
}
- if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
+ if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
oled_write_P(on_on_2, false);
} else if (modifiers & MOD_MASK_CTRL) {
oled_write_P(on_off_2, false);
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-15 08:56:30 +0200