From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/obosob/arch_36/config.h | 7 ------- keyboards/obosob/arch_36/info.json | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/obosob') diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h index ae2913396b..c861404357 100644 --- a/keyboards/obosob/arch_36/config.h +++ b/keyboards/obosob/arch_36/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -// wiring -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN D3 #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 63736c9a21..9b0fa7841e 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -8,6 +8,11 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, -- 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/obosob/arch_36/arch_36.c | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 keyboards/obosob/arch_36/arch_36.c (limited to 'keyboards/obosob') diff --git a/keyboards/obosob/arch_36/arch_36.c b/keyboards/obosob/arch_36/arch_36.c deleted file mode 100644 index d707e64195..0000000000 --- a/keyboards/obosob/arch_36/arch_36.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Obosob - * - * 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 "arch_36.h" -- 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/obosob/arch_36/arch_36.h | 43 --------------------- keyboards/obosob/arch_36/info.json | 76 ++++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 79 deletions(-) delete mode 100644 keyboards/obosob/arch_36/arch_36.h (limited to 'keyboards/obosob') diff --git a/keyboards/obosob/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h deleted file mode 100644 index 11c5e2de22..0000000000 --- a/keyboards/obosob/arch_36/arch_36.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 Obosob - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_split_3x5_3( \ - L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ - L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \ - L32, L33, L34, R35, R36, R37 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { KC_NO, KC_NO, L32, L33, L34 }, \ - { R09, R08, R07, R06, R05 }, \ - { R19, R18, R17, R16, R15 }, \ - { R29, R28, R27, R26, R25 }, \ - { KC_NO, KC_NO, R37, R36, R35 }, \ -} diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 9b0fa7841e..9eef360e86 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -22,45 +22,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"x":0, "y":1}, - {"x":1, "y":0.25}, - {"x":2, "y":0}, - {"x":3, "y":0.375}, - {"x":4, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.375}, - {"x":11, "y":0}, - {"x":12, "y":0.25}, - {"x":13, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.375}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, - {"x":0, "y":2}, - {"x":1, "y":1.25}, - {"x":2, "y":1}, - {"x":3, "y":1.375}, - {"x":4, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.375}, - {"x":11, "y":1}, - {"x":12, "y":1.25}, - {"x":13, "y":2}, + {"matrix": [4, 4], "x": 9, "y": 0.5}, + {"matrix": [4, 3], "x": 10, "y": 0.375}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":2.25}, - {"x":2, "y":2}, - {"x":3, "y":2.375}, - {"x":4, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.375}, - {"x":11, "y":2}, - {"x":12, "y":2.25}, - {"x":13, "y":3}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.375}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.7}, - {"x":5.5, "y":4.1}, - {"x":7.5, "y":4.1}, - {"x":8.5, "y":3.7}, - {"x":9.5, "y":3.5} + {"matrix": [5, 4], "x": 9, "y": 1.5}, + {"matrix": [5, 3], "x": 10, "y": 1.375}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.375}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 4], "x": 9, "y": 2.5}, + {"matrix": [6, 3], "x": 10, "y": 2.375}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 3}, + + {"matrix": [3, 2], "x": 3.5, "y": 3.5}, + {"matrix": [3, 3], "x": 4.5, "y": 3.7}, + {"matrix": [3, 4], "x": 5.5, "y": 4.1}, + + {"matrix": [7, 4], "x": 7.5, "y": 4.1}, + {"matrix": [7, 3], "x": 8.5, "y": 3.7}, + {"matrix": [7, 2], "x": 9.5, "y": 3.5} ] } } -- 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/obosob/steal_this_keyboard/keymaps/default/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/obosob') diff --git a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h index 3e3ba7a401..71b4813515 100644 --- a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h +++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/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 -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/obosob/arch_36/config.h | 1 - keyboards/obosob/arch_36/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/obosob') diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h index c861404357..068a231f43 100644 --- a/keyboards/obosob/arch_36/config.h +++ b/keyboards/obosob/arch_36/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLED_SPLIT { 6, 6 } #define RGBLED_NUM 12 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \ diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 9eef360e86..d978080a2f 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3"], -- cgit v1.2.3