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/splitish/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/splitish') diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h index 5f97aa585d..7dff573aa1 100644 --- a/keyboards/splitish/config.h +++ b/keyboards/splitish/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 4 #define MATRIX_COLS 12 -- 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/splitish/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/splitish') diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h index 7dff573aa1..9be811cca8 100644 --- a/keyboards/splitish/config.h +++ b/keyboards/splitish/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B4 , B5 , B2 , B6 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -- 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/splitish/info.json | 2 ++ keyboards/splitish/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/splitish') diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json index 6f8f8da1da..310a31801e 100644 --- a/keyboards/splitish/info.json +++ b/keyboards/splitish/info.json @@ -8,6 +8,8 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/splitish/rules.mk b/keyboards/splitish/rules.mk index 76fa2e63fb..363f2330b3 100644 --- a/keyboards/splitish/rules.mk +++ b/keyboards/splitish/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/splitish/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/splitish') diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h index 9be811cca8..7f7b41f58c 100644 --- a/keyboards/splitish/config.h +++ b/keyboards/splitish/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - #define MATRIX_COL_PINS { F4 , F5 , F6 , F7 , B1 , B3 , C6 , D4 , D0 , D1 , D2 , D3 } #define MATRIX_ROW_PINS { B4 , B5 , B2 , B6 } #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3 From ea772468650f7c79a9919a4770d371839985bef0 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Feb 2023 09:32:18 +1100 Subject: Migrate some more layouts to data driven (#19889) --- keyboards/splitish/info.json | 96 +++++++++++++++++++++---------------------- keyboards/splitish/splitish.c | 1 - keyboards/splitish/splitish.h | 14 ------- 3 files changed, 48 insertions(+), 63 deletions(-) delete mode 100644 keyboards/splitish/splitish.c delete mode 100644 keyboards/splitish/splitish.h (limited to 'keyboards/splitish') diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json index 310a31801e..067b20c8cf 100644 --- a/keyboards/splitish/info.json +++ b/keyboards/splitish/info.json @@ -13,57 +13,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, + {"x":4, "y":0, "matrix": [0, 4]}, + {"x":5, "y":0, "matrix": [0, 5]}, + {"x":7, "y":0, "matrix": [0, 6]}, + {"x":8, "y":0, "matrix": [0, 7]}, + {"x":9, "y":0, "matrix": [0, 8]}, + {"x":10, "y":0, "matrix": [0, 9]}, + {"x":11, "y":0, "matrix": [0, 10]}, + {"x":12, "y":0, "matrix": [0, 11]}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, + {"x":4, "y":1, "matrix": [1, 4]}, + {"x":5, "y":1, "matrix": [1, 5]}, + {"x":7, "y":1, "matrix": [1, 6]}, + {"x":8, "y":1, "matrix": [1, 7]}, + {"x":9, "y":1, "matrix": [1, 8]}, + {"x":10, "y":1, "matrix": [1, 9]}, + {"x":11, "y":1, "matrix": [1, 10]}, + {"x":12, "y":1, "matrix": [1, 11]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":3, "y":2, "matrix": [2, 3]}, + {"x":4, "y":2, "matrix": [2, 4]}, + {"x":5, "y":2, "matrix": [2, 5]}, + {"x":7, "y":2, "matrix": [2, 6]}, + {"x":8, "y":2, "matrix": [2, 7]}, + {"x":9, "y":2, "matrix": [2, 8]}, + {"x":10, "y":2, "matrix": [2, 9]}, + {"x":11, "y":2, "matrix": [2, 10]}, + {"x":12, "y":2, "matrix": [2, 11]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3} + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "matrix": [3, 3]}, + {"x":4, "y":3, "matrix": [3, 4]}, + {"x":5, "y":3, "matrix": [3, 5]}, + {"x":7, "y":3, "matrix": [3, 6]}, + {"x":8, "y":3, "matrix": [3, 7]}, + {"x":9, "y":3, "matrix": [3, 8]}, + {"x":10, "y":3, "matrix": [3, 9]}, + {"x":11, "y":3, "matrix": [3, 10]}, + {"x":12, "y":3, "matrix": [3, 11]} ] } } diff --git a/keyboards/splitish/splitish.c b/keyboards/splitish/splitish.c deleted file mode 100644 index b831a68c64..0000000000 --- a/keyboards/splitish/splitish.c +++ /dev/null @@ -1 +0,0 @@ -#include "splitish.h" diff --git a/keyboards/splitish/splitish.h b/keyboards/splitish/splitish.h deleted file mode 100644 index ff5a7d8412..0000000000 --- a/keyboards/splitish/splitish.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ -) \ -{ \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B} \ -} -- cgit v1.2.3