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/maple_computing/launchpad/rev1/config.h | 8 -------- keyboards/maple_computing/launchpad/rev1/info.json | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'keyboards/maple_computing/launchpad') diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index cd0ea962c2..aecb3f02bd 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once -#include "../config.h" - -/* Let's Macro V2 pin-out */ -#define MATRIX_ROW_PINS { C6, B1, B3, D7 } -#define MATRIX_COL_PINS { D2, F7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 10 #define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index 8ae1835b69..49f4c16bc9 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "F7"], + "rows": ["C6", "B1", "B3", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 Mar 2023 20:18:33 +1100 Subject: Remove useless "ifdef KEYBOARD_*" (#20078) Co-authored-by: Nick Brassel --- keyboards/maple_computing/launchpad/launchpad.c | 1 - keyboards/maple_computing/launchpad/launchpad.h | 7 ------- keyboards/maple_computing/launchpad/rev1/rev1.c | 1 - keyboards/maple_computing/launchpad/rev1/rev1.h | 2 -- 4 files changed, 11 deletions(-) delete mode 100644 keyboards/maple_computing/launchpad/launchpad.c delete mode 100644 keyboards/maple_computing/launchpad/launchpad.h delete mode 100644 keyboards/maple_computing/launchpad/rev1/rev1.c (limited to 'keyboards/maple_computing/launchpad') diff --git a/keyboards/maple_computing/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c deleted file mode 100644 index cc2812a76c..0000000000 --- a/keyboards/maple_computing/launchpad/launchpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "launchpad.h" diff --git a/keyboards/maple_computing/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h deleted file mode 100644 index f2a1b40588..0000000000 --- a/keyboards/maple_computing/launchpad/launchpad.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_maple_computing_launchpad_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c deleted file mode 100644 index cc2812a76c..0000000000 --- a/keyboards/maple_computing/launchpad/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "launchpad.h" diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h index 2ea6e7e775..54d72d5e54 100644 --- a/keyboards/maple_computing/launchpad/rev1/rev1.h +++ b/keyboards/maple_computing/launchpad/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "../launchpad.h" - #include "quantum.h" #define LAYOUT( \ -- 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/maple_computing/launchpad/keymaps/brandonschlack/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/maple_computing/launchpad') diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h index 6aaf996e57..b68a1ee51e 100644 --- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h @@ -16,12 +16,10 @@ #pragma once /* Underlight Configuration */ -#ifdef RGB_DI_PIN #undef RGB_DI_PIN #define RGB_DI_PIN F4 #undef RGBLED_NUM #define RGBLED_NUM 2 // Number of LEDs -#endif #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 -- cgit v1.2.3 From 2d9140af53e4e5bbc5cd50a2b6f3eda20ed8f71e Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Apr 2023 15:50:31 +1000 Subject: Fix a handful of CLI errors (#20321) --- keyboards/maple_computing/launchpad/config.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'keyboards/maple_computing/launchpad') diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index bc4eacf9a3..b9449c4714 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -/* 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 /* Locking resynchronize hack */ @@ -41,7 +37,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#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/maple_computing/launchpad/rev1/info.json | 16 ++++++++-------- keyboards/maple_computing/launchpad/rev1/rev1.h | 15 --------------- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 keyboards/maple_computing/launchpad/rev1/rev1.h (limited to 'keyboards/maple_computing/launchpad') diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index 49f4c16bc9..fe882742c3 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -18,17 +18,17 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3} ] } } diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h deleted file mode 100644 index 54d72d5e54..0000000000 --- a/keyboards/maple_computing/launchpad/rev1/rev1.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, \ - k10, k11, \ - k20, k21, \ - k30, k31 \ -) { \ - { k00, k01 }, \ - { k10, k11 }, \ - { k20, k21 }, \ - { k30, k31 } \ -} -- 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/maple_computing/launchpad/keymaps/brandonschlack/config.h | 4 ++-- keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h | 2 +- keyboards/maple_computing/launchpad/keymaps/drashna/config.h | 4 ++-- keyboards/maple_computing/launchpad/rev1/config.h | 1 - keyboards/maple_computing/launchpad/rev1/info.json | 3 +++ 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'keyboards/maple_computing/launchpad') diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h index b68a1ee51e..6b65e2dcc3 100644 --- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h @@ -16,8 +16,8 @@ #pragma once /* Underlight Configuration */ - #undef RGB_DI_PIN - #define RGB_DI_PIN F4 + #undef WS2812_DI_PIN + #define WS2812_DI_PIN F4 #undef RGBLED_NUM #define RGBLED_NUM 2 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h index 3ee1ec3013..3d47ae41e7 100644 --- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h @@ -1,7 +1,7 @@ #pragma once /* Underlight Configuration */ -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h index 7329440ee1..fb64366e6f 100644 --- a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h @@ -17,8 +17,8 @@ #pragma once /* Underlight Configuration */ -#undef RGB_DI_PIN -#define RGB_DI_PIN F5 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN F5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index aecb3f02bd..7cf73259b4 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGBLED_NUM 10 -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index fe882742c3..81c23850ec 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F6" + }, "matrix_pins": { "cols": ["D2", "F7"], "rows": ["C6", "B1", "B3", "D7"] -- cgit v1.2.3