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/makrosu/config.h | 7 ------- keyboards/makrosu/info.json | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/makrosu') diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h index c00353db89..98108cce78 100644 --- a/keyboards/makrosu/config.h +++ b/keyboards/makrosu/config.h @@ -16,14 +16,7 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B6 } -#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5} - #define TAP_CODE_DELAY 10 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json index 77974305e5..9abafac946 100644 --- a/keyboards/makrosu/info.json +++ b/keyboards/makrosu/info.json @@ -8,6 +8,11 @@ "pid": "0x8585", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "D1"} -- 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/makrosu/makrosu.c | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 keyboards/makrosu/makrosu.c (limited to 'keyboards/makrosu') diff --git a/keyboards/makrosu/makrosu.c b/keyboards/makrosu/makrosu.c deleted file mode 100644 index 8a9a222789..0000000000 --- a/keyboards/makrosu/makrosu.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 Valdydesu_ - * - * 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 "makrosu.h" -- cgit v1.2.3 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/makrosu/config.h | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'keyboards/makrosu') diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h index 98108cce78..64f4553f90 100644 --- a/keyboards/makrosu/config.h +++ b/keyboards/makrosu/config.h @@ -23,25 +23,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - - -// EEPROM usage - - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif -- cgit v1.2.3 From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/makrosu/info.json | 15 +++++++-------- keyboards/makrosu/makrosu.h | 20 -------------------- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 keyboards/makrosu/makrosu.h (limited to 'keyboards/makrosu') diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json index 9abafac946..96eaf9fad6 100644 --- a/keyboards/makrosu/info.json +++ b/keyboards/makrosu/info.json @@ -26,14 +26,13 @@ "layouts": { "LAYOUT": { "layout": [ - - {"label" : "Esc", "x":0, "y":0}, - {"label" : "F1", "x":1, "y":0}, - {"label" : "F2", "x":2, "y":0}, - - {"label" : "Lower", "x":0, "y":1}, - {"label" : "Z", "x":1.5, "y":1}, - {"label" : "X", "x":2.5, "y":1} + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1.5, "y": 1}, + {"matrix": [0, 5], "x": 2.5, "y": 1} ] } } diff --git a/keyboards/makrosu/makrosu.h b/keyboards/makrosu/makrosu.h deleted file mode 100644 index ee61ce1185..0000000000 --- a/keyboards/makrosu/makrosu.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* This is 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( \ - K02, K03, K04, \ - K00, K01, K05 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ -} - -- cgit v1.2.3