summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/pluckey/config.h90
-rw-r--r--keyboards/pluckey/info.json149
-rw-r--r--keyboards/pluckey/keymaps/default/keymap.c77
-rw-r--r--keyboards/pluckey/keymaps/default/readme.md4
-rw-r--r--keyboards/pluckey/pluckey.c38
-rw-r--r--keyboards/pluckey/pluckey.h46
-rw-r--r--keyboards/pluckey/readme.md19
-rw-r--r--keyboards/pluckey/rules.mk23
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/config.h44
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/keymap.c58
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/oled.c87
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/oled.h18
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/rules.mk10
-rw-r--r--keyboards/z12/keymaps/zigotica/config.h30
-rw-r--r--keyboards/z12/keymaps/zigotica/encoder.c114
-rw-r--r--keyboards/z12/keymaps/zigotica/encoder.h18
-rw-r--r--keyboards/z12/keymaps/zigotica/keymap.c126
-rw-r--r--keyboards/z12/keymaps/zigotica/oled.c43
-rw-r--r--keyboards/z12/keymaps/zigotica/oled.h18
-rw-r--r--keyboards/z12/keymaps/zigotica/rules.mk4
-rw-r--r--keyboards/z12/z12.c18
-rw-r--r--keyboards/z34/keymaps/default/rules.mk4
-rw-r--r--keyboards/z34/keymaps/zigotica/config.h28
-rw-r--r--keyboards/z34/keymaps/zigotica/keymap.c57
-rw-r--r--keyboards/z34/keymaps/zigotica/rules.mk7
25 files changed, 1111 insertions, 19 deletions
diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
new file mode 100644
index 0000000000..295fe93a85
--- /dev/null
+++ b/keyboards/pluckey/config.h
@@ -0,0 +1,90 @@
+/*
+Copyright 2021 floookay
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xF100
+#define PRODUCT_ID 0x91CE
+#define DEVICE_VER 0x0001
+#define MANUFACTURER floookay
+#define PRODUCT pluckey
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B4, F5, F6, B6, B5 }
+#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, F7 }
+#define UNUSED_PINS { F4, B1 }
+#define DIODE_DIRECTION COL2ROW
+
+/* encoder support */
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B2 }
+#define ENCODER_RESOLUTION 2
+#define ENCODERS_PAD_A_RIGHT { B2 }
+#define ENCODERS_PAD_B_RIGHT { B3 }
+#define ENCODER_RESOLUTION_RIGHT 2
+
+/* communication between sides */
+#define USE_SERIAL
+#define SOFT_SERIAL_PIN D2
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
new file mode 100644
index 0000000000..0a6bd1832d
--- /dev/null
+++ b/keyboards/pluckey/info.json
@@ -0,0 +1,149 @@
+{
+ "keyboard_name": "pluckey",
+ "url": "https://github.com/floookay/pluckey",
+ "maintainer": "floookay",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x":3.5, "y":0},
+ {"x":15, "y":0},
+ {"x":2.5, "y":0.125},
+ {"x":4.5, "y":0.125},
+ {"x":14, "y":0.125},
+ {"x":16, "y":0.125},
+ {"x":5.5, "y":0.25},
+ {"x":6.5, "y":0.25},
+ {"x":12, "y":0.25},
+ {"x":13, "y":0.25},
+ {"x":0, "y":0.625, "w":1.5},
+ {"x":1.5, "y":0.625},
+ {"x":17, "y":0.625},
+ {"x":18, "y":0.625, "w":1.5},
+ {"x":3.5, "y":1.0},
+ {"x":15, "y":1.0},
+ {"x":2.5, "y":1.125},
+ {"x":4.5, "y":1.125},
+ {"x":14, "y":1.125},
+ {"x":16, "y":1.125},
+ {"x":5.5, "y":1.25},
+ {"x":6.5, "y":1.25},
+ {"x":12, "y":1.25},
+ {"x":13, "y":1.25},
+ {"x":0, "y":1.625, "w":1.5},
+ {"x":1.5, "y":1.625},
+ {"x":17, "y":1.625},
+ {"x":18, "y":1.625, "w":1.5},
+ {"x":3.5, "y":2},
+ {"x":15, "y":2},
+ {"x":2.5, "y":2.125},
+ {"x":4.5, "y":2.125},
+ {"x":14, "y":2.125},
+ {"x":16, "y":2.125},
+ {"x":5.5, "y":2.25},
+ {"x":6.5, "y":2.25},
+ {"x":12, "y":2.25},
+ {"x":13, "y":2.25},
+ {"x":0, "y":2.625, "w":1.5},
+ {"x":1.5, "y":2.625},
+ {"x":17, "y":2.625},
+ {"x":18, "y":2.625, "w":1.5},
+ {"x":6.5, "y":3.25},
+ {"x":12, "y":3.25},
+ {"x":3.5, "y":3},
+ {"x":15, "y":3},
+ {"x":2.5, "y":3.125},
+ {"x":4.5, "y":3.125},
+ {"x":14, "y":3.125},
+ {"x":16, "y":3.125},
+ {"x":5.5, "y":3.25},
+ {"x":13, "y":3.25},
+ {"x":0, "y":3.625, "w":1.5},
+ {"x":1.5, "y":3.625},
+ {"x":17, "y":3.625},
+ {"x":18, "y":3.625, "w":1.5},
+ {"x":7.5, "y":3.75},
+ {"x":11, "y":3.75},
+ {"x":3.5, "y":4},
+ {"x":15, "y":4},
+ {"x":2.5, "y":4.125},
+ {"x":4.5, "y":4.125},
+ {"x":14, "y":4.125},
+ {"x":16, "y":4.125},
+ {"x":5.75, "y":4.5, "w":1.5},
+ {"x":12.25, "y":4.5, "w":1.5},
+ {"x":7.25, "y":4.75},
+ {"x":11.25, "y":4.75}
+ ]
+ },
+ "LAYOUT_ergo": {
+ "layout": [
+ {"x":3.5, "y":0},
+ {"x":15, "y":0},
+ {"x":2.5, "y":0.125},
+ {"x":4.5, "y":0.125},
+ {"x":14, "y":0.125},
+ {"x":16, "y":0.125},
+ {"x":5.5, "y":0.25},
+ {"x":6.5, "y":0.25},
+ {"x":12, "y":0.25},
+ {"x":13, "y":0.25},
+ {"x":0, "y":0.625, "w":1.5},
+ {"x":1.5, "y":0.625},
+ {"x":17, "y":0.625},
+ {"x":18, "y":0.625, "w":1.5},
+ {"x":3.5, "y":1.0},
+ {"x":15, "y":1.0},
+ {"x":2.5, "y":1.125},
+ {"x":4.5, "y":1.125},
+ {"x":14, "y":1.125},
+ {"x":16, "y":1.125},
+ {"x":5.5, "y":1.25},
+ {"x":6.5, "y":1.25, "h":1.5},
+ {"x":12, "y":1.25, "h":1.5},
+ {"x":13, "y":1.25},
+ {"x":0, "y":1.625, "w":1.5},
+ {"x":1.5, "y":1.625},
+ {"x":17, "y":1.625},
+ {"x":18, "y":1.625, "w":1.5},
+ {"x":3.5, "y":2},
+ {"x":15, "y":2},
+ {"x":2.5, "y":2.125},
+ {"x":4.5, "y":2.125},
+ {"x":14, "y":2.125},
+ {"x":16, "y":2.125},
+ {"x":5.5, "y":2.25},
+ {"x":13, "y":2.25},
+ {"x":0, "y":2.625, "w":1.5},
+ {"x":1.5, "y":2.625},
+ {"x":17, "y":2.625},
+ {"x":18, "y":2.625, "w":1.5},
+ {"x":6.5, "y":2.75, "h":1.5},
+ {"x":12, "y":2.75, "h":1.5},
+ {"x":3.5, "y":3},
+ {"x":15, "y":3},
+ {"x":2.5, "y":3.125},
+ {"x":4.5, "y":3.125},
+ {"x":14, "y":3.125},
+ {"x":16, "y":3.125},
+ {"x":5.5, "y":3.25},
+ {"x":13, "y":3.25},
+ {"x":0, "y":3.625, "w":1.5},
+ {"x":1.5, "y":3.625},
+ {"x":17, "y":3.625},
+ {"x":18, "y":3.625, "w":1.5},
+ {"x":7.5, "y":3.75},
+ {"x":11, "y":3.75},
+ {"x":3.5, "y":4},
+ {"x":15, "y":4},
+ {"x":2.5, "y":4.125},
+ {"x":4.5, "y":4.125},
+ {"x":14, "y":4.125},
+ {"x":16, "y":4.125},
+ {"x":5.75, "y":4.5, "w":1.5},
+ {"x":12.25, "y":4.5, "w":1.5},
+ {"x":7.25, "y":4.75},
+ {"x":11.25, "y":4.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
new file mode 100644
index 0000000000..31042fc692
--- /dev/null
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -0,0 +1,77 @@
+/* Copyright 2021 floookay
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE,
+ _LOWER,
+ _RAISE,
+ _ADJUST
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+ M_ARROW
+};
+
+#define MO_LOW MO(_LOWER)
+#define MO_RAIS MO(_RAISE)
+#define MO_ADJU MO(_ADJUST)
+#define MO_CURR _______
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_HOME, KC_END, KC_RCBR, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LGUI, KC_LALT, MO_LOW, KC_SPC, KC_BSPC, KC_ENT, KC_SPC, MO_RAIS, KC_RALT, KC_MEH
+ ),
+ [_LOWER] = LAYOUT(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PSCR,
+ _______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN, KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______,
+ _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LPRN, KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+ _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, MO_CURR, _______, KC_DEL, _______, _______, MO_ADJU, _______, _______
+ ),
+ [_RAISE] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______,
+ _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN, KC_RPRN, _______, KC_BTN4, KC_UP, KC_BTN5, _______, _______,
+ _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN, KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______,
+ _______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP, KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______,
+ _______, _______, MO_ADJU, _______, KC_DEL, _______, _______, MO_CURR, _______, _______
+ ),
+ [_ADJUST] = LAYOUT(
+ KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, KC_CLR, _______, _______, _______, _______, _______
+ )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case M_ARROW:
+ if (record->event.pressed) {
+ SEND_STRING("->");
+ }
+ break;
+ }
+ return true;
+}
diff --git a/keyboards/pluckey/keymaps/default/readme.md b/keyboards/pluckey/keymaps/default/readme.md
new file mode 100644
index 0000000000..d94d03e588
--- /dev/null
+++ b/keyboards/pluckey/keymaps/default/readme.md
@@ -0,0 +1,4 @@
+# Default keymap
+
+![keymap](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/0a37fe682f76bbaa55cbc56527e4666bedbf5761/layout.png)
+[Keyboard-Layout-Editor](http://www.keyboard-layout-editor.com/#/gists/13c9d00bd0c0c9e3fe3b3d8d98672ef9) [(raw)](https://gist.github.com/floookay/13c9d00bd0c0c9e3fe3b3d8d98672ef9)
diff --git a/keyboards/pluckey/pluckey.c b/keyboards/pluckey/pluckey.c
new file mode 100644
index 0000000000..d9025726fd
--- /dev/null
+++ b/keyboards/pluckey/pluckey.c
@@ -0,0 +1,38 @@
+/* Copyright 2021 floookay
+ *
+ * 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 "pluckey.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) { return false; }
+ if (index == 0) {
+ if (clockwise) {
+ tap_code_delay(KC_VOLU, 10);
+ } else {
+ tap_code_delay(KC_VOLD, 10);
+ }
+ }
+ else if (index == 1) {
+ if (clockwise) {
+ tap_code(KC_WH_U);
+ } else {
+ tap_code(KC_WH_D);
+ }
+ }
+ return true;
+}
+#endif
diff --git a/keyboards/pluckey/pluckey.h b/keyboards/pluckey/pluckey.h
new file mode 100644
index 0000000000..628a89baa9
--- /dev/null
+++ b/keyboards/pluckey/pluckey.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 floookay
+ *
+ * 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 "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+ l00, l01, l02, l03, l04, l05, l06, r00, r01, r02, r03, r04, r05, r06, \
+ l10, l11, l12, l13, l14, l15, l16, r10, r11, r12, r13, r14, r15, r16, \
+ l20, l21, l22, l23, l24, l25, l26, r20, r21, r22, r23, r24, r25, r26, \
+ l30, l31, l32, l33, l34, l35, l36, l41, r45, r30, r31, r32, r33, r34, r35, r36, \
+ l42, l43, l44, l45, l46, r40, r41, r42, r43, r44 \
+){ \
+ { l00, l01, l02, l03, l04, l05, l06 }, \
+ { l10, l11, l12, l13, l14, l15, l16 }, \
+ { l20, l21, l22, l23, l24, l25, l26 }, \
+ { l30, l31, l32, l33, l34, l35, l36 }, \
+ { KC_NO, l41, l42, l43, l44, l45, l46 }, \
+ { r06, r05, r04, r03, r02, r01, r00 }, \
+ { r16, r15, r14, r13, r12, r11, r10 }, \
+ { r26, r25, r24, r23, r22, r21, r20 }, \
+ { r36, r35, r34, r33, r32, r31, r30 }, \
+ { KC_NO, r45, r44, r43, r42, r41, r40 } \
+}
diff --git a/keyboards/pluckey/readme.md b/keyboards/pluckey/readme.md
new file mode 100644
index 0000000000..b0a1af99b8
--- /dev/null
+++ b/keyboards/pluckey/readme.md
@@ -0,0 +1,19 @@
+# Pluckey
+
+![pluckey](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/1757078b1adf7ac4d51d74f445107bdb46e013a3/sandwich%2520angle.jpg)
+
+The pluckey is an ergodox like split keyboard with moderate columnal stagger and a horizontal space key.
+
+* Keyboard Maintainer: [floookay](https://github.com/floookay)
+* Hardware Supported: pluckey pcbs with pro micro controllers
+* Hardware Availability: [pcb &amp; case files](https://github.com/floookay/pluckey)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make pluckey:default
+
+Flashing example for this keyboard:
+
+ make pluckey:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk
new file mode 100644
index 0000000000..4f4954434b
--- /dev/null
+++ b/keyboards/pluckey/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+ENCODER_ENABLE = yes
+SPLIT_KEYBOARD = yes
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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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 <zigotica@gmail.com>
+
+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