From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/swiftrax/retropad/config.h | 9 --------- keyboards/swiftrax/retropad/info.json | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'keyboards/swiftrax/retropad') diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index f963856c97..66a3ef6740 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { C7, C6, B5 } -#define MATRIX_COL_PINS { B4, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index ea43a71b12..96f523fb4b 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -8,6 +8,11 @@ "pid": "0xEB0C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "D2"], + "rows": ["C7", "C6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "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/swiftrax/retropad/retropad.c | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 keyboards/swiftrax/retropad/retropad.c (limited to 'keyboards/swiftrax/retropad') diff --git a/keyboards/swiftrax/retropad/retropad.c b/keyboards/swiftrax/retropad/retropad.c deleted file mode 100644 index 3ffe29528f..0000000000 --- a/keyboards/swiftrax/retropad/retropad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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 "retropad.h" \ No newline at end of file -- 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/swiftrax/retropad/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/swiftrax/retropad') diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index 66a3ef6740..49157532f2 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 -- 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/swiftrax/retropad/info.json | 10 +++++++++- keyboards/swiftrax/retropad/retropad.h | 31 ------------------------------- 2 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 keyboards/swiftrax/retropad/retropad.h (limited to 'keyboards/swiftrax/retropad') diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 96f523fb4b..23f3a372e5 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -25,7 +25,15 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"0,1", "x":0.5, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1, "y":2.5}] + "layout": [ + {"matrix": [0, 1], "x": 0.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5} + ] } } } diff --git a/keyboards/swiftrax/retropad/retropad.h b/keyboards/swiftrax/retropad/retropad.h deleted file mode 100644 index e7527d5c00..0000000000 --- a/keyboards/swiftrax/retropad/retropad.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - K001, \ - K100, K101, \ - K200, K201 \ -) { \ - { XXX, K001, }, \ - { K100, K101, }, \ - { K200, K201, } \ -} -- 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/swiftrax/retropad/config.h | 1 - keyboards/swiftrax/retropad/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/swiftrax/retropad') diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index 49157532f2..b737022959 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 23f3a372e5..2c18990f02 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -21,6 +21,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/swiftrax/retropad/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/swiftrax/retropad') diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 2c18990f02..57ce8bd79e 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Retropad", + "keyboard_name": "Retropad", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEB0C", -- cgit v1.2.3