diff --git a/colemak_dh_modified/corne/config.h b/colemak_dh_modified/config.h similarity index 100% rename from colemak_dh_modified/corne/config.h rename to colemak_dh_modified/config.h diff --git a/colemak_dh_modified/corne/keymap.c b/colemak_dh_modified/keymap.c similarity index 100% rename from colemak_dh_modified/corne/keymap.c rename to colemak_dh_modified/keymap.c diff --git a/colemak_dh_modified/kyria/config.h b/colemak_dh_modified/kyria/config.h deleted file mode 100644 index 73a0d69..0000000 --- a/colemak_dh_modified/kyria/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2022 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */ -#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */ -#define TAPPING_TOGGLE 1 -#define TAPPING_TERM 190 -#define RETRO_TAPPING - -#define AUTO_SHIFT_TIMEOUT 160 -#define NO_AUTO_SHIFT_NUMERIC -#define ENCODER_RESOLUTION 2 diff --git a/colemak_dh_modified/kyria/keymap.c b/colemak_dh_modified/kyria/keymap.c deleted file mode 100644 index 1b2efa7..0000000 --- a/colemak_dh_modified/kyria/keymap.c +++ /dev/null @@ -1,217 +0,0 @@ -/* Copyright 2019 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include QMK_KEYBOARD_H - -// Note: LAlt/Enter (ALT_ENT) is not the same thing as the keyboard shortcut Alt+Enter. -// The notation `mod/tap` denotes a key that activates the modifier `mod` when held down, and -// produces the key `tap` when tapped (i.e. pressed and released). - -// clang-format off - -enum custom_keycodes { - CTL_SPC = SAFE_RANGE, -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - static uint16_t pressed_timer; - switch (keycode) { - case CTL_SPC: - if (record->event.pressed) { - pressed_timer = timer_read(); - register_code(KC_LGUI); - } else { - unregister_code(KC_LGUI); - if (timer_elapsed(pressed_timer) < TAPPING_TERM) { - register_code(KC_LCTL); - SEND_STRING(" "); - unregister_code(KC_LCTL); - } - } - return false; - } - return true; -} - -const uint16_t PROGMEM combo1[] = {KC_SPC, KC_T, COMBO_END}; -const uint16_t PROGMEM combo2[] = {KC_SPC, KC_S, COMBO_END}; -const uint16_t PROGMEM combo3[] = {KC_SPC, KC_R, COMBO_END}; -combo_t key_combos[] = { - COMBO(combo1, OSL(2)), - COMBO(combo2, OSL(4)), - COMBO(combo3, OSL(3)), -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* - * Base Layer: COLEMAK-DH - * - * ,-------------------------------------------. ,-------------------------------------------. - * | Tab | Q | W | F | P | B | | J | L | U | Y | ; | Bksp | - * |--------+------+------+------+------+------| |------+------+------+------+------+--------| - * |Ctrl/Esc| A | R | S | T | G | | M | N | E | I | O |Ctrl/' "| - * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| - * |LShift/(| Z | X | C | D | V | [ { |CapsLk| |F-keys| ] } | K | H | , < | . > | / ? |)/RShift| - * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' - * |Adjust| LGUI | LAlt/| Space| Nav | | Sym | Space| AltGr| RGUI | Menu | - * | | | Enter| | | | | | | | | - * `----------------------------------' `----------------------------------' - */ - [0] = LAYOUT( - KC_TAB , KC_Q, KC_W, KC_F, KC_P , KC_B , KC_J, KC_L , KC_U , KC_Y , KC_SCLN , KC_BSPC, - LCTL_T(KC_ESC), KC_A, KC_R, KC_S, KC_T, KC_G , KC_M, KC_N , KC_E, KC_I, KC_O, RCTL_T(KC_QUOT), - SC_LSPO, KC_Z, KC_X, KC_C, KC_D , KC_V , KC_NO, KC_LALT, KC_MPLY, TO(4), KC_K, KC_H ,KC_COMM, KC_DOT , KC_SLSH, SC_RSPC, - OSL(4) ,OSL(1), KC_SPC , CTL_SPC, LT(2, KC_BSPC), RGUI_T(KC_BSPC), RALT_T(KC_TAB), LT(3, KC_ENT), OSL(1), TO(2) - ), - - [1] = LAYOUT( - KC_TAB , KC_EXLM,KC_AT, KC_HASH,KC_DLR,KC_PERC , KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN,KC_RPRN , KC_BSPC, - LCTL_T(KC_ESC), KC_NO, KC_NO, KC_NO, KC_CIRC, KC_NO , KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, - SC_LSPO, KC_NO, KC_NO, KC_NO, KC_NO , KC_NO , KC_NO, TO(3), KC_MPLY, TO(4), KC_UNDS, KC_PLUS, KC_LCBR ,KC_RCBR, KC_PIPE, KC_TILD, - OSL(4),TO(1), TO(0) , CTL_SPC, LT(2, KC_BSPC), RGUI_T(KC_BSPC), RALT_T(KC_TAB), LT(3, KC_ENT), TO(1), TO(2) - ), - - [2] = LAYOUT( - KC_TAB , KC_F1, KC_F2, KC_F3,KC_F4,KC_F5 , KC_CIRC, KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, - LCTL_T(KC_ESC), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 , KC_COMM, KC_4 , KC_5, KC_6, KC_MINS, KC_EQL, - SC_LSPO, KC_Z, KC_X, KC_C, KC_F11 , KC_F12 , KC_NO, TO(3), KC_MPLY, TO(2), KC_DOT, KC_1 ,KC_2, KC_3 , KC_SLSH, KC_ASTR, - LALT_T(KC_LBRC),TO(4), TO(0) , CTL_SPC, LT(4, KC_BSPC), RGUI_T(KC_BSPC), RALT_T(KC_TAB), LT(3, KC_ENT), TO(3), TO(1) - ), - - [3] = LAYOUT( - KC_MUTE, KC_MPRV, KC_MNXT, KC_VOLD,KC_VOLU, KC_MPLY , KC_MS_D, KC_MS_R , KC_WH_R , KC_NO , KC_NO , KC_BSPC, - LCTL_T(KC_ESC), KC_NO, KC_NO, KC_BTN3, KC_BTN1, KC_BTN2 , KC_NO, KC_WH_U , KC_WH_D, KC_NO, KC_NO, RCTL_T(KC_QUOT), - SC_LSPO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(3), KC_MPLY, TO(2), KC_MS_U, KC_MS_L ,KC_WH_L, KC_NO , KC_NO, SC_RSPC, - LALT_T(KC_LBRC),TO(4), TO(0) , CTL_SPC, LT(4, KC_BSPC), TO(4), RALT_T(KC_TAB), LT(3, KC_ENT), TO(3), RGUI_T(KC_RBRC) - ), - - [4] = LAYOUT( - KC_TAB , KC_NO, KC_NO, KC_NO, KC_NO , KC_NO , KC_DOWN, KC_RGHT , KC_PGUP , KC_NO , KC_NO , KC_BSPC, - LCTL_T(KC_ESC), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO , KC_HOME, KC_END , KC_NO, KC_NO, KC_NO, RCTL_T(KC_QUOT), - SC_LSPO, KC_NO, KC_NO, KC_NO, KC_NO , KC_NO , KC_NO, TO(3), KC_MPLY, TO(2), KC_UP, KC_LEFT ,KC_PGDN, KC_NO , KC_NO, SC_RSPC, - LALT_T(KC_LBRC),OSL(1), TO(0) , CTL_SPC, LT(4, KC_BSPC), RGUI_T(KC_BSPC), RALT_T(KC_TAB), LT(3, KC_ENT), OSL(1), TO(2) - ), -// /* -// * Layer template -// * -// * ,-------------------------------------------. ,-------------------------------------------. -// * | | | | | | | | | | | | | | -// * |--------+------+------+------+------+------| |------+------+------+------+------+--------| -// * | | | | | | | | | | | | | | -// * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| -// * | | | | | | | | | | | | | | | | | | -// * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' -// * | | | | | | | | | | | | -// * | | | | | | | | | | | | -// * `----------------------------------' `----------------------------------' -// */ -// [_LAYERINDEX] = LAYOUT( -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -// ), - -}; - -/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c - * These default settings can be overriden by your own settings in your keymap.c - * For your convenience, here's a copy of those settings so that you can uncomment them if you wish to apply your own modifications. - * DO NOT edit the rev1.c file; instead override the weakly defined default functions by your own. - */ - -#ifdef OLED_ENABLE -oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } - -bool oled_task_user(void) { - if (is_keyboard_master()) { - // QMK Logo and version information - // clang-format off - static const char PROGMEM qmk_logo[] = { - 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, - 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, - 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0}; - // clang-format on - - oled_write_P(qmk_logo, false); - oled_write_P(PSTR("Kyria rev1.0\n\n"), false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state|default_layer_state)) { - case 0: - oled_write_P(PSTR("COLEMAK-DH\n"), false); - break; - case 1: - oled_write_P(PSTR("SYM\n"), false); - break; - case 2: - oled_write_P(PSTR("NUM/FN\n"), false); - break; - case 3: - oled_write_P(PSTR("MEDIA/MOUSE\n"), false); - break; - case 4: - oled_write_P(PSTR("NAV\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Write host Keyboard LED Status to OLEDs - led_t led_usb_state = host_keyboard_led_state(); - oled_write_P(led_usb_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false); - oled_write_P(led_usb_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); - oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); - } else { - // clang-format off - static const char PROGMEM kyria_logo[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,192,224,240,124, 62, 31, 15, 7, 3, 1,128,192,224,240,120, 56, 60, 28, 30, 14, 14, 7, 7,135,231,127, 31,255,255, 31,127,231,135, 7, 7, 14, 14, 30, 28, 60, 56,120,240,224,192,128, 1, 3, 7, 15, 31, 62,124,240,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,240,252,255, 31, 7, 1, 0, 0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135, 1, 0, 0,255,255, 0, 0, 1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192, 0, 0, 1, 7, 31,255,252,240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,254,255,255, 1, 1, 7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30, 7, 1, 1,255,255,254, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0,255,255, 0, 0,192,192, 48, 48, 0, 0,240,240, 0, 0, 0, 0, 0, 0,240,240, 0, 0,240,240,192,192, 48, 48, 48, 48,192,192, 0, 0, 48, 48,243,243, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48,192,192, 0, 0, 0, 0, 0, - 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31, 7,255,255, 7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0, 63, 63, 3, 3, 12, 12, 48, 48, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51, 15, 15, 0, 0, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 63, 63, 48, 48, 0, 0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 15, 63,255,248,224,128, 0, 0, 3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128, 0, 0,255,255, 0, 0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15, 3, 0, 0,128,224,248,255, 63, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 3, 7, 15, 62,124,248,240,224,192,128, 1, 3, 7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15, 7, 3, 1,128,192,224,240,248,124, 62, 15, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15, 7, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - // clang-format on - oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); - } - return false; -} -#endif - -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - - if (index == 1) { - // Volume control - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } else if (index == 0) { - // Page up/Page down - if (clockwise) { - tap_code(KC_WH_D); - } else { - tap_code(KC_WH_U); - } - } - return false; -} -#endif diff --git a/colemak_dh_modified/kyria/rules.mk b/colemak_dh_modified/kyria/rules.mk deleted file mode 100644 index 2abd803..0000000 --- a/colemak_dh_modified/kyria/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -OLED_ENABLE = yes -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGB_MATRIX_ENABLE = no # Disable keyboard RGB matrix, as it is enabled by default on rev3 -RGBLIGHT_ENABLE = no # Disable keyboard RGB underglow -MOUSEKEY_ENABLE = yes -LTO_ENABLE = yes -UNICODE_ENABLE = yes -AUTO_SHIFT_ENABLE = yes -COMBO_ENABLE = yes diff --git a/colemak_dh_modified/corne/rules.mk b/colemak_dh_modified/rules.mk similarity index 100% rename from colemak_dh_modified/corne/rules.mk rename to colemak_dh_modified/rules.mk