From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/fleuron/info.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'keyboards/fleuron/info.json') diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index 72c744987f..2459612958 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -7,6 +7,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "B6", "B3", "B5", "B4", "D7", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/fleuron/info.json | 201 +++++++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 96 deletions(-) (limited to 'keyboards/fleuron/info.json') diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index 2459612958..d4bb44cd89 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -14,105 +14,114 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_fleuron_grid": "LAYOUT_ortho_6x16" + }, "layouts": { "LAYOUT_ortho_6x16": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"Home", "x":13, "y":0}, - {"label":"PgUp", "x":14, "y":0}, - {"label":"Bksp", "x":15, "y":0}, - {"label":"`", "x":0, "y":1}, - {"label":"1", "x":1, "y":1}, - {"label":"2", "x":2, "y":1}, - {"label":"3", "x":3, "y":1}, - {"label":"4", "x":4, "y":1}, - {"label":"5", "x":5, "y":1}, - {"label":"6", "x":6, "y":1}, - {"label":"7", "x":7, "y":1}, - {"label":"8", "x":8, "y":1}, - {"label":"9", "x":9, "y":1}, - {"label":"0", "x":10, "y":1}, - {"label":"Bksp", "x":11, "y":1}, - {"label":"Delete", "x":12, "y":1}, - {"label":"End", "x":13, "y":1}, - {"label":"PgDn", "x":14, "y":1}, - {"label":"", "x":15, "y":1}, - {"label":"Tab", "x":0, "y":2}, - {"label":"q", "x":1, "y":2}, - {"label":"w", "x":2, "y":2}, - {"label":"e", "x":3, "y":2}, - {"label":"r", "x":4, "y":2}, - {"label":"t", "x":5, "y":2}, - {"label":"y", "x":6, "y":2}, - {"label":"u", "x":7, "y":2}, - {"label":"i", "x":8, "y":2}, - {"label":"o", "x":9, "y":2}, - {"label":"p", "x":10, "y":2}, - {"label":"\\", "x":11, "y":2}, - {"label":"7", "x":12, "y":2}, - {"label":"8", "x":13, "y":2}, - {"label":"9", "x":14, "y":2}, - {"label":"*", "x":15, "y":2}, - {"label":"Caps Lock", "x":0, "y":3}, - {"label":"a", "x":1, "y":3}, - {"label":"s", "x":2, "y":3}, - {"label":"d", "x":3, "y":3}, - {"label":"f", "x":4, "y":3}, - {"label":"g", "x":5, "y":3}, - {"label":"h", "x":6, "y":3}, - {"label":"j", "x":7, "y":3}, - {"label":"k", "x":8, "y":3}, - {"label":"l", "x":9, "y":3}, - {"label":";", "x":10, "y":3}, - {"label":"'", "x":11, "y":3}, - {"label":"4", "x":12, "y":3}, - {"label":"5", "x":13, "y":3}, - {"label":"6", "x":14, "y":3}, - {"label":"-", "x":15, "y":3}, - {"label":"Shift", "x":0, "y":4}, - {"label":"z", "x":1, "y":4}, - {"label":"x", "x":2, "y":4}, - {"label":"c", "x":3, "y":4}, - {"label":"v", "x":4, "y":4}, - {"label":"b", "x":5, "y":4}, - {"label":"n", "x":6, "y":4}, - {"label":"m", "x":7, "y":4}, - {"label":",", "x":8, "y":4}, - {"label":".", "x":9, "y":4}, - {"label":"/", "x":10, "y":4}, - {"label":"Enter", "x":11, "y":4}, - {"label":"1", "x":12, "y":4}, - {"label":"2", "x":13, "y":4}, - {"label":"3", "x":14, "y":4}, - {"label":"+", "x":15, "y":4}, - {"label":"RGB", "x":0, "y":5}, - {"label":"Ctrl", "x":1, "y":5}, - {"label":"Win", "x":2, "y":5}, - {"label":"Alt", "x":3, "y":5}, - {"label":"Lower", "x":4, "y":5}, - {"label":"Space", "x":5, "y":5}, - {"label":"Space", "x":6, "y":5}, - {"label":"Raise", "x":7, "y":5}, - {"label":"\u2190", "x":8, "y":5}, - {"label":"\u2193", "x":9, "y":5}, - {"label":"\u2191", "x":10, "y":5}, - {"label":"\u2192", "x":11, "y":5}, - {"label":"0", "x":12, "y":5}, - {"label":"00", "x":13, "y":5}, - {"label":".", "x":14, "y":5}, - {"label":"Enter", "x":15, "y":5}] + {"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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "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": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"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}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [5, 9], "x": 9, "y": 5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] } } } -- 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/fleuron/info.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'keyboards/fleuron/info.json') diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index d4bb44cd89..5f98a46967 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -12,6 +12,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { -- 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/fleuron/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/fleuron/info.json') diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index 5f98a46967..c2ff091ace 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Fleuron v1", + "keyboard_name": "Fleuron v1", "manufacturer": "Fleuron", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6060", -- cgit v1.2.3