diff options
25 files changed, 1057 insertions, 19 deletions
| diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h new file mode 100644 index 0000000000..b59e04474b --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h @@ -0,0 +1,44 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 + +#define SPLIT_LAYER_STATE_ENABLE +#define SPLIT_LED_STATE_ENABLE +#define MASTER_RIGHT// EE_HANDS MASTER_RIGHT + +// these should work better for homerow modifiers +#define TAPPING_TERM 350 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD + +#define LEADER_PER_KEY_TIMING +#define LEADER_TIMEOUT 300 + +#ifdef OLED_ENABLE +  #define OLED_DISPLAY_128X64 +  #define OLED_TIMEOUT 10000 +#endif + +#ifdef ENCODER_ENABLE +  // EC11K encoders have a different resolution than other EC11 encoders. +  // When using the default resolution of 4, if you notice your encoder skipping +  // every other tick, lower the resolution to 2. +  #define ENCODER_RESOLUTION 2 +  // Also, flip direction +  #define ENCODER_DIRECTION_FLIP +#endif diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/keymap.c b/keyboards/splitkb/kyria/keymaps/zigotica/keymap.c new file mode 100644 index 0000000000..2671f07463 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/keymap.c @@ -0,0 +1,58 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 "zigotica.h" + +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +    [BASE] = LAYOUT_wrapper( +      _______,    _STENAI_L1,                                         _STENAI_R1,      _______, +      _______,    _STENAI_L2,                                         _STENAI_R2,      _______, +      _______,    _STENAI_L3, _______, _______,   _______, _______,   _STENAI_R3,      _______, +         _______, _______, _STENAI_LT, _______,   _______, _STENAI_RT, _______, _______ +    ), + +    [_NUM] = LAYOUT_wrapper( +      _______,    ____NUM_L1,                                         ____NUM_R1,      _______, +      _______,    ____NUM_L2,                                         ____NUM_R2,      _______, +      _______,    ____NUM_L3, _______, _______,   _______, _______,   ____NUM_R3,      _______, +         _______, _______, ____NUM_LT, _______,   _______, ____NUM_RT, _______, _______ +    ), + +    [_NAV] = LAYOUT_wrapper( +      _______,    ____NAV_L1,                                         ____NAV_R1,      _______, +      _______,    ____NAV_L2,                                         ____NAV_R2,      _______, +      _______,    ____NAV_L3, _______, _______,   _______, _______,   ____NAV_R3,      _______, +         _______, _______, ____NAV_LT, _______,   _______, ____NAV_RT, _______, _______ +    ), + +    [_SYM] = LAYOUT_wrapper( +      _______,    ____SYM_L1,                                         ____SYM_R1,      _______, +      _______,    ____SYM_L2,                                         ____SYM_R2,      _______, +      _______,    ____SYM_L3, _______, _______,   _______, _______,   ____SYM_R3,      _______, +         _______, _______, ____SYM_LT, _______,   _______, ____SYM_RT, _______, _______ +    ), + +    [_FN] = LAYOUT_wrapper( +      _______,    ____FN_L1,                                         ____FN_R1,      _______, +      _______,    ____FN_L2,                                         ____FN_R2,      _______, +      _______,    ____FN_L3, _______, _______,   _______, _______,   ____FN_R3,      _______, +         _______, _______, ____FN_LT, _______,   _______, ____FN_RT, _______, _______ +    ), +}; + diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/oled.c b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c new file mode 100644 index 0000000000..46bb2c3cea --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c @@ -0,0 +1,87 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 "zigotica.h" + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { +	return OLED_ROTATION_180; +} + +static void render_kyria_logo(void) { +    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 +    }; +    oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); +} + +static void render_qmk_logo(void) { + 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}; + +  oled_write_P(qmk_logo, false); +} + +static void render_status(void) { +    // QMK Logo and version information +    render_qmk_logo(); +    oled_write_P(PSTR("Kyria v1.2\n\n"), false); + +    // Host Keyboard Layer Status +    oled_write_P(PSTR("Layer: "), false); +    switch (get_highest_layer(layer_state)) { +        case BASE: +            oled_write_P(PSTR("STENAI\n"), false); +            break; +        case _NUM: +            oled_write_P(PSTR("NUM\n"), false); +            break; +        case _NAV: +            oled_write_P(PSTR("NAV\n"), false); +            break; +        case _SYM: +            oled_write_P(PSTR("SYM\n"), false); +            break; +        case _FN: +            oled_write_P(PSTR("FN\n"), false); +            break; +        default: +            oled_write_P(PSTR("Undef\n"), false); +    } + +    // Host Keyboard LED Status +    led_t led_state = host_keyboard_led_state(); +    oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false); +    oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false); +    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false); +} + +void oled_task_user(void) { +    if (!is_keyboard_left()) { +        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) +    } else { +        render_kyria_logo(); +    } +} + diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/oled.h b/keyboards/splitkb/kyria/keymaps/zigotica/oled.h new file mode 100644 index 0000000000..2422c68f28 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/oled.h @@ -0,0 +1,18 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 +#include "zigotica.h" diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/rules.mk b/keyboards/splitkb/kyria/keymaps/zigotica/rules.mk new file mode 100644 index 0000000000..29d98d7019 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/rules.mk @@ -0,0 +1,10 @@ +OLED_ENABLE = yes +ENCODER_ENABLE = no +RGBLIGHT_ENABLE = no + +COMBO_ENABLE =  yes +TAP_DANCE_ENABLE = yes +LEADER_ENABLE = no +UNICODE_ENABLE = no +MOUSEKEY_ENABLE = yes + diff --git a/keyboards/z12/keymaps/zigotica/config.h b/keyboards/z12/keymaps/zigotica/config.h new file mode 100644 index 0000000000..fbab76d5f0 --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/config.h @@ -0,0 +1,30 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 + +#include "config_common.h" + +#ifdef OLED_ENABLE +  #define OLED_DISPLAY_128X32 +#endif + +// EC11 encoders' resolution. +// Reduce the value to 2 if you feel missing values: +#define ENCODER_RESOLUTION 4 + +// Allows correct registered values by rotary encoder: +#define TAP_CODE_DELAY 10 diff --git a/keyboards/z12/keymaps/zigotica/encoder.c b/keyboards/z12/keymaps/zigotica/encoder.c new file mode 100644 index 0000000000..49a3d859b6 --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/encoder.c @@ -0,0 +1,114 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 "zigotica.h" + +bool encoder_update_user(uint8_t index, bool clockwise) { +    switch(get_highest_layer(layer_state)){ +        case _VIM: +            if (index == 0) { // LEFT +                // Cycle through buffers +                if (clockwise) { +                    register_code(KC_ESC); +                    SEND_STRING(":bprevious"); +                    register_code(KC_ENT); +                    unregister_code(KC_ESC); +                    unregister_code(KC_ENT); +                } else { +                    register_code(KC_ESC); +                    SEND_STRING(":bnext"); +                    register_code(KC_ENT); +                    unregister_code(KC_ESC); +                    unregister_code(KC_ENT); +                } +            } else { // RIGHT +                // Scroll +                if (clockwise) { +                    tap_code(KC_PGDN); +                } else { +                    tap_code(KC_PGUP); +                } +            } +        break; +        case _BROWSER: +            if (index == 0) { // LEFT +                // Cycle through Tabs +                if (clockwise) { +                    tap_code16(C(KC_TAB)); +                    /* register_code16(G(KC_RCBR)); */ +                    /* unregister_code16(G(KC_RCBR)); */ +                } else { +                    tap_code16(S(C(KC_TAB))); +                    /* register_code16(G(KC_LCBR)); */ +                    /* unregister_code16(G(KC_LCBR)); */ +                } +            } else { // RIGHT +                // Scroll up/down +                if (clockwise) { +                    register_code(KC_WH_U); +                    unregister_code(KC_WH_U); +                } else { +                    register_code(KC_WH_D); +                    unregister_code(KC_WH_D); +                } +            } +        break; +        case _FIGMA: +            if (index == 0) { // LEFT +                // Volume control. +                if (clockwise) { +                    tap_code(KC_VOLU); +                } else { +                    tap_code(KC_VOLD); +                } +            } else { // RIGHT +                // Zoom in/out +                if (clockwise) { +                    register_code(KC_LGUI); +                    register_code(KC_WH_D); +                    unregister_code(KC_WH_D); +                    unregister_code(KC_LGUI); +                } else { +                    register_code(KC_LGUI); +                    register_code(KC_WH_U); +                    unregister_code(KC_WH_U); +                    unregister_code(KC_LGUI); +                } +            } +        break; +        case _TERMINAL: +        default: +            if (index == 0) { // LEFT +                // Volume control. +                if (clockwise) { +                    tap_code(KC_VOLU); +                } else { +                    tap_code(KC_VOLD); +                } +            } else { // RIGHT +                // Scroll +                if (clockwise) { +                    tap_code(KC_PGDN); +                } else { +                    tap_code(KC_PGUP); +                } +            } +        break; +    } +    return false; +} + + diff --git a/keyboards/z12/keymaps/zigotica/encoder.h b/keyboards/z12/keymaps/zigotica/encoder.h new file mode 100644 index 0000000000..2422c68f28 --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/encoder.h @@ -0,0 +1,18 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 +#include "zigotica.h" diff --git a/keyboards/z12/keymaps/zigotica/keymap.c b/keyboards/z12/keymaps/zigotica/keymap.c new file mode 100644 index 0000000000..7e969de96e --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/keymap.c @@ -0,0 +1,126 @@ +/* Copyright 2020 +   Sergi Meseguer <[email protected]> + +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 "zigotica.h" + +// Custom Keycodes +#define MODE_1 TO(_TERMINAL) +#define MODE_2 TO(_FIGMA) +#define MODE_3 TO(_BROWSER) +#define MODE_4 TO(_VIM) + +enum custom_keycodes { +    VIM_SIP = SAFE_RANGE +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +    switch (keycode) { +        case VIM_SIP: +            if (record->event.pressed) { +                register_code(KC_ESC); +                SEND_STRING(":Ag "); +            } else { +                // released +                unregister_code(KC_ESC); +            } +        break; +    } +    return true; +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* + * TERMINAL Layer + * + * ,-----------------------------. + * |       | TERM | FIGM |       | + * |-------+------+------+-------| + * |  VOL  | BROW |  VIM | SCROLL| + * |-------+------+------+-------| + *    |-------+-------+-------| + *    | MEDIA |   o   |   o   | + *    |-------+-------+-------| + *    |   o   |   o   |   o   | + *    |-------+-------+-------| + */ +    [_TERMINAL] = LAYOUT( +               MODE_1, MODE_2, +    ZK_MEDIA,  MODE_3, MODE_4,  _______, +    _______,      _______,      _______, +    _______,      _______,      _______ +    ), +/* + * VIM Layer + * + * ,-----------------------------. + * |       | TERM | FIGM |       | + * |-------+------+------+-------| + * |BUFFER | BROW |  VIM | SCROLL| + * |-------+------+------+-------| + *    |-------+-------+-------| + *    |SEARCH |   o   |   o   | + *    |-------+-------+-------| + *    |   o   |   o   |   o   | + *    |-------+-------+-------| + */ +    [_VIM] = LAYOUT( +             _______, _______, +    _______, _______, _______,  _______, +    VIM_SIP,      _______,      _______, +    _______,      _______,      _______ +    ), +/* + * FIGMA Layer + * + * ,-----------------------------. + * |       | TERM | FIGM |       | + * |-------+------+------+-------| + * |  VOL  | BROW |  VIM | ZOOM  | + * |-------+------+------+-------| + *    |-------+-------+-------| + *    | ZOOM  | GRIDS |  FULL | + *    |-------+-------+-------| + *    |   o   |   o   |   o   | + *    |-------+-------+-------| + */ +    [_FIGMA] = LAYOUT( +             _______, _______, +    _______, _______, _______,  _______, +    LSFT(KC_1), LCTL(KC_G), LGUI(KC_BSLS), +    _______,      _______,      _______ +    ), +/* + * BROWSER Layer + * + * ,-----------------------------. + * |       | TERM | FIGM |       | + * |-------+------+------+-------| + * |  TABS | BROW |  VIM | SCROLL| + * |-------+------+------+-------| + *    |-------+-------+-------| + *    |SEARCH | BOOKM | DEVTL | + *    |-------+-------+-------| + *    |   o   |   o   |   o   | + *    |-------+-------+-------| + */ +    [_BROWSER] = LAYOUT( +             _______, _______, +    _______, _______, _______,  _______, +    G(KC_F),      G(KC_D),   G(A(KC_I)), +    _______,      _______,      _______ +    ), +}; diff --git a/keyboards/z12/keymaps/zigotica/oled.c b/keyboards/z12/keymaps/zigotica/oled.c new file mode 100644 index 0000000000..4b428a42b1 --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/oled.c @@ -0,0 +1,43 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 "zigotica.h" + +static void render_status(void) { +    oled_write_P(PSTR("z12 v1.0\n"), false); +    oled_write_P(PSTR("Layer: "), false); +    switch (get_highest_layer(layer_state)) { +        case _VIM: +            oled_write_P(PSTR("VIM\n\nBUFFER       SCROLL"), false); +            break; +        case _FIGMA: +            oled_write_P(PSTR("FIGMA\n\nVOLUME         ZOOM"), false); +            break; +        case _BROWSER: +            oled_write_P(PSTR("BROWSER\n\nTABS         SCROLL"), false); +            break; +        case _TERMINAL: +            oled_write_P(PSTR("TERMINAL\n\nVOLUME       SCROLL"), false); +            break; +        default: +            oled_write_P(PSTR("Undef\n"), false); +    } +} + +void oled_task_user(void) { +    render_status(); +} + diff --git a/keyboards/z12/keymaps/zigotica/oled.h b/keyboards/z12/keymaps/zigotica/oled.h new file mode 100644 index 0000000000..2422c68f28 --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/oled.h @@ -0,0 +1,18 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 +#include "zigotica.h" diff --git a/keyboards/z12/keymaps/zigotica/rules.mk b/keyboards/z12/keymaps/zigotica/rules.mk new file mode 100644 index 0000000000..02e37aa80b --- /dev/null +++ b/keyboards/z12/keymaps/zigotica/rules.mk @@ -0,0 +1,4 @@ +OLED_ENABLE = yes # Enables the use of OLED displays +RAW_ENABLE = yes +TAP_DANCE_ENABLE = yes +MOUSEKEY_ENABLE =  yes diff --git a/keyboards/z12/z12.c b/keyboards/z12/z12.c index 99fe62ab93..2af8836cab 100644 --- a/keyboards/z12/z12.c +++ b/keyboards/z12/z12.c @@ -18,22 +18,6 @@  #ifdef ENCODER_ENABLE  bool encoder_update_kb(uint8_t index, bool clockwise) { -    if (!encoder_update_user(index, clockwise)) { return false; } -    if (index == 0) { // LEFT -        // Scroll -        if (clockwise) { -            tap_code_delay(KC_PGDN, 10); -        } else { -            tap_code_delay(KC_PGUP, 10); -        } -    } else { // RIGHT -        // Volume control. -        if (clockwise) { -            tap_code_delay(KC_VOLU, 10); -        } else { -            tap_code_delay(KC_VOLD, 10); -        } -    } -    return false; +    return encoder_update_user(index, clockwise);  }  #endif diff --git a/keyboards/z34/keymaps/default/rules.mk b/keyboards/z34/keymaps/default/rules.mk index 9281e9843b..827811a362 100644 --- a/keyboards/z34/keymaps/default/rules.mk +++ b/keyboards/z34/keymaps/default/rules.mk @@ -1,3 +1,3 @@  # There are no extra pins, so we make sure to disable OLED and Encoders -OLED_ENABLE = no   		  # Enables the use of OLED displays -ENCODER_ENABLE = no       # Enables the use of encoders +OLED_SUPPORTED = no +ENCODER_SUPPORTED = no diff --git a/keyboards/z34/keymaps/zigotica/config.h b/keyboards/z34/keymaps/zigotica/config.h new file mode 100644 index 0000000000..1b223cb71d --- /dev/null +++ b/keyboards/z34/keymaps/zigotica/config.h @@ -0,0 +1,28 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 + +#include "config_common.h" + +#define MASTER_RIGHT + +// these should work better for homerow modifiers +#define TAPPING_TERM 350 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD + diff --git a/keyboards/z34/keymaps/zigotica/keymap.c b/keyboards/z34/keymaps/zigotica/keymap.c new file mode 100644 index 0000000000..88c6a3db1b --- /dev/null +++ b/keyboards/z34/keymaps/zigotica/keymap.c @@ -0,0 +1,57 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> + +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 "zigotica.h" + +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +    [BASE] = LAYOUT_wrapper( +       _STENAI_L1,    _STENAI_R1, +       _STENAI_L2,    _STENAI_R2, +       _STENAI_L3,    _STENAI_R3, +       _STENAI_LT,    _STENAI_RT +    ), + +    [_NUM] = LAYOUT_wrapper( +      ____NUM_L1,     ____NUM_R1, +      ____NUM_L2,     ____NUM_R2, +      ____NUM_L3,     ____NUM_R3, +      ____NUM_LT,     ____NUM_RT +    ), + +    [_NAV] = LAYOUT_wrapper( +      ____NAV_L1,     ____NAV_R1, +      ____NAV_L2,     ____NAV_R2, +      ____NAV_L3,     ____NAV_R3, +      ____NAV_LT,     ____NAV_RT +    ), + +    [_SYM] = LAYOUT_wrapper( +      ____SYM_L1,     ____SYM_R1, +      ____SYM_L2,     ____SYM_R2, +      ____SYM_L3,     ____SYM_R3, +      ____SYM_LT,     ____SYM_RT +    ), + +    [_FN] = LAYOUT_wrapper( +      ____FN_L1,     ____FN_R1, +      ____FN_L2,     ____FN_R2, +      ____FN_L3,     ____FN_R3, +      ____FN_LT,     ____FN_RT +    ), +}; + diff --git a/keyboards/z34/keymaps/zigotica/rules.mk b/keyboards/z34/keymaps/zigotica/rules.mk new file mode 100644 index 0000000000..9abdfb40b4 --- /dev/null +++ b/keyboards/z34/keymaps/zigotica/rules.mk @@ -0,0 +1,7 @@ +# There are no extra pins, so we make sure to disable OLED and Encoders +OLED_SUPPORTED = no +ENCODER_SUPPORTED = no + +MOUSEKEY_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = yes diff --git a/users/zigotica/combos.c b/users/zigotica/combos.c new file mode 100644 index 0000000000..8fb5b3c9fc --- /dev/null +++ b/users/zigotica/combos.c @@ -0,0 +1,40 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 "combos.h" + +enum combos { +  EM_EMAIL, +  CL_CAPSL, +  COMBO_LENGTH +}; +uint16_t COMBO_LEN = COMBO_LENGTH; + +const uint16_t PROGMEM email_combo[] = {LT(_SYM, KC_E), KC_M, COMBO_END}; +const uint16_t PROGMEM caps_combo[] = {KC_C, KC_L, COMBO_END}; + +combo_t key_combos[] = { +  [EM_EMAIL] = COMBO_ACTION(email_combo), +  [CL_CAPSL] = COMBO(caps_combo, KC_CAPSLOCK), +}; + +void process_combo_event(uint16_t combo_index, bool pressed) { +  switch(combo_index) { +    case EM_EMAIL: +      if (pressed) { +        SEND_STRING("[email protected]"); +      } +      break; +  } +} + diff --git a/users/zigotica/combos.h b/users/zigotica/combos.h new file mode 100644 index 0000000000..c75a107b9a --- /dev/null +++ b/users/zigotica/combos.h @@ -0,0 +1,17 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 +#include "zigotica.h" + diff --git a/users/zigotica/rows.h b/users/zigotica/rows.h new file mode 100644 index 0000000000..e73d72bbe2 --- /dev/null +++ b/users/zigotica/rows.h @@ -0,0 +1,194 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 +#include "zigotica.h" + +// clang-format off +#define _BLANK_ROW      _______, _______, _______, _______, _______ +#define _BLANK_THUMB    _______, _______ + +/* + * STENAI Layer + * + *   ,---------------------------------------.         ,---------------------------------------. + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |  ` ~  |   W   |   D   |   P   |   F   |         |   K   |   Y   |   U   |   Q   |  ' "  | + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |   H   |   R   |   S   |   T   |   G   |         |   M   |   N   |   A   |   I   |   O   | + *   |  alt  | ctrl  | shft  | meta  |       |         |       |  meta |  shft | ctrl  |  alt  | + *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |   B   |   X   |   C   |   V   |  [ {  |         |  , <  |   L   |   Z   |   J   |   . > | + *   |       |       |       |       | TD ]} |         |  TD ; |       |       |       |  TD : | + *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------. + *                           |       |       |         |       |       | + *                           |  ESC  |  SPC  |         |   E   | INTRO | + *                           |  num  |  nav  |         |  sym  |   fn  | + *                           `---------------'         `---------------' + * + */ +#define _STENAI_L1      KC_GRV,           KC_W,            KC_D,          KC_P,             KC_F +#define _STENAI_L2      LALT_T(KC_H),     LCTL_T(KC_R),    LSFT_T(KC_S),  LGUI_T(KC_T),     KC_G +#define _STENAI_L3      KC_B,             KC_X,            KC_C,          KC_V,             ZK_BRC +#define _STENAI_LT      LT(_NUM, KC_ESC), LT(_NAV, KC_SPC) + +#define _STENAI_R1      KC_K,             KC_Y,            KC_U,          KC_Q,             KC_QUOT +#define _STENAI_R2      KC_M,             RGUI_T(KC_N),    RSFT_T(KC_A),  RCTL_T(KC_I),     RALT_T(KC_O) +#define _STENAI_R3      ZK_SEMI,          KC_L,            KC_Z,          KC_J,             ZK_COLON +#define _STENAI_RT      LT(_SYM, KC_E),   LT(_FN, KC_ENT) + + +#define _COLEMAK_L1     KC_Q,    KC_W,    KC_F,    KC_P,    KC_G +#define _COLEMAK_L2     KC_A,    KC_R,    KC_S,    KC_T,    KC_D +#define _COLEMAK_L3     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B + +#define _COLEMAK_R1     KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN +#define _COLEMAK_R2     KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT +#define _COLEMAK_R3     KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH + +#define _QWERTY_L1      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T +#define _QWERTY_L2      KC_A,    KC_S,    KC_D,    KC_F,    KC_G +#define _QWERTY_L3      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B + +#define _QWERTY_R1      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P +#define _QWERTY_R2      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT +#define _QWERTY_R3      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH + +/* + * NUM Layer + * + *   ,---------------------------------------.         ,---------------------------------------. + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |       |   -   |   +   |   =   |       |         |       |   7   |   8   |   9   |       | + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |       |       |       |       |       |         |       |   1   |   2   |   3   |       | + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| + *   |       |       |       |       |       |         |       |       |       |       |       | + *   |       |       |   /   |   *   |       |         |       |   4   |   5   |   6   |       | + *   |       |       |       |       |       |         |       |       |       |       |       | + *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------. + *                           |:::::::|       |         |       |       | + *                           |:::::::|       |         |   0   |  BACK | + *                           |:::::::|       |         |       |       | + *                           `---------------'         `---------------' + * + */ +#define ____NUM_L1      _______, KC_MINS, KC_PLUS, KC_EQL,  _______ +#define ____NUM_L2      _BLANK_ROW +#define ____NUM_L3      _______, _______, KC_SLSH, KC_ASTR, _______ +#define ____NUM_LT      _BLANK_THUMB + +#define ____NUM_R1      _______, KC_7,    KC_8,    KC_9,    _______ +#define ____NUM_R2      _______, KC_1,    KC_2,    KC_3,    _______ +#define ____NUM_R3      _______, KC_4,    KC_5,    KC_6,    _______ +#define ____NUM_RT      KC_0,    KC_BSPC + +/* +* NAVIGATION Layer +* +*   ,---------------------------------------.         ,---------------------------------------. +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |       |  PREV |  PLAY |  NEXT |       |         |  WHDN |  HOME |   UP  |  PGUP |       | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |       |       |       |       |       |         |  WHUP |  LF   |   DN  |  RG   |       | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |  END  |       |  PGDN |       | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------. +*                           |       |:::::::|         |       |       | +*                           |       |:::::::|         |       |  DEL  | +*                           |       |:::::::|         |       |       | +*                           `---------------'         `---------------' +*/ +#define ____NAV_L1      _______, KC_MPRV, KC_MPLY, KC_MNXT, _______ +#define ____NAV_L2      _BLANK_ROW +#define ____NAV_L3      _BLANK_ROW +#define ____NAV_LT      _BLANK_THUMB + +#define ____NAV_R1      KC_WH_D, KC_HOME, KC_UP,   KC_PGUP, _______ +#define ____NAV_R2      KC_WH_U, KC_LEFT, KC_DOWN, KC_RGHT, _______ +#define ____NAV_R3      _______, KC_END,  _______, KC_PGDN, _______ +#define ____NAV_RT      _______, KC_DEL + +/* +* SYMBOLS Layer +* +*   ,---------------------------------------.         ,---------------------------------------. +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |   %   |   &   |   ?   |   |   |   !   |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |   #   |   @   |   :   |   ;   |   $   |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |   (   |   ~   |   /   |   \   |   ^   |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------. +*                           |       |       |         |:::::::|       | +*                           |       |  TAB  |         |:::::::|       | +*                           |       |       |         |:::::::|       | +*                           `---------------'         `---------------' +*/ +#define ____SYM_L1      KC_PERC, KC_AMPR, KC_QUES, KC_PIPE, KC_EXLM +#define ____SYM_L2      KC_HASH, KC_AT,   KC_COLN, KC_SCLN, KC_DLR +#define ____SYM_L3      ZK_PRN,  KC_TILD, KC_SLSH, KC_BSLS, KC_CIRC +#define ____SYM_LT      _______, KC_TAB + +#define ____SYM_R1      _BLANK_ROW +#define ____SYM_R2      _BLANK_ROW +#define ____SYM_R3      _BLANK_ROW +#define ____SYM_RT      _BLANK_THUMB + +/* +* FUNCTION KEYS Layer +* +*   ,---------------------------------------.         ,---------------------------------------. +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |  F7   |   F8  |   F9  |  F10  | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |  F1   |   F2  |   F3  |  F11  | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------| +*   |       |       |       |       |       |         |       |       |       |       |       | +*   |       |       |       |       |       |         |       |  F4   |   F5  |   F6  |  F12  | +*   |       |       |       |       |       |         |       |       |       |       |       | +*   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------. +*                           |       |       |         |       |:::::::| +*                           |       |  TAB  |         |       |:::::::| +*                           |       |       |         |       |:::::::| +*                           `---------------'         `---------------' +*/ +#define ____FN_L1       _BLANK_ROW +#define ____FN_L2       _BLANK_ROW +#define ____FN_L3       _BLANK_ROW +#define ____FN_LT       _______, KC_TAB + +#define ____FN_R1       _______,  KC_F7,  KC_F8,  KC_F9,  KC_F10 +#define ____FN_R2       _______,  KC_F1,  KC_F2,  KC_F3,  KC_F11 +#define ____FN_R3       _______,  KC_F4,  KC_F5,  KC_F6,  KC_F12 +#define ____FN_RT       _BLANK_THUMB +// clang-format on diff --git a/users/zigotica/rules.mk b/users/zigotica/rules.mk new file mode 100644 index 0000000000..019e6f6dda --- /dev/null +++ b/users/zigotica/rules.mk @@ -0,0 +1,18 @@ +SRC += zigotica.c + +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) +    SRC += tapdances.c +endif + +ifeq ($(strip $(COMBO_ENABLE)), yes) +    SRC += combos.c +endif + +ifeq ($(strip $(OLED_ENABLE)), yes) +    SRC += oled.c +endif + +ifeq ($(strip $(ENCODER_ENABLE)), yes) +    SRC += encoder.c +endif + diff --git a/users/zigotica/tapdances.c b/users/zigotica/tapdances.c new file mode 100644 index 0000000000..74bb1b605e --- /dev/null +++ b/users/zigotica/tapdances.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 "tapdances.h" + +void ios_media(qk_tap_dance_state_t *state, void *user_data) { +    if (state->count == 1) { +        tap_code(KC_MPLY); +    } else if (state->count == 2) { +        tap_code(KC_MNXT); +    } else if (state->count == 3) { +        tap_code(KC_MPRV); +    } else { +        reset_tap_dance(state); +    } +} + +qk_tap_dance_action_t tap_dance_actions[] = { +    [0] = ACTION_TAP_DANCE_FN(ios_media), +    [1] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_SCOLON), +    [2] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COLON), +    [3] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), +    [4] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), +}; diff --git a/users/zigotica/tapdances.h b/users/zigotica/tapdances.h new file mode 100644 index 0000000000..051c8a90bc --- /dev/null +++ b/users/zigotica/tapdances.h @@ -0,0 +1,24 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 +#include "zigotica.h" + +#ifdef TAP_DANCE_ENABLE +    #define ZK_MEDIA TD(0) +    #define ZK_SEMI TD(1) +    #define ZK_COLON TD(2) +    #define ZK_BRC TD(3) +    #define ZK_PRN TD(4) +#endif diff --git a/users/zigotica/zigotica.c b/users/zigotica/zigotica.c new file mode 100644 index 0000000000..9de57406c4 --- /dev/null +++ b/users/zigotica/zigotica.c @@ -0,0 +1,14 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 "zigotica.h" diff --git a/users/zigotica/zigotica.h b/users/zigotica/zigotica.h new file mode 100644 index 0000000000..e9ff5ff16c --- /dev/null +++ b/users/zigotica/zigotica.h @@ -0,0 +1,51 @@ +/* Copyright 2020 Sergi Meseguer <[email protected]> +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 +#include QMK_KEYBOARD_H + +#include "rows.h" + +#ifdef SPLIT_KEYBOARD +enum userspace_layers { +    BASE = 0, +    _NUM, +    _NAV, +    _SYM, +    _FN, +}; +#else +enum userspace_layers { +    _TERMINAL = 0, +    _FIGMA, +    _BROWSER, +    _VIM, +}; +#endif + + +#ifdef TAP_DANCE_ENABLE +#    include "tapdances.h" +#endif + +#ifdef COMBO_ENABLE +#    include "combos.h" +#endif + +#ifdef OLED_ENABLE +  #include "oled.h" +#endif + +#ifdef ENCODER_ENABLE +  #include "encoder.h" +#endif | 
