Move single LAYOUT_alls to data driven (#20430)

This commit is contained in:
Ryan 2023-04-15 21:08:15 +10:00 committed by GitHub
parent a84528f853
commit 172a40686b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
523 changed files with 18787 additions and 20535 deletions

View file

@ -27,121 +27,137 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"label":"Fn", "x":0, "y":0},
{"label":"PrtSc", "x":1, "y":0},
{"label":"Scroll Lock", "x":2, "y":0},
{"label":"Pause", "x":3, "y":0},
{"label":"Esc", "x":4.5, "y":0},
{"label":"F1", "x":6, "y":0},
{"label":"F2", "x":7, "y":0},
{"label":"F3", "x":8, "y":0},
{"label":"F4", "x":9, "y":0},
{"label":"F5", "x":10.25, "y":0},
{"label":"F6", "x":11.25, "y":0},
{"label":"F7", "x":12.25, "y":0},
{"label":"F8", "x":13.25, "y":0},
{"label":"F9", "x":14.5, "y":0},
{"label":"F10", "x":15.5, "y":0},
{"label":"F11", "x":16.5, "y":0},
{"label":"F12", "x":17.5, "y":0},
{"label":"Home", "x":19, "y":0},
{"label":"PgUp", "x":20, "y":0},
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [1, 1], "x": 3, "y": 0},
{"label":"-", "x":0, "y":1.5},
{"label":"*", "x":1, "y":1.5},
{"label":"/", "x":2, "y":1.5},
{"label":"Num Lock", "x":3, "y":1.5},
{"label":"~", "x":4.5, "y":1.5},
{"label":"!", "x":5.5, "y":1.5},
{"label":"\"", "x":6.5, "y":1.5},
{"label":"\u00a3", "x":7.5, "y":1.5},
{"label":"$", "x":8.5, "y":1.5},
{"label":"%", "x":9.5, "y":1.5},
{"label":"^", "x":10.5, "y":1.5},
{"label":"&", "x":11.5, "y":1.5},
{"label":"*", "x":12.5, "y":1.5},
{"label":"(", "x":13.5, "y":1.5},
{"label":")", "x":14.5, "y":1.5},
{"label":"_", "x":15.5, "y":1.5},
{"label":"+", "x":16.5, "y":1.5},
{"label":"Backspace", "x":17.5, "y":1.5},
{"label":"Backspace", "x":18.5, "y":1.5},
{"label":"Insert", "x":20, "y":1.5},
{"matrix": [0, 2], "x": 4.5, "y": 0},
{"label":"+", "x":0, "y":2.5},
{"label":"9", "x":1, "y":2.5},
{"label":"8", "x":2, "y":2.5},
{"label":"7", "x":3, "y":2.5},
{"label":"Tab", "x":4.5, "y":2.5, "w":1.5},
{"label":"Q", "x":6, "y":2.5},
{"label":"W", "x":7, "y":2.5},
{"label":"E", "x":8, "y":2.5},
{"label":"R", "x":9, "y":2.5},
{"label":"T", "x":10, "y":2.5},
{"label":"Y", "x":11, "y":2.5},
{"label":"U", "x":12, "y":2.5},
{"label":"I", "x":13, "y":2.5},
{"label":"O", "x":14, "y":2.5},
{"label":"P", "x":15, "y":2.5},
{"label":"{", "x":16, "y":2.5},
{"label":"}", "x":17, "y":2.5},
{"label":"Backslash", "x":18, "y":2.5, "w":1.5},
{"label":"Delete", "x":20, "y":2.5},
{"matrix": [1, 2], "x": 6, "y": 0},
{"matrix": [0, 3], "x": 7, "y": 0},
{"matrix": [1, 3], "x": 8, "y": 0},
{"matrix": [0, 4], "x": 9, "y": 0},
{"label":"+", "x":0, "y":3.5},
{"label":"6", "x":1, "y":3.5},
{"label":"5", "x":2, "y":3.5},
{"label":"4", "x":3, "y":3.5},
{"label":"CAPS", "x":4.5, "y":3.5, "w":1.25},
{"label":"A", "x":6.25, "y":3.5},
{"label":"S", "x":7.25, "y":3.5},
{"label":"D", "x":8.25, "y":3.5},
{"label":"F", "x":9.25, "y":3.5},
{"label":"G", "x":10.25, "y":3.5},
{"label":"H", "x":11.25, "y":3.5},
{"label":"J", "x":12.25, "y":3.5},
{"label":"K", "x":13.25, "y":3.5},
{"label":"L", "x":14.25, "y":3.5},
{"label":":", "x":15.25, "y":3.5},
{"label":"@", "x":16.25, "y":3.5},
{"label":"|", "x":17.25, "y":3.5},
{"label":"Enter", "x":18.25, "y":3.5, "w":1.25},
{"label":"PgDn", "x":20, "y":3.5},
{"matrix": [1, 4], "x": 10.25, "y": 0},
{"matrix": [1, 5], "x": 11.25, "y": 0},
{"matrix": [0, 5], "x": 12.25, "y": 0},
{"matrix": [0, 6], "x": 13.25, "y": 0},
{"label":"Enter", "x":0, "y":4.5},
{"label":"3", "x":1, "y":4.5},
{"label":"2", "x":2, "y":4.5},
{"label":"1", "x":3, "y":4.5},
{"label":"Shift", "x":4.5, "y":4.5, "w":1.25},
{"label":"|", "x":5.75, "y":4.5},
{"label":"Z", "x":6.75, "y":4.5},
{"label":"X", "x":7.75, "y":4.5},
{"label":"C", "x":8.75, "y":4.5},
{"label":"V", "x":9.75, "y":4.5},
{"label":"B", "x":10.75, "y":4.5},
{"label":"N", "x":11.75, "y":4.5},
{"label":"M", "x":12.75, "y":4.5},
{"label":"<", "x":13.75, "y":4.5},
{"label":">", "x":14.75, "y":4.5},
{"label":"?", "x":15.75, "y":4.5},
{"label":"Shift", "x":16.75, "y":4.5, "w":1.75},
{"label":"\u2191", "x":18.75, "y":4.75},
{"label":"End", "x":20, "y":4.5},
{"matrix": [1, 6], "x": 14.5, "y": 0},
{"matrix": [0, 7], "x": 15.5, "y": 0},
{"matrix": [1, 7], "x": 16.5, "y": 0},
{"matrix": [0, 8], "x": 17.5, "y": 0},
{"label":"Enter", "x":0, "y":5.5},
{"label":".", "x":1, "y":5.5},
{"label":",", "x":2, "y":5.5},
{"label":"0", "x":3, "y":5.5},
{"label":"Ctrl", "x":4.5, "y":5.5, "w":1.25},
{"label":"Win", "x":5.75, "y":5.5},
{"label":"Alt", "x":6.75, "y":5.5, "w":1.25},
{"label":"Space", "x":8, "y":5.5, "w":6.25},
{"label":"AltGr", "x":14.25, "y":5.5},
{"label":"Menu", "x":15.25, "y":5.5},
{"label":"Ctrl", "x":16.25, "y":5.5, "w":1.25},
{"label":"\u2190", "x":17.75, "y":5.75},
{"label":"\u2193", "x":18.75, "y":5.75},
{"label":"\u2192", "x":19.75, "y":5.75}
{"matrix": [1, 8], "x": 19, "y": 0},
{"matrix": [0, 9], "x": 20, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1.5},
{"matrix": [3, 0], "x": 1, "y": 1.5},
{"matrix": [2, 1], "x": 2, "y": 1.5},
{"matrix": [3, 1], "x": 3, "y": 1.5},
{"matrix": [2, 2], "x": 4.5, "y": 1.5},
{"matrix": [3, 2], "x": 5.5, "y": 1.5},
{"matrix": [2, 3], "x": 6.5, "y": 1.5},
{"matrix": [3, 3], "x": 7.5, "y": 1.5},
{"matrix": [2, 4], "x": 8.5, "y": 1.5},
{"matrix": [3, 4], "x": 9.5, "y": 1.5},
{"matrix": [3, 5], "x": 10.5, "y": 1.5},
{"matrix": [2, 5], "x": 11.5, "y": 1.5},
{"matrix": [2, 6], "x": 12.5, "y": 1.5},
{"matrix": [3, 6], "x": 13.5, "y": 1.5},
{"matrix": [2, 7], "x": 14.5, "y": 1.5},
{"matrix": [3, 7], "x": 15.5, "y": 1.5},
{"matrix": [2, 8], "x": 16.5, "y": 1.5},
{"matrix": [1, 9], "x": 17.5, "y": 1.5},
{"matrix": [3, 8], "x": 18.5, "y": 1.5},
{"matrix": [2, 9], "x": 20, "y": 1.5},
{"matrix": [4, 0], "x": 0, "y": 2.5},
{"matrix": [5, 0], "x": 1, "y": 2.5},
{"matrix": [4, 1], "x": 2, "y": 2.5},
{"matrix": [5, 1], "x": 3, "y": 2.5},
{"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5},
{"matrix": [5, 2], "x": 6, "y": 2.5},
{"matrix": [4, 3], "x": 7, "y": 2.5},
{"matrix": [5, 3], "x": 8, "y": 2.5},
{"matrix": [4, 4], "x": 9, "y": 2.5},
{"matrix": [5, 4], "x": 10, "y": 2.5},
{"matrix": [5, 5], "x": 11, "y": 2.5},
{"matrix": [4, 5], "x": 12, "y": 2.5},
{"matrix": [4, 6], "x": 13, "y": 2.5},
{"matrix": [5, 6], "x": 14, "y": 2.5},
{"matrix": [4, 7], "x": 15, "y": 2.5},
{"matrix": [5, 7], "x": 16, "y": 2.5},
{"matrix": [4, 8], "x": 17, "y": 2.5},
{"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5},
{"matrix": [4, 9], "x": 20, "y": 2.5},
{"matrix": [6, 0], "x": 0, "y": 3.5},
{"matrix": [7, 0], "x": 1, "y": 3.5},
{"matrix": [6, 1], "x": 2, "y": 3.5},
{"matrix": [7, 1], "x": 3, "y": 3.5},
{"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.25},
{"matrix": [7, 2], "x": 6.25, "y": 3.5},
{"matrix": [6, 3], "x": 7.25, "y": 3.5},
{"matrix": [7, 3], "x": 8.25, "y": 3.5},
{"matrix": [6, 4], "x": 9.25, "y": 3.5},
{"matrix": [7, 4], "x": 10.25, "y": 3.5},
{"matrix": [7, 5], "x": 11.25, "y": 3.5},
{"matrix": [6, 5], "x": 12.25, "y": 3.5},
{"matrix": [6, 6], "x": 13.25, "y": 3.5},
{"matrix": [7, 6], "x": 14.25, "y": 3.5},
{"matrix": [6, 7], "x": 15.25, "y": 3.5},
{"matrix": [7, 7], "x": 16.25, "y": 3.5},
{"matrix": [6, 8], "x": 17.25, "y": 3.5},
{"matrix": [7, 8], "x": 18.25, "y": 3.5, "w": 1.25},
{"matrix": [6, 9], "x": 20, "y": 3.5},
{"matrix": [3, 9], "x": 0, "y": 4.5},
{"matrix": [9, 0], "x": 1, "y": 4.5},
{"matrix": [8, 1], "x": 2, "y": 4.5},
{"matrix": [9, 1], "x": 3, "y": 4.5},
{"matrix": [8, 2], "x": 4.5, "y": 4.5, "w": 1.25},
{"matrix": [9, 2], "x": 5.75, "y": 4.5},
{"matrix": [8, 3], "x": 6.75, "y": 4.5},
{"matrix": [9, 3], "x": 7.75, "y": 4.5},
{"matrix": [8, 4], "x": 8.75, "y": 4.5},
{"matrix": [9, 4], "x": 9.75, "y": 4.5},
{"matrix": [9, 5], "x": 10.75, "y": 4.5},
{"matrix": [8, 5], "x": 11.75, "y": 4.5},
{"matrix": [8, 6], "x": 12.75, "y": 4.5},
{"matrix": [9, 6], "x": 13.75, "y": 4.5},
{"matrix": [8, 7], "x": 14.75, "y": 4.5},
{"matrix": [9, 7], "x": 15.75, "y": 4.5},
{"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75},
{"matrix": [9, 8], "x": 18.75, "y": 4.75},
{"matrix": [8, 9], "x": 20, "y": 4.5},
{"matrix": [8, 0], "x": 0, "y": 5.5},
{"matrix": [10, 0], "x": 1, "y": 5.5},
{"matrix": [5, 9], "x": 2, "y": 5.5},
{"matrix": [10, 1], "x": 3, "y": 5.5},
{"matrix": [10, 2], "x": 4.5, "y": 5.5, "w": 1.25},
{"matrix": [10, 3], "x": 5.75, "y": 5.5},
{"matrix": [10, 4], "x": 6.75, "y": 5.5, "w": 1.25},
{"matrix": [10, 5], "x": 8, "y": 5.5, "w": 6.25},
{"matrix": [10, 6], "x": 14.25, "y": 5.5},
{"matrix": [10, 7], "x": 15.25, "y": 5.5},
{"matrix": [10, 8], "x": 16.25, "y": 5.5, "w": 1.25},
{"matrix": [10, 9], "x": 17.75, "y": 5.75},
{"matrix": [9, 9], "x": 18.75, "y": 5.75},
{"matrix": [7, 9], "x": 19.75, "y": 5.75}
]
}
}

View file

@ -1,66 +0,0 @@
/* Copyright 2021 cest73
*
* 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 first section contains "names" for physical keys of the keyboard
* and defines their position on the board.
* The second section defines position of the keys on the switch matrix
* (where COLUMNS and ROWS crosses).
This looks so much better in an terminal window :-(*/
/*
* 
* Fn PScScrPse Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12 HmePgU
*   
*
*   
*  -  *  / Num  `  1  2  3  4  5  6  7  8  9  0  -  = BslBsp Ins
*   
*  +  9  8  7   Tab  Q  W  E  R  T  Y  U  I  O  P  [  ]   \   Del
*   
*  =  6  5  4   Caps  A  S  D  F  G  H  J  K  L  ;  ' Etl Ent PgD
*   
* Tab 3  2  1  ShftShl Z  X  C  V  B  N  M  ,  .  /  ShiftEnd
*    
* Ent .  ,  0  CtrlGUIAlt                         AltMnuCtrl
*        
*
*/
// due to a nasty PCB layout bug the R1.03 board has "6" and "7" keyboard coulmns swapped...
#define LAYOUT_all( \
k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k15, k05, k06, k16, k07, k17, k08, k18, k09, \
\
k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k35, k25, k26, k36, k27, k37, k28, k19, k38, k29, \
k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k55, k45, k46, k56, k47, k57, k48, k58, k49, \
k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k75, k65, k66, k76, k67, k77, k68, k78, k69, \
k39, k90, k81, k91, k82, k92, k83, k93, k84, k94, k95, k85, k86, k96, k87, k97, k88, k98, k89, \
k80, kA0, k59, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, k99, k79 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
{ k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
{ k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
{ k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
{ k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
{ k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \
{ kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9 } \
}