diff options
Diffstat (limited to 'keyboards/z34')
-rw-r--r-- | keyboards/z34/config.h | 29 | ||||
-rw-r--r-- | keyboards/z34/info.json | 23 | ||||
-rw-r--r-- | keyboards/z34/keymaps/default/config.h | 1 | ||||
-rw-r--r-- | keyboards/z34/keymaps/zigotica/config.h | 3 | ||||
-rw-r--r-- | keyboards/z34/rules.mk | 6 |
5 files changed, 24 insertions, 38 deletions
diff --git a/keyboards/z34/config.h b/keyboards/z34/config.h index 13e1188891..d2ec68cc39 100644 --- a/keyboards/z34/config.h +++ b/keyboards/z34/config.h @@ -16,40 +16,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 5 - -/*Keyboard Matrix Assignments */ - -#define DIRECT_PINS { \ - { C6, F7, F6, F5, F4 }, \ - { D7, B6, B2, B3, B1 }, \ - { E6, D4, D0, D1, D3 }, \ - { B4, B5, NO_PIN, NO_PIN, NO_PIN } \ -} - -#define DIRECT_PINS_RIGHT { \ - { F4, F5, F6, F7, C6 }, \ - { B1, B3, B2, B6, D7 }, \ - { D3, D1, D0, D4, E6 }, \ - { B5, B4, NO_PIN, NO_PIN, NO_PIN } \ -} - - -/* 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 -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D2 - // EE_HANDS MASTER_RIGHT MASTER_LEFT #define MASTER_RIGHT diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json index f28ddf0e1c..87f4225c5e 100644 --- a/keyboards/z34/info.json +++ b/keyboards/z34/info.json @@ -8,6 +8,29 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["C6", "F7", "F6", "F5", "F4"], + ["D7", "B6", "B2", "B3", "B1"], + ["E6", "D4", "D0", "D1", "D3"], + ["B4", "B5", null, null, null] + ] + }, + "split": { + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "direct": [ + ["F4", "F5", "F6", "F7", "C6"], + ["B1", "B3", "B2", "B6", "D7"], + ["D3", "D1", "D0", "D4", "E6"], + ["B5", "B4", null, null, null] + ] + } + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/z34/keymaps/default/config.h b/keyboards/z34/keymaps/default/config.h index ae9881d3ab..2bcd017d72 100644 --- a/keyboards/z34/keymaps/default/config.h +++ b/keyboards/z34/keymaps/default/config.h @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" // EE_HANDS MASTER_RIGHT MASTER_LEFT #define MASTER_RIGHT diff --git a/keyboards/z34/keymaps/zigotica/config.h b/keyboards/z34/keymaps/zigotica/config.h index 1b223cb71d..545722ebde 100644 --- a/keyboards/z34/keymaps/zigotica/config.h +++ b/keyboards/z34/keymaps/zigotica/config.h @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" #define MASTER_RIGHT @@ -24,5 +23,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 350 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 diff --git a/keyboards/z34/rules.mk b/keyboards/z34/rules.mk index 90c0d7b620..669d2bc02f 100644 --- a/keyboards/z34/rules.mk +++ b/keyboards/z34/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |