yet another keymap update

This commit is contained in:
Laila van Reenen 2025-02-14 17:27:51 +01:00
parent d80bea079f
commit a5cf654748
Signed by: LailaTheElf
GPG Key ID: 8A3EF0226518C12D
3 changed files with 58 additions and 54 deletions

View File

@ -19,16 +19,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KB_LCTL, LT(1, KC_ENT), KC_TAB, KC_LGUI, LT(2, KC_SPC), KC_LSFT KC_LCTL, LT(1, KC_TAB), KC_LALT, KC_LGUI, LT(2, KC_SPC), KC_LSFT
), ),
/* /*
* *
* F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 * F7 F8 F9 F10
* *
* " │DEL * [ ] F4 F5 F6 DEL
* *
* \ * F1 F2 F3 F12
* *
* *
* CTRL SHFT * CTRL SHFT
@ -37,17 +37,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* *
*/ */
[1] = LAYOUT_split_3x5_3( [1] = LAYOUT_split_3x5_3(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10,
CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_MINS, KC_EQL, KC_GRV, KC_QUOT, KC_DEL, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, KC_MINS, KC_F4, KC_F5, KC_F6, KC_DEL,
CK_TOGG, CK_UP, CK_DOWN, LCTL(KC_C), LCTL(KC_V) KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB, KC_F1, KC_F2, KC_F3, KC_F12,
KB_LCTL, KC_TRNS, KC_TAB, KC_LGUI, KC_TRNS, KC_LSFT KC_LCTL, KC_TRNS, KC_TAB, KC_LGUI, KC_TRNS, KC_LSFT
), ),
/* /*
* *
* ESC HOME UP END PGUP 7 8 9 - * ESC HOME UP END PGUP : 7 8 9 -
* *
* LEFTDOWNRGHTPGDN 4 5 6 + * LEFTDOWNRGHTPGDN = 4 5 6 +
* *
* 1 2 3 0 * 1 2 3 0
* *
@ -58,65 +58,68 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* *
*/ */
[2] = LAYOUT_split_3x5_3( [2] = LAYOUT_split_3x5_3(
KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, CK_TOGG, KC_7, KC_8, KC_9, KC_MINS, KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, LSFT(KC_SCLN), KC_7, KC_8, KC_9, KC_MINS,
XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_4, KC_5, KC_6, KC_PLUS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_EQL, KC_4, KC_5, KC_6, KC_PLUS,
KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_PSCR, XXXXXXX, KC_1, KC_2, KC_3, KC_0, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_PSCR, XXXXXXX, KC_1, KC_2, KC_3, KC_0,
KB_LCTL, KC_TRNS, KC_TAB, KC_LGUI, KC_TRNS, KC_LSFT KC_LCTL, KC_TRNS, KC_TAB, KC_LGUI, KC_TRNS, KC_LSFT
), ),
}; };
const uint16_t PROGMEM df_combo[] = {KC_D, KC_F, COMBO_END};
combo_t key_combos[] = {
COMBO(df_combo, KC_ENT),
};
#ifdef OLED_ENABLE #ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_0; } oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
bool oled_task_user(void) { bool oled_task_user(void) {
if (is_keyboard_master()) { if (!is_keyboard_master()) {
static const char PROGMEM runqmk_logo[] = {0,0,0,0,152,152,152,152,152,152,24,24,24, // static const char PROGMEM runqmk_logo[] = {0,0,0,0,152,152,152,152,152,152,24,24,24,
152,152,24,24,24,152,152,24,24,152,152,24,24,24,152,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 152,152,24,24,24,152,152,24,24,152,152,24,24,24,152,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,127,127,13,13,29,63,103,64,0,63,127,96,96,96,127,63,0,0,127,127,7,12,56, // 0,0,0,0,0,127,127,13,13,29,63,103,64,0,63,127,96,96,96,127,63,0,0,127,127,7,12,56,
127,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 127,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,252,134,198,198,252,120,0,0,254,254, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,252,134,198,198,252,120,0,0,254,254,
60,224,224,60,254,254,0,254,254,16,24,124,230,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60,224,224,60,254,254,0,254,254,16,24,124,230,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,24,24,25,25,25,25,27,24,24,25,25,24,25,25,24,25,25,24,25,25,24,24,24,24,25,0,0,0, // 0,0,24,24,25,25,25,25,27,24,24,25,25,24,25,25,24,25,25,24,25,25,24,24,24,24,25,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0}; // 0,0,0,0,0,0,0,0,0,0};
oled_write_raw_P(runqmk_logo, sizeof(runqmk_logo)); // oled_write_raw_P(runqmk_logo, sizeof(runqmk_logo));
led_t led_usb_state = host_keyboard_led_state(); led_t led_usb_state = host_keyboard_led_state();
oled_set_cursor(6, 3); oled_set_cursor(0, 0);
oled_write_P(led_usb_state.num_lock ? PSTR("NUM") : PSTR(""), false);
oled_set_cursor(6, 2);
oled_write_P(PSTR("WPM: "), false);
oled_write(get_u8_str(get_current_wpm(), '0'), false);
oled_set_cursor(6, 0);
oled_write_P(PSTR("by GroooveBob"), false);
oled_set_cursor(6, 1);
oled_write_P(PSTR("Layer: "), false);
switch (get_highest_layer(layer_state)) { switch (get_highest_layer(layer_state)) {
case _QWERTY: case 0:
oled_set_cursor(12, 1); oled_set_cursor(0, 1);
oled_write_P(PSTR("Default\n"), false); oled_write_P(PSTR("L1\n"), false);
break; break;
case _LOWER: case 1:
oled_set_cursor(12, 1); oled_set_cursor(0, 1);
oled_write_P(PSTR("Lower\n"), false); oled_write_P(PSTR("L2\n"), false);
break; break;
case _RAISE: case 2:
oled_set_cursor(12, 1); oled_set_cursor(0, 1);
oled_write_P(PSTR("Raise\n"), false); oled_write_P(PSTR("L3\n"), false);
break; break;
default: default:
// Or use the write_ln shortcut over adding '\n' to the end of your string // Or use the write_ln shortcut over adding '\n' to the end of your string
oled_set_cursor(6, 1); oled_set_cursor(0, 1);
oled_write_ln_P(PSTR("Undefined"), false); oled_write_ln_P(PSTR("LX"), false);
} }
oled_set_cursor(0, 2);
oled_write_P(PSTR("WPM: "), false);
oled_write(get_u8_str(get_current_wpm(), '0'), false);
oled_set_cursor(0, 3);
oled_write_P(led_usb_state.num_lock ? PSTR("NUM") : PSTR(""), false);
} else { } else {
static const char PROGMEM dasbob_logo[] = { static const char PROGMEM dasbob_logo[] = {
0, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0, 0,128,128,128,192,192,192,192,192,192,192,192,192,192,192,128,128, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0,128,128,128,128,128,192,192,192,192,192, 0, 0, 0,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0, 0,128,128,128,192,192,192,192,192,192,192,192,192,192,192,128,128, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0, 0,128,128,128,128,128,192,192,192,192,192, 0, 0, 0,128,128,128,128,128,128,128,128,128, 0, 0, 0, 0,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, 0, 0,

1
keymaps/elf/rules.mk Normal file
View File

@ -0,0 +1 @@
COMBO_ENABLE = yes # Enables combo keys

View File

@ -15,7 +15,7 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
UNICODE_ENABLE = yes # Unicode UNICODE_ENABLE = yes # Unicode
AUDIO_ENABLE = yes # Audio output AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Use shared split_common code SPLIT_KEYBOARD = yes # Use shared split_common code
OLED_ENABLE = yes OLED_ENABLE = yes
OLED_DRIVER = ssd1306 OLED_DRIVER = ssd1306