From 1022afa6c24a64c78d1c9be99a695ff5335876f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 04:59:07 +1100 Subject: Move matrix config to info.json, part 8 (#20030) --- keyboards/keebio/fourier/config.h | 7 ------- keyboards/keebio/fourier/info.json | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/keebio/fourier') diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h index a9af99d29d..0f2d67caaa 100644 --- a/keyboards/keebio/fourier/config.h +++ b/keyboards/keebio/fourier/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F4, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* Split Defines */ #define SPLIT_HAND_PIN D2 diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 9633cb3e93..dbe60ec677 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -8,6 +8,11 @@ "pid": "0x1247", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["F4", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "F4", "esc_output": "F5", -- 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/keebio/fourier/fourier.c | 1 - keyboards/keebio/fourier/fourier.h | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 keyboards/keebio/fourier/fourier.c (limited to 'keyboards/keebio/fourier') diff --git a/keyboards/keebio/fourier/fourier.c b/keyboards/keebio/fourier/fourier.c deleted file mode 100644 index 1bd47f98bc..0000000000 --- a/keyboards/keebio/fourier/fourier.c +++ /dev/null @@ -1 +0,0 @@ -#include "fourier.h" diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h index b99dd57c2e..1bc5e1653c 100644 --- a/keyboards/keebio/fourier/fourier.h +++ b/keyboards/keebio/fourier/fourier.h @@ -1,9 +1,5 @@ #pragma once -#ifdef KEYBOARD_fourier_rev1 - #include "rev1.h" -#endif - #include "quantum.h" #define LAYOUT( \ -- 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/keebio/fourier/config.h | 1 - keyboards/keebio/fourier/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/keebio/fourier') diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h index 0f2d67caaa..904658ff8a 100644 --- a/keyboards/keebio/fourier/config.h +++ b/keyboards/keebio/fourier/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index dbe60ec677..48b04f122e 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -22,6 +22,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- 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/keebio/fourier/fourier.h | 20 -------- keyboards/keebio/fourier/info.json | 94 +++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 67 deletions(-) delete mode 100644 keyboards/keebio/fourier/fourier.h (limited to 'keyboards/keebio/fourier') diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h deleted file mode 100644 index 1bc5e1653c..0000000000 --- a/keyboards/keebio/fourier/fourier.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB7, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC3, RC4, RC5, RC6, RC7, \ - LD1, LD2, LD3, LD4, LD5, RD1, RD4, RD5, RD6, RD7 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \ - { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \ - { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \ - { LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \ - { RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \ - { RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \ - { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \ - { RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \ - } diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 48b04f122e..22c24e13c8 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -30,60 +30,60 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, + {"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}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0}, - {"label":"Del", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, + {"matrix": [4, 6], "x": 13, "y": 0}, - {"label":"Esc", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, - {"label":"H", "x":7.25, "y":1}, - {"label":"J", "x":8.25, "y":1}, - {"label":"K", "x":9.25, "y":1}, - {"label":"L", "x":10.25, "y":1}, - {"label":";", "x":11.25, "y":1}, - {"label":"Enter", "x":12.25, "y":1, "w":1.75}, + {"matrix": [5, 0], "x": 7.25, "y": 1}, + {"matrix": [5, 1], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 3], "x": 10.25, "y": 1}, + {"matrix": [5, 4], "x": 11.25, "y": 1}, + {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"label":"N", "x":7.75, "y":2}, - {"label":"M", "x":8.75, "y":2}, - {"label":"<", "x":9.75, "y":2}, - {"label":">", "x":10.75, "y":2}, - {"label":"?", "x":11.75, "y":2}, - {"label":"Shift", "x":12.75, "y":2, "w":1.25}, + {"matrix": [6, 0], "x": 7.75, "y": 2}, + {"matrix": [6, 2], "x": 8.75, "y": 2}, + {"matrix": [6, 3], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [6, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"Alt", "x":1, "y":3}, - {"label":"Gui", "x":2, "y":3}, - {"label":"Fn1", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3, "w":2.25}, + {"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}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25}, - {"label":"Backspace", "x":7.25, "y":3, "w":2.25}, - {"label":"Gui", "x":9.5, "y":3}, - {"label":"Alt", "x":10.5, "y":3, "w":1.25}, - {"label":"Fn2", "x":11.75, "y":3}, - {"label":"Ctrl", "x":12.75, "y":3, "w":1.25} + {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25} ] } } -- 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/keebio/fourier/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/keebio/fourier') diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 22c24e13c8..a9b37bda00 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Fourier", + "keyboard_name": "Fourier", "manufacturer": "Keebio", - "url": "https://keeb.io", - "maintainer": "nooges", + "url": "https://keeb.io", + "maintainer": "nooges", "usb": { "vid": "0xCB10", "pid": "0x1247", -- cgit v1.2.3