diff options
5 files changed, 279 insertions, 36 deletions
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json index 7e88355591..44e8b9bca5 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/info.json @@ -26,46 +26,89 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [4, 4], "x": 0.5, "y": 0}, - {"matrix": [4, 3], "x": 1.5, "y": 0}, - {"matrix": [4, 2], "x": 2.5, "y": 0}, - {"matrix": [4, 1], "x": 3.5, "y": 0}, - {"matrix": [4, 0], "x": 4.5, "y": 0}, - {"matrix": [0, 4], "x": 5.5, "y": 0}, - {"matrix": [0, 3], "x": 6.5, "y": 0}, - {"matrix": [0, 2], "x": 7.5, "y": 0}, - {"matrix": [0, 1], "x": 8.5, "y": 0}, - {"matrix": [0, 0], "x": 9.5, "y": 0}, - {"matrix": [3, 0], "x": 10.5, "y": 0}, + {"label": "Q", "matrix": [4, 4], "x": 0.5, "y": 0}, + {"label": "W", "matrix": [4, 3], "x": 1.5, "y": 0}, + {"label": "E", "matrix": [4, 2], "x": 2.5, "y": 0}, + {"label": "R", "matrix": [4, 1], "x": 3.5, "y": 0}, + {"label": "T", "matrix": [4, 0], "x": 4.5, "y": 0}, + {"label": "Y", "matrix": [0, 4], "x": 5.5, "y": 0}, + {"label": "U", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "I", "matrix": [0, 2], "x": 7.5, "y": 0}, + {"label": "O", "matrix": [0, 1], "x": 8.5, "y": 0}, + {"label": "P", "matrix": [0, 0], "x": 9.5, "y": 0}, + {"label": "Backspace", "matrix": [3, 0], "x": 10.5, "y": 0}, - {"matrix": [5, 4], "x": 0.75, "y": 1}, - {"matrix": [5, 3], "x": 1.75, "y": 1}, - {"matrix": [5, 2], "x": 2.75, "y": 1}, - {"matrix": [5, 1], "x": 3.75, "y": 1}, - {"matrix": [5, 0], "x": 4.75, "y": 1}, - {"matrix": [1, 4], "x": 5.75, "y": 1}, - {"matrix": [1, 3], "x": 6.75, "y": 1}, - {"matrix": [1, 2], "x": 7.75, "y": 1}, - {"matrix": [1, 1], "x": 8.75, "y": 1}, - {"matrix": [1, 0], "x": 9.75, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [5, 4], "x": 0.75, "y": 1}, + {"label": "S", "matrix": [5, 3], "x": 1.75, "y": 1}, + {"label": "D", "matrix": [5, 2], "x": 2.75, "y": 1}, + {"label": "F", "matrix": [5, 1], "x": 3.75, "y": 1}, + {"label": "G", "matrix": [5, 0], "x": 4.75, "y": 1}, + {"label": "H", "matrix": [1, 4], "x": 5.75, "y": 1}, + {"label": "J", "matrix": [1, 3], "x": 6.75, "y": 1}, + {"label": "K", "matrix": [1, 2], "x": 7.75, "y": 1}, + {"label": "L", "matrix": [1, 1], "x": 8.75, "y": 1}, + {"label": "Enter", "matrix": [1, 0], "x": 9.75, "y": 1, "w": 1.75}, - {"matrix": [6, 4], "x": 1.25, "y": 2}, - {"matrix": [6, 3], "x": 2.25, "y": 2}, - {"matrix": [6, 2], "x": 3.25, "y": 2}, - {"matrix": [6, 1], "x": 4.25, "y": 2}, - {"matrix": [6, 0], "x": 5.25, "y": 2}, - {"matrix": [2, 4], "x": 6.25, "y": 2}, - {"matrix": [2, 3], "x": 7.25, "y": 2}, - {"matrix": [2, 2], "x": 8.25, "y": 2}, - {"matrix": [2, 1], "x": 9.25, "y": 2}, - {"matrix": [2, 0], "x": 10.25, "y": 2, "w": 1.25}, + {"label": "Z", "matrix": [6, 4], "x": 1.25, "y": 2}, + {"label": "X", "matrix": [6, 3], "x": 2.25, "y": 2}, + {"label": "C", "matrix": [6, 2], "x": 3.25, "y": 2}, + {"label": "V", "matrix": [6, 1], "x": 4.25, "y": 2}, + {"label": "B", "matrix": [6, 0], "x": 5.25, "y": 2}, + {"label": "N", "matrix": [2, 4], "x": 6.25, "y": 2}, + {"label": "M", "matrix": [2, 3], "x": 7.25, "y": 2}, + {"label": ",", "matrix": [2, 2], "x": 8.25, "y": 2}, + {"label": ".", "matrix": [2, 1], "x": 9.25, "y": 2}, + {"label": "/", "matrix": [2, 0], "x": 10.25, "y": 2, "w": 1.25}, - {"matrix": [7, 4], "x": 0, "y": 3}, + {"label": "Ctrl", "matrix": [7, 4], "x": 0, "y": 3}, - {"matrix": [3, 4], "x": 1.5, "y": 3, "w": 1.25}, - {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 6.25}, - {"matrix": [3, 2], "x": 9, "y": 3}, - {"matrix": [3, 1], "x": 10, "y": 3, "w": 1.5} + {"label": "Alt", "matrix": [3, 4], "x": 1.5, "y": 3, "w": 1.25}, + {"label": "Space", "matrix": [3, 3], "x": 2.75, "y": 3, "w": 6.25}, + {"label": "Fn", "matrix": [3, 2], "x": 9, "y": 3}, + {"label": "Ctrl", "matrix": [3, 1], "x": 10, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_isoenter": { + "layout": [ + {"label": "Q", "matrix": [4, 4], "x": 0.5, "y": 0}, + {"label": "W", "matrix": [4, 3], "x": 1.5, "y": 0}, + {"label": "E", "matrix": [4, 2], "x": 2.5, "y": 0}, + {"label": "R", "matrix": [4, 1], "x": 3.5, "y": 0}, + {"label": "T", "matrix": [4, 0], "x": 4.5, "y": 0}, + {"label": "Y", "matrix": [0, 4], "x": 5.5, "y": 0}, + {"label": "U", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "I", "matrix": [0, 2], "x": 7.5, "y": 0}, + {"label": "O", "matrix": [0, 1], "x": 8.5, "y": 0}, + {"label": "P", "matrix": [0, 0], "x": 9.5, "y": 0}, + {"label": "Backspace", "matrix": [3, 0], "x": 10.5, "y": 0}, + + {"label": "A", "matrix": [5, 4], "x": 0.75, "y": 1}, + {"label": "S", "matrix": [5, 3], "x": 1.75, "y": 1}, + {"label": "D", "matrix": [5, 2], "x": 2.75, "y": 1}, + {"label": "F", "matrix": [5, 1], "x": 3.75, "y": 1}, + {"label": "G", "matrix": [5, 0], "x": 4.75, "y": 1}, + {"label": "H", "matrix": [1, 4], "x": 5.75, "y": 1}, + {"label": "J", "matrix": [1, 3], "x": 6.75, "y": 1}, + {"label": "K", "matrix": [1, 2], "x": 7.75, "y": 1}, + {"label": "L", "matrix": [1, 1], "x": 8.75, "y": 1}, + {"label": "Enter", "matrix": [1, 0], "x": 10.25, "y": 1, "w": 1.25, "h": 2}, + + {"label": "Z", "matrix": [6, 4], "x": 1.25, "y": 2}, + {"label": "X", "matrix": [6, 3], "x": 2.25, "y": 2}, + {"label": "C", "matrix": [6, 2], "x": 3.25, "y": 2}, + {"label": "V", "matrix": [6, 1], "x": 4.25, "y": 2}, + {"label": "B", "matrix": [6, 0], "x": 5.25, "y": 2}, + {"label": "N", "matrix": [2, 4], "x": 6.25, "y": 2}, + {"label": "M", "matrix": [2, 3], "x": 7.25, "y": 2}, + {"label": ",", "matrix": [2, 2], "x": 8.25, "y": 2}, + {"label": ".", "matrix": [2, 1], "x": 9.25, "y": 2}, + + {"label": "Ctrl", "matrix": [7, 4], "x": 0, "y": 3}, + + {"label": "Alt", "matrix": [3, 4], "x": 1.5, "y": 3, "w": 1.25}, + {"label": "Space", "matrix": [3, 3], "x": 2.75, "y": 3, "w": 6.25}, + {"label": "Fn", "matrix": [3, 2], "x": 9, "y": 3}, + {"label": "Ctrl", "matrix": [3, 1], "x": 10, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h b/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h new file mode 100644 index 0000000000..8bffbbb3b5 --- /dev/null +++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h @@ -0,0 +1,24 @@ +/* Copyright 2020 marksard + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#pragma once + +// place overrides here +#define TAPPING_TERM 200 +#define IGNORE_MOD_TAP_INTERRUPT + +#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term +#define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c new file mode 100644 index 0000000000..1db0ca318b --- /dev/null +++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c @@ -0,0 +1,162 @@ +/* Copyright 2020 marksard + * + * 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 <http://www.gnu.org/licenses/>. + */ +#include QMK_KEYBOARD_H + +enum layer_number { + _BASE, + _LOWER, + _RAISE, + _ADJUST, +}; + +enum custom_keycodes { + RGBRST = SAFE_RANGE, + LOWER, + RAISE, + KANJI, +}; + +// #define KC_ESAD LT(_ADJUST, KC_ESC) +// #define KC_BSLO LT(_LOWER, KC_BSPC) +#define KC_LOWR MO(_LOWER) +#define KC_SPRA LT(_RAISE, KC_SPC) +#define KC_AJST MO(_ADJUST) + +#define KC_Q_AL LALT_T(KC_Q) +#define KC_A_CT LCTL_T(KC_A) +#define KC_Z_SF LSFT_T(KC_Z) +#define KC_X_AL LALT_T(KC_X) +#define KC_ENSF RSFT_T(KC_ENT) +#define KC_SLSF RSFT_T(KC_SLSH) + +#define KC_F1AL LALT_T(KC_F1) +#define KC_F6CT LCTL_T(KC_F6) +#define KC_11SF LSFT_T(KC_F11) +#define KC_12AL LALT_T(KC_F12) +#define KC_QUSF RCTL_T(KC_QUOT) +#define KC_ROSF RSFT_T(KC_INT1) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_isoenter( + //,-----------------------------------------------------------------------------------------------------------. + KC_Q_AL, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_A_CT, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENSF, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_Z_SF, KC_X_AL, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_LGUI, KC_SPRA, KC_LOWR, KC_RCTL + //`-----------------------------------------------------------------------------------------------------------' + ), + + [_LOWER] = LAYOUT_isoenter( + //,-----------------------------------------------------------------------------------------------------------. + KC_F1AL, KC_F2, KC_F3, KC_F4, KC_F5, KC_MINS, KC_EQL, KC_INT3, KC_LBRC, KC_RBRC, KC_BSLS, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_F6CT, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUSF, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_11SF, KC_12AL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_INT1, KC_SLSH, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + _______, _______, KC_AJST, _______, _______ + //`-----------------------------------------------------------------------------------------------------------' + ), + + [_RAISE] = LAYOUT_isoenter( + //,-----------------------------------------------------------------------------------------------------------. + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, KC_ESC, KC_TAB, KANJI, KC_DEL, KC_COMM, KC_DOT, KC_BSLS, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + _______, _______, _______, KC_AJST, _______ + //`-----------------------------------------------------------------------------------------------------------' + ), + + [_ADJUST] = LAYOUT_isoenter( + //,-----------------------------------------------------------------------------------------------------------. + QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, KC_CAPS + //`-----------------------------------------------------------------------------------------------------------' + ) +}; + +uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case KC_SPRA: + return TAPPING_LAYER_TERM; + default: + return TAPPING_TERM; + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + bool result = false; + switch (keycode) { + case KANJI: + if (record->event.pressed) { + register_code16(keymap_config.swap_lalt_lgui ? A(KC_GRV) : KC_LNG2); + } else { + unregister_code16(keymap_config.swap_lalt_lgui ? A(KC_GRV) : KC_LNG2); + } + break; +#ifdef RGBLIGHT_ENABLE + case RGBRST: + if (record->event.pressed) { + eeconfig_update_rgblight_default(); + rgblight_enable(); + } + break; +#endif + default: + result = true; + break; + } + + return result; +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + if (IS_LAYER_ON(_ADJUST)) { + if (clockwise) { + rgblight_increase_hue_noeeprom(); + } else { + rgblight_decrease_hue_noeeprom(); + } + } else if (IS_LAYER_ON(_LOWER)) { + tap_code16((clockwise == true) ? LCTL(KC_Y) : LCTL(KC_Z)); + } else if (IS_LAYER_ON(_RAISE)) { + tap_code16((clockwise == true) ? S(KC_DOWN) : S(KC_UP)); + } else { + tap_code((clockwise == true) ? KC_WH_D : KC_WH_U); + } + } + return true; +} + +// for exsample customize of LED inducator +// bool led_update_user(led_t led_state) { +// writePin(D2, IS_LAYER_ON(_LOWER)); +// writePin(D1, IS_LAYER_ON(_RAISE)); +// return false; +// } diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/rules.mk b/keyboards/marksard/leftover30/keymaps/default_isoenter/rules.mk new file mode 100644 index 0000000000..5af1ba8536 --- /dev/null +++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/rules.mk @@ -0,0 +1 @@ +ENCODER_ENABLE = yes diff --git a/keyboards/marksard/leftover30/matrix_diagram.md b/keyboards/marksard/leftover30/matrix_diagram.md new file mode 100644 index 0000000000..c1057b8e27 --- /dev/null +++ b/keyboards/marksard/leftover30/matrix_diagram.md @@ -0,0 +1,13 @@ +# Matrix Diagram for marksard Leftover30 + +``` + ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + │44 │43 │42 │41 │40 │04 │03 │02 │01 │00 │30 │ + └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ ┌─────┐ + │54 │53 │52 │51 │50 │14 │13 │12 │11 │10 │ │ │ + └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ └┐10 │ ISO Enter + │64 │63 │62 │61 │60 │24 │23 │22 │21 │20 │ │ │ +┌───┐└┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴────┤ └────┘ +│74 │ │34 │33 │32 │31 │ +└───┘ └────┴────────────────────────┴───┴─────┘ +``` |