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/mixi/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/mixi') diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index b34a64a813..6caecd323d 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 3 -- 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/mixi/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/mixi') diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index 6caecd323d..63cc5f9da6 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -15,9 +15,6 @@ #define ENCODERS_PAD_A { D7, B1 } #define ENCODERS_PAD_B { E6, B3 } -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_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/mixi/info.json | 2 ++ keyboards/mixi/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/mixi') diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index c1f60e8ee7..17503123e3 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -8,6 +8,8 @@ "pid": "0x4D49", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mixi/rules.mk b/keyboards/mixi/rules.mk index f0530f599c..bb895a7bf2 100644 --- a/keyboards/mixi/rules.mk +++ b/keyboards/mixi/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 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/mixi/config.h | 12 ------------ keyboards/mixi/info.json | 7 +++++++ 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'keyboards/mixi') diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index 63cc5f9da6..e6b2ef0961 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -1,17 +1,5 @@ #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* Keyboard Matrix Assignments */ -#define DIRECT_PINS { \ - { D1, D4, F4 }, \ - { D0, B4, F5 }, \ - { C6, F7, B6 } \ -} - #define ENCODERS_PAD_A { D7, B1 } #define ENCODERS_PAD_B { E6, B3 } diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index 17503123e3..cfc774bc2b 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D1", "D4", "F4"], + ["D0", "B4", "F5"], + ["C6", "F7", "B6"] + ] + }, "layouts": { "LAYOUT": { "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/mixi/info.json | 18 +++++++++--------- keyboards/mixi/mixi.c | 2 +- keyboards/mixi/mixi.h | 13 ------------- 3 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 keyboards/mixi/mixi.h (limited to 'keyboards/mixi') diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index cfc774bc2b..584a8f85b7 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/mixi/mixi.c b/keyboards/mixi/mixi.c index f99c942f2d..e8da7fdac2 100644 --- a/keyboards/mixi/mixi.c +++ b/keyboards/mixi/mixi.c @@ -1,4 +1,4 @@ -#include "mixi.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/mixi/mixi.h b/keyboards/mixi/mixi.h deleted file mode 100644 index 8b2bc7090b..0000000000 --- a/keyboards/mixi/mixi.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22 \ - ) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 } \ -} -- 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/mixi/config.h | 3 --- keyboards/mixi/info.json | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'keyboards/mixi') diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index e6b2ef0961..ed82723108 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -1,8 +1,5 @@ #pragma once -#define ENCODERS_PAD_A { D7, B1 } -#define ENCODERS_PAD_B { E6, B3 } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index 584a8f85b7..3af1d02f47 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -8,6 +8,12 @@ "pid": "0x4D49", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D7", "pin_b": "E6"}, + {"pin_a": "B1", "pin_b": "B3"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { -- cgit v1.2.3