From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/ferris/0_1/0_1.c | 17 ----------------- keyboards/ferris/0_2/0_2.c | 17 ----------------- 2 files changed, 34 deletions(-) delete mode 100644 keyboards/ferris/0_1/0_1.c delete mode 100644 keyboards/ferris/0_2/0_2.c (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_1/0_1.c b/keyboards/ferris/0_1/0_1.c deleted file mode 100644 index dbdb0b4bdc..0000000000 --- a/keyboards/ferris/0_1/0_1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -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 . -*/ -#include "0_1.h" diff --git a/keyboards/ferris/0_2/0_2.c b/keyboards/ferris/0_2/0_2.c deleted file mode 100644 index 519961dd38..0000000000 --- a/keyboards/ferris/0_2/0_2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -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 . -*/ -#include "0_2.h" -- cgit v1.2.3 From 3c144fac5e2b634166f6b9cc0fc45029d63d3398 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 20 Mar 2023 08:12:05 +1100 Subject: Clean up usage of `QMK_KEYBOARD_H` (#20167) --- keyboards/ferris/0_1/matrix.c | 4 +++- keyboards/ferris/0_2/matrix.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_1/matrix.c b/keyboards/ferris/0_1/matrix.c index 0dfb150b6c..154a275d7a 100644 --- a/keyboards/ferris/0_1/matrix.c +++ b/keyboards/ferris/0_1/matrix.c @@ -23,7 +23,9 @@ along with this program. If not, see . * to repeating that information all over the place. */ -#include QMK_KEYBOARD_H +#include "matrix.h" +#include "debug.h" +#include "wait.h" #include "i2c_master.h" extern i2c_status_t mcp23017_status; diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c index ff0e66d65c..af4b045eb8 100644 --- a/keyboards/ferris/0_2/matrix.c +++ b/keyboards/ferris/0_2/matrix.c @@ -23,9 +23,10 @@ along with this program. If not, see . * to repeating that information all over the place. */ -#include QMK_KEYBOARD_H +#include "matrix.h" +#include "debug.h" +#include "wait.h" #include "i2c_master.h" -#include extern i2c_status_t mcp23017_status; #define MCP23017_I2C_TIMEOUT 1000 -- cgit v1.2.3 From e40b6ca3b05e50253c3f6bbc08673e1720ddd9be Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 1 Apr 2023 13:09:53 +1100 Subject: Move split layouts to data driven (#20290) --- keyboards/ferris/0_1/0_1.h | 44 -------------------------- keyboards/ferris/0_1/info.json | 71 ++++++++++++++++++++++-------------------- keyboards/ferris/0_2/0_2.h | 44 -------------------------- keyboards/ferris/0_2/info.json | 71 ++++++++++++++++++++++-------------------- 4 files changed, 74 insertions(+), 156 deletions(-) delete mode 100644 keyboards/ferris/0_1/0_1.h delete mode 100644 keyboards/ferris/0_2/0_2.h (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h deleted file mode 100644 index 2f58831df7..0000000000 --- a/keyboards/ferris/0_1/0_1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -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" - -// clang-format off - -/* left hand right hand */ -#define LAYOUT_split_3x5_2(\ - K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ - K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ - K3_3, K3_4, K3_5, K3_6)\ -/* matrix positions */\ -{\ - {K0_0, K0_1, K0_2, K0_3, K0_4},\ - {K1_0, K1_1, K1_2, K1_3, K1_4},\ - {K2_0, K2_1, K2_2, K2_3, K2_4},\ - {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ - \ - {K0_5, K0_6, K0_7, K0_8, K0_9},\ - {K1_5, K1_6, K1_7, K1_8, K1_9},\ - {K2_5, K2_6, K2_7, K2_8, K2_9},\ - {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ -} - -// clang-format on -#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 0738a0491f..5a65369f61 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -9,50 +9,53 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.31}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.28}, + {"matrix": [0, 4], "x": 4, "y": 0.42}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"matrix": [4, 0], "x": 7, "y": 0.42}, + {"matrix": [4, 1], "x": 8, "y": 0.28}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0.31}, + {"matrix": [4, 4], "x": 11, "y": 0.93}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.31}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.28}, + {"matrix": [1, 4], "x": 4, "y": 1.42}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"matrix": [5, 0], "x": 7, "y": 1.42}, + {"matrix": [5, 1], "x": 8, "y": 1.28}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1.31}, + {"matrix": [5, 4], "x": 11, "y": 1.93}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.31}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.28}, + {"matrix": [2, 4], "x": 4, "y": 2.42}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"matrix": [6, 0], "x": 7, "y": 2.42}, + {"matrix": [6, 1], "x": 8, "y": 2.28}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2.31}, + {"matrix": [6, 4], "x": 11, "y": 2.93}, - {"x": 3.5, "y": 3.75}, - {"x": 4.5, "y": 4}, + {"matrix": [3, 3], "x": 3.5, "y": 3.75}, + {"matrix": [3, 4], "x": 4.5, "y": 4}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.75} + {"matrix": [7, 0], "x": 6.5, "y": 4}, + {"matrix": [7, 1], "x": 7.5, "y": 3.75} ] } } diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h deleted file mode 100644 index 2f58831df7..0000000000 --- a/keyboards/ferris/0_2/0_2.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -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" - -// clang-format off - -/* left hand right hand */ -#define LAYOUT_split_3x5_2(\ - K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ - K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ - K3_3, K3_4, K3_5, K3_6)\ -/* matrix positions */\ -{\ - {K0_0, K0_1, K0_2, K0_3, K0_4},\ - {K1_0, K1_1, K1_2, K1_3, K1_4},\ - {K2_0, K2_1, K2_2, K2_3, K2_4},\ - {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ - \ - {K0_5, K0_6, K0_7, K0_8, K0_9},\ - {K1_5, K1_6, K1_7, K1_8, K1_9},\ - {K2_5, K2_6, K2_7, K2_8, K2_9},\ - {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ -} - -// clang-format on -#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index f2b6b4b07b..c6584ecf01 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -7,50 +7,53 @@ "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.31}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.28}, + {"matrix": [0, 4], "x": 4, "y": 0.42}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"matrix": [4, 0], "x": 7, "y": 0.42}, + {"matrix": [4, 1], "x": 8, "y": 0.28}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0.31}, + {"matrix": [4, 4], "x": 11, "y": 0.93}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.31}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.28}, + {"matrix": [1, 4], "x": 4, "y": 1.42}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"matrix": [5, 0], "x": 7, "y": 1.42}, + {"matrix": [5, 1], "x": 8, "y": 1.28}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1.31}, + {"matrix": [5, 4], "x": 11, "y": 1.93}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.31}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.28}, + {"matrix": [2, 4], "x": 4, "y": 2.42}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"matrix": [6, 0], "x": 7, "y": 2.42}, + {"matrix": [6, 1], "x": 8, "y": 2.28}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2.31}, + {"matrix": [6, 4], "x": 11, "y": 2.93}, - {"x": 3.5, "y": 3.75}, - {"x": 4.5, "y": 4}, + {"matrix": [3, 3], "x": 3.5, "y": 3.75}, + {"matrix": [3, 4], "x": 4.5, "y": 4}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.75} + {"matrix": [7, 0], "x": 6.5, "y": 4}, + {"matrix": [7, 1], "x": 7.5, "y": 3.75} ] } } -- cgit v1.2.3 From 1899793f27c9b165b55b28b086bd989f12baf137 Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Mon, 3 Apr 2023 07:32:47 +0200 Subject: Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211) --- keyboards/ferris/keymaps/bruun-baer/config.h | 1 - keyboards/ferris/keymaps/default/config.h | 1 - keyboards/ferris/keymaps/madhatter/config.h | 1 - keyboards/ferris/keymaps/pierrec83/config.h | 1 - keyboards/ferris/keymaps/via/config.h | 1 - 5 files changed, 5 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h index 5c2377be1e..fce5cb445b 100644 --- a/keyboards/ferris/keymaps/bruun-baer/config.h +++ b/keyboards/ferris/keymaps/bruun-baer/config.h @@ -35,5 +35,4 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h index b10555bb0d..1a4d15ff42 100644 --- a/keyboards/ferris/keymaps/default/config.h +++ b/keyboards/ferris/keymaps/default/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 // Underglow configuration diff --git a/keyboards/ferris/keymaps/madhatter/config.h b/keyboards/ferris/keymaps/madhatter/config.h index 79496ae750..65a14e6622 100644 --- a/keyboards/ferris/keymaps/madhatter/config.h +++ b/keyboards/ferris/keymaps/madhatter/config.h @@ -19,4 +19,3 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h index b10555bb0d..1a4d15ff42 100644 --- a/keyboards/ferris/keymaps/pierrec83/config.h +++ b/keyboards/ferris/keymaps/pierrec83/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 // Underglow configuration diff --git a/keyboards/ferris/keymaps/via/config.h b/keyboards/ferris/keymaps/via/config.h index 0d822891d1..4bdd1774a7 100644 --- a/keyboards/ferris/keymaps/via/config.h +++ b/keyboards/ferris/keymaps/via/config.h @@ -5,7 +5,6 @@ // Good defaults for home row modifiers #define TAPPING_TERM 230 -#define IGNORE_MOD_TAP_INTERRUPT // Handle master/slave detection on low cost Promicro #ifdef __AVR__ -- cgit v1.2.3 From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/ferris/0_2/bling/info.json | 3 +++ keyboards/ferris/0_2/bling/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json index 5473c33295..28ed4f90e3 100644 --- a/keyboards/ferris/0_2/bling/info.json +++ b/keyboards/ferris/0_2/bling/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Ferris 0.2 - Bling", "usb": { "pid": "0x0002" + }, + "rgb_matrix": { + "driver": "IS31FL3731" } } diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk index e04c8e4670..aad92997d0 100644 --- a/keyboards/ferris/0_2/bling/rules.mk +++ b/keyboards/ferris/0_2/bling/rules.mk @@ -1,2 +1 @@ RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 -- cgit v1.2.3