From 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:32:05 +1100 Subject: Move matrix config to info.json, part 6 (#20019) --- keyboards/handwired/twig/twig50/config.h | 6 ------ keyboards/handwired/twig/twig50/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/handwired/twig/twig50') diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h index 59a6a26c44..25236b2a2f 100644 --- a/keyboards/handwired/twig/twig50/config.h +++ b/keyboards/handwired/twig/twig50/config.h @@ -3,12 +3,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B7, B6, B5, B4 } -#define MATRIX_COL_PINS { A2, A1, A0, B8 , B13, B14, B15, B9, B10, B11, B3, B2, B1, B0} - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 150 #define FORCE_NKRO diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index aae4bfa531..a6a6c2e1a3 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.2.1" }, + "matrix_pins": { + "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"], + "rows": ["B7", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", -- cgit v1.2.3 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/handwired/twig/twig50/twig50.c | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 keyboards/handwired/twig/twig50/twig50.c (limited to 'keyboards/handwired/twig/twig50') diff --git a/keyboards/handwired/twig/twig50/twig50.c b/keyboards/handwired/twig/twig50/twig50.c deleted file mode 100644 index 7c4c8572f8..0000000000 --- a/keyboards/handwired/twig/twig50/twig50.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Takeshi Noda (nodatk@gmail.com) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "twig50.h" -- cgit v1.2.3 From 54634e92634f73a6d9111833adf58214cb4278c3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 14 Apr 2023 19:42:50 +1000 Subject: Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417) --- keyboards/handwired/twig/twig50/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/handwired/twig/twig50') diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c index 9cdbc872ae..954c8e5637 100644 --- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c +++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c @@ -1,7 +1,7 @@ // Copyright 2022 Takeshi Noda (nodatk@gmail.com) // SPDX-License-Identifier: GPL-2.0-or-later -#include "twig50.h" +#include QMK_KEYBOARD_H #define LAL_NCV LALT_T(KC_LNG2) #define RAL_CNV RALT_T(KC_LNG1) -- cgit v1.2.3 From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/handwired/twig/twig50/info.json | 66 +++++++++++++++++++++++++++---- keyboards/handwired/twig/twig50/twig50.h | 20 ---------- 2 files changed, 58 insertions(+), 28 deletions(-) delete mode 100644 keyboards/handwired/twig/twig50/twig50.h (limited to 'keyboards/handwired/twig/twig50') diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index a6a6c2e1a3..9ed5c92d46 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/info.json @@ -18,12 +18,62 @@ "board": "QMK_PROTON_C", "debounce": 8, "layouts": { - "LAYOUT_diag_4x14": { - "layout": [ -{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "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":13, "y":0}, -{"x":0, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "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":13, "y":1}, -{"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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":13, "y":2}, -{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "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":13, "y":3}] - } + "LAYOUT_diag_4x14": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} + ] + } } - } +} diff --git a/keyboards/handwired/twig/twig50/twig50.h b/keyboards/handwired/twig/twig50/twig50.h deleted file mode 100644 index 771f13e051..0000000000 --- a/keyboards/handwired/twig/twig50/twig50.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 Takeshi Noda (nodatk@gmail.com) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_diag_4x14( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K34, K35, K37, K38, K39, K3A, K3B, K3D \ -) { \ - { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \ - { K30, K31, K32, ___, K34, K35, ___, K37, K38, K39, K3A, K3B, ___, K3D } \ -} -- cgit v1.2.3 From 12d42cedd2624db0d5cfe6f538211f9dfcd19822 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 13:33:10 +1000 Subject: Move `FORCE_NKRO` to data driven (#20604) --- keyboards/handwired/twig/twig50/config.h | 2 -- keyboards/handwired/twig/twig50/info.json | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'keyboards/handwired/twig/twig50') diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h index 25236b2a2f..d3d188ef42 100644 --- a/keyboards/handwired/twig/twig50/config.h +++ b/keyboards/handwired/twig/twig50/config.h @@ -5,8 +5,6 @@ #define TAPPING_TERM 150 -#define FORCE_NKRO - #ifdef AUDIO_ENABLE #define AUDIO_PIN A5 #define AUDIO_PIN_ALT A4 diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index 9ed5c92d46..c32734cecb 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.2.1" + "device_version": "0.2.1", + "force_nkro": true }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"], -- cgit v1.2.3