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/foostan/cornelius/cornelius.h | 40 ------------ keyboards/foostan/cornelius/info.json | 109 +++++++++++++++++--------------- 2 files changed, 58 insertions(+), 91 deletions(-) delete mode 100644 keyboards/foostan/cornelius/cornelius.h (limited to 'keyboards/foostan/cornelius') diff --git a/keyboards/foostan/cornelius/cornelius.h b/keyboards/foostan/cornelius/cornelius.h deleted file mode 100644 index c9b63ee32c..0000000000 --- a/keyboards/foostan/cornelius/cornelius.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 foostan - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 } \ -} diff --git a/keyboards/foostan/cornelius/info.json b/keyboards/foostan/cornelius/info.json index b5613fe44c..542f7cb3e0 100644 --- a/keyboards/foostan/cornelius/info.json +++ b/keyboards/foostan/cornelius/info.json @@ -15,57 +15,64 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts":{ - "LAYOUT":{ - "layout":[ - {"label":"Tab", "x":0,"y":0.625}, - {"label":"Q", "x":1,"y":0.625}, - {"label":"W", "x":2,"y":0.25}, - {"label":"E", "x":3,"y":0}, - {"label":"R", "x":4,"y":0.125}, - {"label":"T", "x":5,"y":0.25}, - {"label":"Y", "x":8,"y":0.25}, - {"label":"U", "x":9,"y":0.125}, - {"label":"I", "x":10,"y":0}, - {"label":"O", "x":11,"y":0.25}, - {"label":"P", "x":12,"y":0.625}, - {"label":"Bksp", "x":13,"y":0.625}, - {"label":"Esc", "x":0,"y":1.625}, - {"label":"A", "x":1,"y":1.625}, - {"label":"S", "x":2,"y":1.25}, - {"label":"D", "x":3,"y":1}, - {"label":"F", "x":4,"y":1.125}, - {"label":"G", "x":5,"y":1.25}, - {"label":"H", "x":8,"y":1.25}, - {"label":"J", "x":9,"y":1.125}, - {"label":"K", "x":10,"y":1}, - {"label":"L", "x":11,"y":1.25}, - {"label":":", "x":12,"y":1.625}, - {"label":"\"", "x":13,"y":1.625}, - {"label":"Shift", "x":0,"y":2.625}, - {"label":"Z", "x":1,"y":2.625}, - {"label":"X", "x":2,"y":2.25}, - {"label":"C", "x":3,"y":2}, - {"label":"V", "x":4,"y":2.125}, - {"label":"B", "x":5,"y":2.25}, - {"label":"N", "x":8,"y":2.25}, - {"label":"M", "x":9,"y":2.125}, - {"label":"<", "x":10,"y":2}, - {"label":">", "x":11,"y":2.25}, - {"label":"?", "x":12,"y":2.625}, - {"label":"Shift", "x":13,"y":2.625}, - {"label":"Fn", "x":0,"y":3.625}, - {"label":"Ctrl", "x":1,"y":3.625}, - {"label":"Win", "x":2,"y":3.25}, - {"label":"Alt", "x":3.5,"y":3.25}, - {"label":"Lower", "x":4.5,"y":3.5}, - {"x":5.5,"y":3.75}, - {"x":7.5,"y":3.75}, - {"label":"Raise", "x":8.5,"y":3.5}, - {"label":"Alt", "x":9.5,"y":3.25}, - {"label":"Win", "x":11,"y":3.25}, - {"label":"Ctrl", "x":12,"y":3.625}, - {"label":"Fn", "x":13,"y":3.625} + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.625}, + {"matrix": [0, 1], "x": 1, "y": 0.625}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [0, 6], "x": 8, "y": 0.25}, + {"matrix": [0, 7], "x": 9, "y": 0.125}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.25}, + {"matrix": [0, 10], "x": 12, "y": 0.625}, + {"matrix": [0, 11], "x": 13, "y": 0.625}, + + {"matrix": [1, 0], "x": 0, "y": 1.625}, + {"matrix": [1, 1], "x": 1, "y": 1.625}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1.125}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.25}, + {"matrix": [1, 10], "x": 12, "y": 1.625}, + {"matrix": [1, 11], "x": 13, "y": 1.625}, + + {"matrix": [2, 0], "x": 0, "y": 2.625}, + {"matrix": [2, 1], "x": 1, "y": 2.625}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [2, 6], "x": 8, "y": 2.25}, + {"matrix": [2, 7], "x": 9, "y": 2.125}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.25}, + {"matrix": [2, 10], "x": 12, "y": 2.625}, + {"matrix": [2, 11], "x": 13, "y": 2.625}, + + {"matrix": [3, 0], "x": 0, "y": 3.625}, + {"matrix": [3, 1], "x": 1, "y": 3.625}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75}, + + {"matrix": [3, 6], "x": 7.5, "y": 3.75}, + {"matrix": [3, 7], "x": 8.5, "y": 3.5}, + {"matrix": [3, 8], "x": 9.5, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3.25}, + {"matrix": [3, 10], "x": 12, "y": 3.625}, + {"matrix": [3, 11], "x": 13, "y": 3.625} ] } } -- cgit v1.2.3