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/atreyu/config.h | 1 - keyboards/atreyu/keymaps/default/config.h | 1 - keyboards/atreyu/rev1/config.h | 1 - keyboards/atreyu/rev2/config.h | 1 - 4 files changed, 4 deletions(-) (limited to 'keyboards/atreyu') diff --git a/keyboards/atreyu/config.h b/keyboards/atreyu/config.h index ba12b366a9..e5011632cf 100644 --- a/keyboards/atreyu/config.h +++ b/keyboards/atreyu/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* * Feature disable options diff --git a/keyboards/atreyu/keymaps/default/config.h b/keyboards/atreyu/keymaps/default/config.h index 748a95e439..f29353dbf5 100644 --- a/keyboards/atreyu/keymaps/default/config.h +++ b/keyboards/atreyu/keymaps/default/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" // place overrides here #ifdef TAPPING_TERM diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h index 36cf04dd86..3212468a8f 100644 --- a/keyboards/atreyu/rev1/config.h +++ b/keyboards/atreyu/rev1/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h index c87807dee9..ca186ef523 100644 --- a/keyboards/atreyu/rev2/config.h +++ b/keyboards/atreyu/rev2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 -- cgit v1.2.3 From a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:40:23 +1100 Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752) --- keyboards/atreyu/rev1/config.h | 5 ----- keyboards/atreyu/rev2/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/atreyu') diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h index 3212468a8f..da94244f77 100644 --- a/keyboards/atreyu/rev1/config.h +++ b/keyboards/atreyu/rev1/config.h @@ -49,11 +49,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h index ca186ef523..ffffdaabd0 100644 --- a/keyboards/atreyu/rev2/config.h +++ b/keyboards/atreyu/rev2/config.h @@ -47,11 +47,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. -- 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/atreyu/rev1/info.json | 2 ++ keyboards/atreyu/rev2/info.json | 2 ++ keyboards/atreyu/rules.mk | 6 ------ 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'keyboards/atreyu') diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json index 27a5bc2a82..a9522acd5d 100644 --- a/keyboards/atreyu/rev1/info.json +++ b/keyboards/atreyu/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json index 45324ce73e..5c74a40c92 100644 --- a/keyboards/atreyu/rev2/info.json +++ b/keyboards/atreyu/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk index 1e05f827de..23ebd8ba33 100644 --- a/keyboards/atreyu/rules.mk +++ b/keyboards/atreyu/rules.mk @@ -1,11 +1,5 @@ DEFAULT_FOLDER = atreyu/rev1 -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # 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/atreyu/config.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 keyboards/atreyu/config.h (limited to 'keyboards/atreyu') diff --git a/keyboards/atreyu/config.h b/keyboards/atreyu/config.h deleted file mode 100644 index e5011632cf..0000000000 --- a/keyboards/atreyu/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * 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 - - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -- 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/atreyu/rev1/config.h | 4 ---- keyboards/atreyu/rev2/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/atreyu') diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h index da94244f77..67a4d1d05d 100644 --- a/keyboards/atreyu/rev1/config.h +++ b/keyboards/atreyu/rev1/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h index ffffdaabd0..baaef0800c 100644 --- a/keyboards/atreyu/rev2/config.h +++ b/keyboards/atreyu/rev2/config.h @@ -17,10 +17,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 - /* * Keyboard Matrix Assignments * -- 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/atreyu/rev1/config.h | 7 ------- keyboards/atreyu/rev1/info.json | 14 ++++++++++++++ keyboards/atreyu/rev2/config.h | 5 ----- keyboards/atreyu/rev2/info.json | 6 ++++++ 4 files changed, 20 insertions(+), 12 deletions(-) (limited to 'keyboards/atreyu') diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h index 67a4d1d05d..99eb2c21e6 100644 --- a/keyboards/atreyu/rev1/config.h +++ b/keyboards/atreyu/rev1/config.h @@ -30,13 +30,6 @@ #define MATRIX_ROW_PINS { D7, E6, B4, B5, F6, F7, B1, B3, B6, B2 } #define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3 } -/* encoder support */ -#define ENCODERS_PAD_A { F5 } -#define ENCODERS_PAD_B { F4 } -#define ENCODERS_PAD_A_RIGHT { F4 } -#define ENCODERS_PAD_B_RIGHT { F5 } -#define ENCODER_RESOLUTION 4 - /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json index a9522acd5d..6d191d0635 100644 --- a/keyboards/atreyu/rev1/info.json +++ b/keyboards/atreyu/rev1/info.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4"} + ] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5"} + ] + } + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h index baaef0800c..de63cf3bd1 100644 --- a/keyboards/atreyu/rev2/config.h +++ b/keyboards/atreyu/rev2/config.h @@ -30,11 +30,6 @@ #define MATRIX_ROW_PINS { D7, E6, B4, B5, F6, F7, B1, B3, B6, B2 } #define MATRIX_COL_PINS { F4, F5, C6, D4, D2, D3 } -/* encoder support */ -#define ENCODERS_PAD_A { D5, D5 } -#define ENCODERS_PAD_B { B7, C7 } -#define ENCODER_RESOLUTION 4 - /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json index 5c74a40c92..a890b8d271 100644 --- a/keyboards/atreyu/rev2/info.json +++ b/keyboards/atreyu/rev2/info.json @@ -8,6 +8,12 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "D5", "pin_b": "B7"}, + {"pin_a": "D5", "pin_b": "C7"} + ] + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3