Move single LAYOUT_alls to data driven (#20430)
				
					
				
			This commit is contained in:
		
							parent
							
								
									a84528f853
								
							
						
					
					
						commit
						172a40686b
					
				
					 523 changed files with 18787 additions and 20535 deletions
				
			
		| 
						 | 
				
			
			@ -26,191 +26,46 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT_all": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Q",
 | 
			
		||||
                    "x": 0.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "W",
 | 
			
		||||
                    "x": 1.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "E",
 | 
			
		||||
                    "x": 2.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "R",
 | 
			
		||||
                    "x": 3.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "T",
 | 
			
		||||
                    "x": 4.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Y",
 | 
			
		||||
                    "x": 5.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "U",
 | 
			
		||||
                    "x": 6.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "I",
 | 
			
		||||
                    "x": 7.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "O",
 | 
			
		||||
                    "x": 8.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "P",
 | 
			
		||||
                    "x": 9.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "BS",
 | 
			
		||||
                    "x": 10.5,
 | 
			
		||||
                    "y": 0
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "A",
 | 
			
		||||
                    "x": 0.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "S",
 | 
			
		||||
                    "x": 1.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "D",
 | 
			
		||||
                    "x": 2.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "F",
 | 
			
		||||
                    "x": 3.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "G",
 | 
			
		||||
                    "x": 4.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "H",
 | 
			
		||||
                    "x": 5.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "J",
 | 
			
		||||
                    "x": 6.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "K",
 | 
			
		||||
                    "x": 7.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "L",
 | 
			
		||||
                    "x": 8.75,
 | 
			
		||||
                    "y": 1
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Enter",
 | 
			
		||||
                    "x": 9.75,
 | 
			
		||||
                    "y": 1,
 | 
			
		||||
                    "w": 1.75
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Z",
 | 
			
		||||
                    "x": 1.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "X",
 | 
			
		||||
                    "x": 2.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "C",
 | 
			
		||||
                    "x": 3.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "V",
 | 
			
		||||
                    "x": 4.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "B",
 | 
			
		||||
                    "x": 5.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "N",
 | 
			
		||||
                    "x": 6.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "M",
 | 
			
		||||
                    "x": 7.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "<",
 | 
			
		||||
                    "x": 8.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": ">",
 | 
			
		||||
                    "x": 9.25,
 | 
			
		||||
                    "y": 2
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "?",
 | 
			
		||||
                    "x": 10.25,
 | 
			
		||||
                    "y": 2,
 | 
			
		||||
                    "w": 1.25
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "",
 | 
			
		||||
                    "x": 0,
 | 
			
		||||
                    "y": 3
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Alt",
 | 
			
		||||
                    "x": 1.5,
 | 
			
		||||
                    "y": 3,
 | 
			
		||||
                    "w": 1.25
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "",
 | 
			
		||||
                    "x": 2.75,
 | 
			
		||||
                    "y": 3,
 | 
			
		||||
                    "w": 6.25
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Fn1",
 | 
			
		||||
                    "x": 9,
 | 
			
		||||
                    "y": 3
 | 
			
		||||
                },
 | 
			
		||||
                {
 | 
			
		||||
                    "label": "Ctrl",
 | 
			
		||||
                    "x": 10,
 | 
			
		||||
                    "y": 3,
 | 
			
		||||
                    "w": 1.5
 | 
			
		||||
                }
 | 
			
		||||
                {"matrix": [4, 4], "x": 0.5, "y": 0},
 | 
			
		||||
                {"matrix": [4, 3], "x": 1.5, "y": 0},
 | 
			
		||||
                {"matrix": [4, 2], "x": 2.5, "y": 0},
 | 
			
		||||
                {"matrix": [4, 1], "x": 3.5, "y": 0},
 | 
			
		||||
                {"matrix": [4, 0], "x": 4.5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 4], "x": 5.5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 3], "x": 6.5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 2], "x": 7.5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 1], "x": 8.5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 0], "x": 9.5, "y": 0},
 | 
			
		||||
                {"matrix": [3, 0], "x": 10.5, "y": 0},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [5, 4], "x": 0.75, "y": 1},
 | 
			
		||||
                {"matrix": [5, 3], "x": 1.75, "y": 1},
 | 
			
		||||
                {"matrix": [5, 2], "x": 2.75, "y": 1},
 | 
			
		||||
                {"matrix": [5, 1], "x": 3.75, "y": 1},
 | 
			
		||||
                {"matrix": [5, 0], "x": 4.75, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 5.75, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 6.75, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 7.75, "y": 1},
 | 
			
		||||
                {"matrix": [1, 1], "x": 8.75, "y": 1},
 | 
			
		||||
                {"matrix": [1, 0], "x": 9.75, "y": 1, "w": 1.75},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [6, 4], "x": 1.25, "y": 2},
 | 
			
		||||
                {"matrix": [6, 3], "x": 2.25, "y": 2},
 | 
			
		||||
                {"matrix": [6, 2], "x": 3.25, "y": 2},
 | 
			
		||||
                {"matrix": [6, 1], "x": 4.25, "y": 2},
 | 
			
		||||
                {"matrix": [6, 0], "x": 5.25, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 6.25, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 7.25, "y": 2},
 | 
			
		||||
                {"matrix": [2, 2], "x": 8.25, "y": 2},
 | 
			
		||||
                {"matrix": [2, 1], "x": 9.25, "y": 2},
 | 
			
		||||
                {"matrix": [2, 0], "x": 10.25, "y": 2, "w": 1.25},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [7, 4], "x": 0, "y": 3},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [3, 4], "x": 1.5, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 6.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 9, "y": 3},
 | 
			
		||||
                {"matrix": [3, 1], "x": 10, "y": 3, "w": 1.5}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@
 | 
			
		|||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "leftover30.h"
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
// Optional override functions below.
 | 
			
		||||
// You can leave any or all of these undefined.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,45 +0,0 @@
 | 
			
		|||
/* Copyright 2020 marksard
 | 
			
		||||
 *
 | 
			
		||||
 * 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 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_all( \
 | 
			
		||||
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,\
 | 
			
		||||
     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\
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k09,   k08,   k07,   k06,   k05 }, \
 | 
			
		||||
    { k19,   k18,   k17,   k16,   k15 }, \
 | 
			
		||||
    { k29,   k28,   k27,   k26,   k25 }, \
 | 
			
		||||
    { k0a,   k34,   k33,   k32,   k31 }, \
 | 
			
		||||
\
 | 
			
		||||
    { k04,   k03,   k02,   k01,   k00 }, \
 | 
			
		||||
    { k14,   k13,   k12,   k11,   k10 }, \
 | 
			
		||||
    { k24,   k23,   k22,   k21,   k20 }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, k30 } \
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue