mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-12-25 10:44:59 +06:00
Update oled_bongocat to match VIA keymap (#12875)
* Update to match VIA keymap * Update with feedback from PR
This commit is contained in:
Jay Greco
GitHub
parent
909d9c228f
commit
0ec6d6daf7
@ -21,28 +21,60 @@
|
||||
|
||||
|
||||
enum layer_names {
|
||||
_MA,
|
||||
_FN
|
||||
_BASE,
|
||||
_VIA1,
|
||||
_VIA2,
|
||||
_VIA3
|
||||
};
|
||||
|
||||
#define KC_DISC_MUTE KC_F23
|
||||
#define KC_DISC_DEAF KC_F24
|
||||
|
||||
enum custom_keycodes {
|
||||
KC_CUST = SAFE_RANGE,
|
||||
PROG = USER00,
|
||||
DISC_MUTE,
|
||||
DISC_DEAF,
|
||||
SUPER_ALT_TAB,
|
||||
_NUM_CUST_KCS,
|
||||
};
|
||||
|
||||
// Macro variables
|
||||
bool is_alt_tab_active = false;
|
||||
uint16_t alt_tab_timer = 0;
|
||||
bool muted = false;
|
||||
bool deafened = false;
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_MA] = LAYOUT_ansi(
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
|
||||
KC_F13, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
|
||||
KC_F14, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
|
||||
KC_F15, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
|
||||
KC_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
[_BASE] = LAYOUT_all(
|
||||
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
|
||||
KC_F13, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
|
||||
KC_F14, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
|
||||
KC_F15, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
|
||||
KC_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
[_FN] = LAYOUT_ansi(
|
||||
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END,
|
||||
RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
|
||||
[_VIA1] = LAYOUT_all(
|
||||
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END,
|
||||
RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
|
||||
),
|
||||
|
||||
[_VIA2] = LAYOUT_all(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
[_VIA3] = LAYOUT_all(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
};
|
||||
@ -59,7 +91,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||
#ifdef OLED_DRIVER_ENABLE
|
||||
#define IDLE_FRAME_DURATION 200 // Idle animation iteration rate in ms
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_90; }
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
|
||||
|
||||
uint32_t anim_timer = 0;
|
||||
uint32_t anim_sleep = 0;
|
||||
@ -126,8 +158,17 @@ static void render_anim(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void oled_task_user(void) {
|
||||
render_anim();
|
||||
oled_set_cursor(0, 14);
|
||||
sprintf(wpm_str, ">%04d", get_current_wpm());
|
||||
oled_write_ln(wpm_str, false);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Animate tap
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
#ifdef OLED_DRIVER_ENABLE
|
||||
// Check if non-mod
|
||||
if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
|
||||
if (record->event.pressed) {
|
||||
@ -140,13 +181,76 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
switch(keycode) {
|
||||
case PROG:
|
||||
if (record->event.pressed) {
|
||||
rgblight_disable_noeeprom();
|
||||
#ifdef OLED_DRIVER_ENABLE
|
||||
oled_off();
|
||||
#endif
|
||||
bootloader_jump();
|
||||
}
|
||||
break;
|
||||
|
||||
case DISC_MUTE:
|
||||
if (record->event.pressed) {
|
||||
tap_code(KC_DISC_MUTE);
|
||||
if (!rgblight_is_enabled()) break;
|
||||
|
||||
if (muted) {
|
||||
rgblight_enable_noeeprom();
|
||||
} else {
|
||||
rgblight_timer_disable();
|
||||
uint8_t val = rgblight_get_val();
|
||||
rgblight_sethsv_range(255, 255, val, 0, 1);
|
||||
}
|
||||
muted = !muted;
|
||||
}
|
||||
break;
|
||||
|
||||
case DISC_DEAF:
|
||||
if (record->event.pressed) {
|
||||
tap_code(KC_DISC_DEAF);
|
||||
if (!rgblight_is_enabled()) break;
|
||||
|
||||
if (deafened) {
|
||||
rgblight_enable_noeeprom();
|
||||
} else {
|
||||
rgblight_timer_disable();
|
||||
uint8_t val = rgblight_get_val();
|
||||
rgblight_sethsv_range(255, 255, val, 0, RGBLED_NUM-1);
|
||||
}
|
||||
deafened = !deafened;
|
||||
}
|
||||
break;
|
||||
|
||||
case SUPER_ALT_TAB:
|
||||
if (record->event.pressed) {
|
||||
if (!is_alt_tab_active) {
|
||||
is_alt_tab_active = true;
|
||||
register_code(KC_LALT);
|
||||
}
|
||||
alt_tab_timer = timer_read();
|
||||
register_code(KC_TAB);
|
||||
} else {
|
||||
unregister_code(KC_TAB);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void oled_task_user(void) {
|
||||
render_anim();
|
||||
oled_set_cursor(0, 14);
|
||||
sprintf(wpm_str, ">%04d", get_current_wpm());
|
||||
oled_write_ln(wpm_str, false);
|
||||
void matrix_scan_user(void) {
|
||||
if (is_alt_tab_active) {
|
||||
if (timer_elapsed(alt_tab_timer) > 1000) {
|
||||
unregister_code(KC_LALT);
|
||||
is_alt_tab_active = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user