diff options
author | Ryan <fauxpark@gmail.com> | 2023-03-29 15:54:34 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-29 15:54:34 +1100 |
commit | 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 (patch) | |
tree | 085ba6c614b0cc649a664b6e9e8829ee6f1fe593 /keyboards/fleuron | |
parent | 06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff) |
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/fleuron')
-rw-r--r-- | keyboards/fleuron/fleuron.h | 41 | ||||
-rw-r--r-- | keyboards/fleuron/info.json | 201 |
2 files changed, 105 insertions, 137 deletions
diff --git a/keyboards/fleuron/fleuron.h b/keyboards/fleuron/fleuron.h deleted file mode 100644 index 38f6bb38bf..0000000000 --- a/keyboards/fleuron/fleuron.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 James Underwood - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_ortho_6x16( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F } \ -} - -#define LAYOUT_fleuron_grid LAYOUT_ortho_6x16 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} + ] } } } |