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/alpha/config.h | 8 -------- keyboards/alpha/info.json | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'keyboards/alpha') diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 828839870a..0f104a2a5c 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, B4, B5 } -#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 } - -/* 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/alpha/info.json b/keyboards/alpha/info.json index 472bedb1fa..1f76cce458 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["D4", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- 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/alpha/alpha.c | 1 - 1 file changed, 1 deletion(-) delete mode 100755 keyboards/alpha/alpha.c (limited to 'keyboards/alpha') diff --git a/keyboards/alpha/alpha.c b/keyboards/alpha/alpha.c deleted file mode 100755 index 3029ba50a8..0000000000 --- a/keyboards/alpha/alpha.c +++ /dev/null @@ -1 +0,0 @@ -#include "alpha.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/alpha/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/alpha') diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 0f104a2a5c..5b87358a06 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif -- 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/alpha/config.h | 1 - keyboards/alpha/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/alpha') diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 5b87358a06..b4ab41d42c 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index 1f76cce458..d7f32ec156 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -7,6 +7,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5"] -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/alpha/alpha.h | 15 --------------- keyboards/alpha/info.json | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 16 deletions(-) delete mode 100755 keyboards/alpha/alpha.h (limited to 'keyboards/alpha') diff --git a/keyboards/alpha/alpha.h b/keyboards/alpha/alpha.h deleted file mode 100755 index 204e03822b..0000000000 --- a/keyboards/alpha/alpha.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k25, k27, k28, k29 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, XXX, k25, XXX, k27, k28, k29 } \ -} diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index d7f32ec156..ede9ad92f9 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -19,7 +19,38 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2, "w":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}] + "layout": [ + {"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": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "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": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0.5, "y": 2}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2, "w": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2} + ] } } } -- 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/alpha/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/alpha') diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index ede9ad92f9..86e4dbefb3 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Alpha", + "keyboard_name": "Alpha", "manufacturer": "PyroL", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6060", -- cgit v1.2.3