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/avalanche/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/config.h b/keyboards/avalanche/config.h index eb9c37d38a..9f3a2504e0 100644 --- a/keyboards/avalanche/config.h +++ b/keyboards/avalanche/config.h @@ -3,4 +3,3 @@ #pragma once -#include "config_common.h" -- 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/avalanche/v1/info.json | 2 ++ keyboards/avalanche/v1/rules.mk | 6 ------ keyboards/avalanche/v2/info.json | 2 ++ keyboards/avalanche/v2/rules.mk | 6 ------ keyboards/avalanche/v3/info.json | 2 ++ keyboards/avalanche/v3/rules.mk | 6 ------ keyboards/avalanche/v4/info.json | 2 ++ keyboards/avalanche/v4/rules.mk | 6 ------ 8 files changed, 8 insertions(+), 24 deletions(-) (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index d753cce4bc..5fdc54ca6c 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v1/rules.mk b/keyboards/avalanche/v1/rules.mk index 9bb578594b..ef90e04bc1 100644 --- a/keyboards/avalanche/v1/rules.mk +++ b/keyboards/avalanche/v1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index 52c03b57a3..cbee32e690 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk index 3b645daf9b..8e241b2dfd 100644 --- a/keyboards/avalanche/v2/rules.mk +++ b/keyboards/avalanche/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 1869c0165f..1e004e2bf4 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v3/rules.mk b/keyboards/avalanche/v3/rules.mk index fbf76c7ae5..5a35722be4 100644 --- a/keyboards/avalanche/v3/rules.mk +++ b/keyboards/avalanche/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index b96cdc5ea7..f9bb00650e 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk index 370dc1a6a8..da4886f7d7 100644 --- a/keyboards/avalanche/v4/rules.mk +++ b/keyboards/avalanche/v4/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 ccb6c908dd71fac3dfa89f2d8baa8196eac9994f Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 9 Feb 2023 10:57:42 +1100 Subject: Remove `SOFT_SERIAL_PIN` for non-split boards (#19774) * Remove `SOFT_SERIAL_PIN` for non-split boards * Delete more empty config.h --- keyboards/avalanche/config.h | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 keyboards/avalanche/config.h (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/config.h b/keyboards/avalanche/config.h deleted file mode 100644 index 9f3a2504e0..0000000000 --- a/keyboards/avalanche/config.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -- 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/avalanche/v1/config.h | 3 --- keyboards/avalanche/v2/config.h | 3 --- keyboards/avalanche/v3/config.h | 3 --- keyboards/avalanche/v4/config.h | 3 --- 4 files changed, 12 deletions(-) (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h index e641a20f93..28fbc09060 100644 --- a/keyboards/avalanche/v1/config.h +++ b/keyboards/avalanche/v1/config.h @@ -3,9 +3,6 @@ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 - #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 16b26d8ffc..85dcc6e99d 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -3,9 +3,6 @@ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h index 4c4e05ecf4..0e2a67de74 100644 --- a/keyboards/avalanche/v3/config.h +++ b/keyboards/avalanche/v3/config.h @@ -3,9 +3,6 @@ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h index c83c90c0ba..baefe7202c 100644 --- a/keyboards/avalanche/v4/config.h +++ b/keyboards/avalanche/v4/config.h @@ -3,9 +3,6 @@ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -- cgit v1.2.3 From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/avalanche/v1/config.h | 2 -- keyboards/avalanche/v1/info.json | 3 +++ keyboards/avalanche/v2/config.h | 2 -- keyboards/avalanche/v2/info.json | 3 +++ keyboards/avalanche/v3/config.h | 2 -- keyboards/avalanche/v3/info.json | 3 +++ keyboards/avalanche/v4/config.h | 3 --- keyboards/avalanche/v4/info.json | 3 +++ 8 files changed, 12 insertions(+), 9 deletions(-) (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h index 28fbc09060..6ddfc57958 100644 --- a/keyboards/avalanche/v1/config.h +++ b/keyboards/avalanche/v1/config.h @@ -8,6 +8,4 @@ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - #define BACKLIGHT_PIN B0 diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index 5fdc54ca6c..518a0c0742 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 85dcc6e99d..5aee77c04d 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -8,8 +8,6 @@ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index cbee32e690..d6b770ee48 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "split": { + "soft_serial_pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h index 0e2a67de74..a0e5af4531 100644 --- a/keyboards/avalanche/v3/config.h +++ b/keyboards/avalanche/v3/config.h @@ -8,8 +8,6 @@ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 1e004e2bf4..3a0b43fb71 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "split": { + "soft_serial_pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h index baefe7202c..1009ab6e33 100644 --- a/keyboards/avalanche/v4/config.h +++ b/keyboards/avalanche/v4/config.h @@ -8,9 +8,6 @@ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 - - #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { F4 } #define ENCODER_RESOLUTION 2 diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index f9bb00650e..fdb71ce0e8 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -8,6 +8,9 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "split": { + "soft_serial_pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 26854f59402f3f4b7ca5cfe0f3dd665a680715f5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 12:12:42 +1100 Subject: Remove default and unused `BACKLIGHT_LEVELS` (#19898) --- keyboards/avalanche/v1/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h index 6ddfc57958..940476e03a 100644 --- a/keyboards/avalanche/v1/config.h +++ b/keyboards/avalanche/v1/config.h @@ -7,5 +7,3 @@ #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } #define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN B0 -- 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/avalanche/v2/config.h | 4 ---- keyboards/avalanche/v2/info.json | 5 +++++ keyboards/avalanche/v3/config.h | 4 ---- keyboards/avalanche/v3/info.json | 5 +++++ keyboards/avalanche/v4/config.h | 4 ---- keyboards/avalanche/v4/info.json | 5 +++++ 6 files changed, 15 insertions(+), 12 deletions(-) (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 5aee77c04d..3978f581e1 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -13,7 +13,3 @@ #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_SPLIT - -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { F4 } -#define ENCODER_RESOLUTION 2 diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index d6b770ee48..7105fc1787 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "F4", "resolution": 2} + ] + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h index a0e5af4531..efe0c27932 100644 --- a/keyboards/avalanche/v3/config.h +++ b/keyboards/avalanche/v3/config.h @@ -13,7 +13,3 @@ #define RGBLED_NUM 12 #define RGBLED_SPLIT { 7, 7 } #define RGBLIGHT_SPLIT - -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { F4 } -#define ENCODER_RESOLUTION 2 diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 3a0b43fb71..70ffcc9efc 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "F4", "resolution": 2} + ] + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h index 1009ab6e33..86dff022e0 100644 --- a/keyboards/avalanche/v4/config.h +++ b/keyboards/avalanche/v4/config.h @@ -8,10 +8,6 @@ #define DIODE_DIRECTION COL2ROW -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { F4 } -#define ENCODER_RESOLUTION 2 - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN D3 # define RGBLED_NUM 64 diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index fdb71ce0e8..5b31b5ca11 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "F4", "resolution": 2} + ] + }, "split": { "soft_serial_pin": "D2" }, -- cgit v1.2.3