From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/splitkb/zima/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 35782781c1..7961e9efe4 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/splitkb/zima/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 7961e9efe4..615ab42e71 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -59,9 +59,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ // #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/splitkb/zima/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 615ab42e71..9797ac4389 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -56,9 +56,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_TWINKLE -/* 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 */ -- cgit v1.2.3 From 53b7dbe671813808ea3a7f36c9eb5ca3c59bf16c Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 07:26:45 +1100 Subject: Remove unused `LOCKING_SUPPORT_ENABLE` from config.h (#19748) --- keyboards/splitkb/zima/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 9797ac4389..c4782567ff 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -56,11 +56,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_TWINKLE -/* 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 - #define FB_ERM_LRA 0 #define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */ #define FB_LOOPGAIN 1 /* For Low:0, Medium:1, High:2, Very High:3 */ -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/splitkb/zima/info.json | 2 ++ keyboards/splitkb/zima/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 0afcbe5b6e..744efd5b76 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -8,6 +8,8 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk index 4de2f506eb..fb9a585656 100644 --- a/keyboards/splitkb/zima/rules.mk +++ b/keyboards/splitkb/zima/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: Migrate `DIRECT_PINS` to data driven (#19826) --- keyboards/splitkb/zima/config.h | 15 --------------- keyboards/splitkb/zima/info.json | 8 ++++++++ 2 files changed, 8 insertions(+), 15 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index c4782567ff..777c56465f 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -17,21 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 3 - -/* - * Keyboard Matrix Assignments - */ -#define DIRECT_PINS { \ - { C6, D6, D5 }, \ - { C7, F7, D4 }, \ - { E6, F5, F6 }, \ - { F0, F1, F4 }, \ -} - #define ENCODERS_PAD_A { B4 } #define ENCODERS_PAD_B { D7 } diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 744efd5b76..a38404cc97 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "matrix_pins": { + "direct": [ + ["C6", "D6", "D5"], + ["C7", "F7", "D4"], + ["E6", "F5", "F6"], + ["F0", "F1", "F4"] + ] + }, "layouts": { "LAYOUT_ortho_4x3": { "layout": [ -- cgit v1.2.3 From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 19 Feb 2023 18:55:12 +1100 Subject: Move layouts for direct_pins boards to data driven (#19872) --- keyboards/splitkb/zima/info.json | 24 ++++++++++++------------ keyboards/splitkb/zima/zima.c | 2 +- keyboards/splitkb/zima/zima.h | 29 ----------------------------- 3 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 keyboards/splitkb/zima/zima.h (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index a38404cc97..ab1b8ae020 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -21,18 +21,18 @@ "layouts": { "LAYOUT_ortho_4x3": { "layout": [ - {"label":"K00 (B0,B4)", "x":0, "y":1}, - {"label":"K01 (B0,B5)", "x":1, "y":1}, - {"label":"K02 (B0,B6)", "x":2, "y":1}, - {"label":"K10 (B1,B4)", "x":0, "y":2}, - {"label":"K11 (B1,B5)", "x":1, "y":2}, - {"label":"K12 (B1,B6)", "x":2, "y":2}, - {"label":"K20 (B2,B4)", "x":0, "y":3}, - {"label":"K21 (B2,B5)", "x":1, "y":3}, - {"label":"K22 (B2,B6)", "x":2, "y":3}, - {"label":"K30 (B3,B4)", "x":0, "y":4}, - {"label":"K31 (B3,B5)", "x":1, "y":4}, - {"label":"K32 (B3,B6)", "x":2, "y":4} + {"x":0, "y":1, "matrix": [0, 0]}, + {"x":1, "y":1, "matrix": [0, 1]}, + {"x":2, "y":1, "matrix": [0, 2]}, + {"x":0, "y":2, "matrix": [1, 0]}, + {"x":1, "y":2, "matrix": [1, 1]}, + {"x":2, "y":2, "matrix": [1, 2]}, + {"x":0, "y":3, "matrix": [2, 0]}, + {"x":1, "y":3, "matrix": [2, 1]}, + {"x":2, "y":3, "matrix": [2, 2]}, + {"x":0, "y":4, "matrix": [3, 0]}, + {"x":1, "y":4, "matrix": [3, 1]}, + {"x":2, "y":4, "matrix": [3, 2]} ] } } diff --git a/keyboards/splitkb/zima/zima.c b/keyboards/splitkb/zima/zima.c index f39e3a39eb..2ac1f78d34 100644 --- a/keyboards/splitkb/zima/zima.c +++ b/keyboards/splitkb/zima/zima.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "zima.h" +#include "quantum.h" #include #ifdef HAPTIC_ENABLE diff --git a/keyboards/splitkb/zima/zima.h b/keyboards/splitkb/zima/zima.h deleted file mode 100644 index dc492ef107..0000000000 --- a/keyboards/splitkb/zima/zima.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2019 Thomas Baart - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x3( \ - k00, k01, k02, \ - k03, k04, k05, \ - k06, k07, k08, \ - k09, k10, k11 \ - ) { \ - {k00, k01, k02}, \ - {k03, k04, k05}, \ - {k06, k07, k08}, \ - {k09, k10, k11} } -- cgit v1.2.3 From 3bf01bb9ed202b14f78105db2aa2a75d01fc4323 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Feb 2023 09:20:23 +1100 Subject: Move QMK LUFA bootloader config to data driven (#19879) --- keyboards/splitkb/zima/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 777c56465f..0cb93e77af 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { B4 } #define ENCODERS_PAD_B { D7 } -// #define QMK_ESC_OUTPUT B7 -// #define QMK_ESC_INPUT C6 -// #define QMK_SPEAKER B6 - #define AUDIO_PIN B6 #define AUDIO_CLICKY #define NO_MUSIC_MODE -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/splitkb/zima/config.h | 7 ------- keyboards/splitkb/zima/info.json | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/splitkb/zima') diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 0cb93e77af..c06c192e0d 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define ENCODERS_PAD_A { B4 } -#define ENCODERS_PAD_B { D7 } - #define AUDIO_PIN B6 #define AUDIO_CLICKY #define NO_MUSIC_MODE @@ -47,7 +44,3 @@ along with this program. If not, see . #define DRV_GREETING alert_750ms #define DRV_MODE_DEFAULT buzz -// 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 diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index ab1b8ae020..077421904c 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -8,6 +8,11 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "D7", "resolution": 2} + ] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { -- cgit v1.2.3