From caa8c81086a806ea048c91ba142d424dc6a49f50 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:39:56 +1100 Subject: Move matrix config to info.json, part 7 (#20020) --- keyboards/manyboard/macro/config.h | 7 ------- keyboards/manyboard/macro/info.json | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/manyboard') diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index 1839a1091d..dab95cea0e 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Pins */ #define RGB_DI_PIN B6 #define RGBLED_NUM 2 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index cdf40f6801..6d82466ac8 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -8,6 +8,11 @@ "pid": "0x0015", "device_version": "1.0.3" }, + "matrix_pins": { + "cols": ["D4", "D5", "D6", "D7"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "C7"} -- 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/manyboard/macro/macro.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/manyboard/macro/macro.c (limited to 'keyboards/manyboard') diff --git a/keyboards/manyboard/macro/macro.c b/keyboards/manyboard/macro/macro.c deleted file mode 100644 index eb8a188f3c..0000000000 --- a/keyboards/manyboard/macro/macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 WillEhman - * - * 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 "macro.h" -- cgit v1.2.3 From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/manyboard/macro/info.json | 35 +++++++++++++++++++---------------- keyboards/manyboard/macro/macro.h | 31 ------------------------------- 2 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 keyboards/manyboard/macro/macro.h (limited to 'keyboards/manyboard') diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index 6d82466ac8..e0ed26f010 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -23,22 +23,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} ] } } diff --git a/keyboards/manyboard/macro/macro.h b/keyboards/manyboard/macro/macro.h deleted file mode 100644 index 0dccdbebfb..0000000000 --- a/keyboards/manyboard/macro/macro.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 WillEhman - * - * 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" - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} -- 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/manyboard/macro/config.h | 1 - keyboards/manyboard/macro/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/manyboard') diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index dab95cea0e..3d4d25aad3 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -18,6 +18,5 @@ along with this program. If not, see . #pragma once /* RGB Pins */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 2 #define RGBLIGHT_LIMIT_VAL 10 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index e0ed26f010..ad7bf1e556 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -18,6 +18,9 @@ {"pin_a": "C6", "pin_b": "C7"} ] }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/manyboard/macro/config.h | 1 - keyboards/manyboard/macro/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/manyboard') diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index 3d4d25aad3..3927473711 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -19,4 +19,3 @@ along with this program. If not, see . /* RGB Pins */ #define RGBLED_NUM 2 -#define RGBLIGHT_LIMIT_VAL 10 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index ad7bf1e556..3df9a79430 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -21,6 +21,9 @@ "ws2812": { "pin": "B6" }, + "rgblight": { + "max_brightness": 10 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3