aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-12 01:05:00 +0000
committerQMK Bot <hello@qmk.fm>2021-10-12 01:05:00 +0000
commit38228e40d17686e9ae0e20a1b9a2890c3c751bea (patch)
tree999c98f68df0e45a573aba8b0c515d5993b05a1b
parent762f9e320f2858603db2ce30f3f561250508a7d9 (diff)
parent598f3fa7a76412b45745962b79ec34c7b8fde70e (diff)
downloadqmk_firmware-38228e40d17686e9ae0e20a1b9a2890c3c751bea.tar.gz
qmk_firmware-38228e40d17686e9ae0e20a1b9a2890c3c751bea.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/z34/config.h65
-rw-r--r--keyboards/z34/info.json52
-rw-r--r--keyboards/z34/keymaps/default/config.h22
-rw-r--r--keyboards/z34/keymaps/default/keymap.c77
-rw-r--r--keyboards/z34/keymaps/default/readme.md3
-rw-r--r--keyboards/z34/keymaps/default/rules.mk3
-rw-r--r--keyboards/z34/readme.md3
-rw-r--r--keyboards/z34/rules.mk28
-rw-r--r--keyboards/z34/z34.c17
-rw-r--r--keyboards/z34/z34.h39
10 files changed, 309 insertions, 0 deletions
diff --git a/keyboards/z34/config.h b/keyboards/z34/config.h
new file mode 100644
index 000000000..71d6528ce
--- /dev/null
+++ b/keyboards/z34/config.h
@@ -0,0 +1,65 @@
1/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com>
2
3This program is free software: you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by
5the Free Software Foundation, either version 2 of the License, or
6(at your option) any later version.
7
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12
13You should have received a copy of the GNU General Public License
14along with this program. If not, see <http://www.gnu.org/licenses/>.
15*/
16
17#pragma once
18
19#include "config_common.h"
20
21/* USB Device descriptor parameter */
22#define VENDOR_ID 0x7A74
23#define PRODUCT_ID 0x0002
24#define DEVICE_VER 0x0001
25#define MANUFACTURER zigotica
26#define PRODUCT z34
27
28/* key matrix size */
29#define MATRIX_ROWS 8
30#define MATRIX_COLS 5
31
32/*Keyboard Matrix Assignments */
33
34#define DIRECT_PINS { \
35 { C6, F7, F6, F5, F4 }, \
36 { D7, B6, B2, B3, B1 }, \
37 { E6, D4, D0, D1, D3 }, \
38 { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
39}
40
41#define DIRECT_PINS_RIGHT { \
42 { F4, F5, F6, F7, C6 }, \
43 { B1, B3, B2, B6, D7 }, \
44 { D3, D1, D0, D4, E6 }, \
45 { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
46}
47
48#define UNUSED_PINS
49
50/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
51#define DEBOUNCE 5
52
53/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
54#define LOCKING_SUPPORT_ENABLE
55/* Locking resynchronize hack */
56#define LOCKING_RESYNC_ENABLE
57
58/* Serial settings */
59#define USE_SERIAL
60/* serial.c configuration for split keyboard */
61#define SOFT_SERIAL_PIN D2
62
63// EE_HANDS MASTER_RIGHT MASTER_LEFT
64#define MASTER_RIGHT
65
diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json
new file mode 100644
index 000000000..4a6dce752
--- /dev/null
+++ b/keyboards/z34/info.json
@@ -0,0 +1,52 @@
1{
2 "keyboard_name": "z34",
3 "url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z34",
4 "maintainer": "@zigotica",
5 "layouts": {
6 "LAYOUT": {
7 "layout": [
8 {"x": 0, "y": 0.93},
9 {"x": 1, "y": 0.31},
10 {"x": 2, "y": 0},
11 {"x": 3, "y": 0.28},
12 {"x": 4, "y": 0.42},
13
14 {"x": 7, "y": 0.42},
15 {"x": 8, "y": 0.28},
16 {"x": 9, "y": 0},
17 {"x": 10, "y": 0.31},
18 {"x": 11, "y": 0.93},
19
20 {"x": 0, "y": 1.93},
21 {"x": 1, "y": 1.31},
22 {"x": 2, "y": 1},
23 {"x": 3, "y": 1.28},
24 {"x": 4, "y": 1.42},
25
26 {"x": 7, "y": 1.42},
27 {"x": 8, "y": 1.28},
28 {"x": 9, "y": 1},
29 {"x": 10, "y": 1.31},
30 {"x": 11, "y": 1.93},
31
32 {"x": 0, "y": 2.93},
33 {"x": 1, "y": 2.31},
34 {"x": 2, "y": 2},
35 {"x": 3, "y": 2.28},
36 {"x": 4, "y": 2.42},
37
38 {"x": 7, "y": 2.42},
39 {"x": 8, "y": 2.28},
40 {"x": 9, "y": 2},
41 {"x": 10, "y": 2.31},
42 {"x": 11, "y": 2.93},
43
44 {"x": 3.5, "y": 3.5},
45 {"x": 4.5, "y": 4},
46
47 {"x": 6.5, "y": 4},
48 {"x": 7.5, "y": 3.5}
49 ]
50 }
51 }
52}
diff --git a/keyboards/z34/keymaps/default/config.h b/keyboards/z34/keymaps/default/config.h
new file mode 100644
index 000000000..ae9881d3a
--- /dev/null
+++ b/keyboards/z34/keymaps/default/config.h
@@ -0,0 +1,22 @@
1/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com>
2
3This program is free software: you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by
5the Free Software Foundation, either version 2 of the License, or
6(at your option) any later version.
7
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12
13You should have received a copy of the GNU General Public License
14along with this program. If not, see <http://www.gnu.org/licenses/>.
15*/
16
17#pragma once
18
19#include "config_common.h"
20
21// EE_HANDS MASTER_RIGHT MASTER_LEFT
22#define MASTER_RIGHT
diff --git a/keyboards/z34/keymaps/default/keymap.c b/keyboards/z34/keymaps/default/keymap.c
new file mode 100644
index 000000000..973d24eaf
--- /dev/null
+++ b/keyboards/z34/keymaps/default/keymap.c
@@ -0,0 +1,77 @@
1/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com>
2
3This program is free software: you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by
5the Free Software Foundation, either version 2 of the License, or
6(at your option) any later version.
7
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12
13You should have received a copy of the GNU General Public License
14along with this program. If not, see <http://www.gnu.org/licenses/>.
15*/
16
17#include QMK_KEYBOARD_H
18
19enum layers {
20 BASE = 0
21};
22
23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24/*
25 * Base Layer: BASE
26 *
27 * ,---------------------------------------. ,---------------------------------------.
28 * | | | | | | | | | | | |
29 * | Q | W | E | R | T | | Y | U | I | O | P |
30 * | | | | | | | | | | | |
31 * |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------|
32 * | | | | | | | | | | | |
33 * | A | S | D | F | G | | H | J | K | L | ' |
34 * | | | | | | | | | | | |
35 * |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------|
36 * | | | | | | | | | | | |
37 * | Z | X | C | V | B | | N | M | , | . | / |
38 * | | | | | | | | | | | |
39 * `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------.
40 * | | | | | |
41 * | ESC | SPC | | ENTER | BSPC |
42 * | | | | | |
43 * `---------------' `---------------'
44 *
45 */
46 [BASE] = LAYOUT(
47 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
48 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
49 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,
50 KC_ESC, KC_SPC, KC_ENT, KC_BSPC
51 ),
52
53/*
54 * TEMPLATE
55 *
56 * ,---------------------------------------. ,---------------------------------------.
57 * | | | | | | | | | | | |
58 * | | | | | | | | | | | |
59 * | | | | | | | | | | | |
60 * |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------|
61 * | | | | | | | | | | | |
62 * | | | | | | | | | | | |
63 * | | | | | | | | | | | |
64 * |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------|
65 * | | | | | | | | | | | |
66 * | | | | | | | | | | | |
67 * | | | | | | | | | | | |
68 * `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------.
69 * | | | | | |
70 * | | | | | |
71 * | | | | | |
72 * `---------------' `---------------'
73 *
74 */
75
76};
77
diff --git a/keyboards/z34/keymaps/default/readme.md b/keyboards/z34/keymaps/default/readme.md
new file mode 100644
index 000000000..c6a011557
--- /dev/null
+++ b/keyboards/z34/keymaps/default/readme.md
@@ -0,0 +1,3 @@
1# Default z34 Layout
2
3This is the default QWERTY layout that comes flashed on every z34.
diff --git a/keyboards/z34/keymaps/default/rules.mk b/keyboards/z34/keymaps/default/rules.mk
new file mode 100644
index 000000000..9281e9843
--- /dev/null
+++ b/keyboards/z34/keymaps/default/rules.mk
@@ -0,0 +1,3 @@
1# There are no extra pins, so we make sure to disable OLED and Encoders
2OLED_ENABLE = no # Enables the use of OLED displays
3ENCODER_ENABLE = no # Enables the use of encoders
diff --git a/keyboards/z34/readme.md b/keyboards/z34/readme.md
new file mode 100644
index 000000000..29bbf571a
--- /dev/null
+++ b/keyboards/z34/readme.md
@@ -0,0 +1,3 @@
1# z34
2
3Firmware for [z34 split keyboard](https://github.com/zigotica/mechanical-keyboards/tree/main/z34) designed by @zigotica
diff --git a/keyboards/z34/rules.mk b/keyboards/z34/rules.mk
new file mode 100644
index 000000000..6370c7a93
--- /dev/null
+++ b/keyboards/z34/rules.mk
@@ -0,0 +1,28 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = caterina
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = no # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output
22SPLIT_KEYBOARD = yes # Split common
23LTO_ENABLE = yes # Enables Link Time Optimization (LTO) which reduces the compiled size
24
25# There are no extra pins, so we make sure to disable OLED and Encoders
26OLED_SUPPORTED = no # Enables the use of OLED displays
27ENCODER_SUPPORTED = no # Enables the use of encoders
28
diff --git a/keyboards/z34/z34.c b/keyboards/z34/z34.c
new file mode 100644
index 000000000..779562e63
--- /dev/null
+++ b/keyboards/z34/z34.c
@@ -0,0 +1,17 @@
1/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "z34.h"
diff --git a/keyboards/z34/z34.h b/keyboards/z34/z34.h
new file mode 100644
index 000000000..3def2d4c2
--- /dev/null
+++ b/keyboards/z34/z34.h
@@ -0,0 +1,39 @@
1/* Copyright 2020 Sergi Meseguer <zigotica@gmail.com>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "quantum.h"
18
19/* This a shortcut to help you visually see your layout */
20
21#define ___ KC_NO
22
23#define LAYOUT( \
24 L05, L04, L03, L02, L01, R01, R02, R03, R04, R05, \
25 L10, L09, L08, L07, L06, R06, R07, R08, R09, R10, \
26 L15, L14, L13, L12, L11, R11, R12, R13, R14, R15, \
27 L17, L16, R16, R17 \
28 ) \
29 { \
30 { L05, L04, L03, L02, L01 }, \
31 { L10, L09, L08, L07, L06 }, \
32 { L15, L14, L13, L12, L11 }, \
33 { L17, L16, ___, ___ , ___}, \
34 { R01, R02, R03, R04, R05 }, \
35 { R06, R07, R08, R09, R10 }, \
36 { R11, R12, R13, R14, R15 }, \
37 { R16, R17, ___, ___, ___ } \
38 }
39
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 22:57:09 +0000