Move single LAYOUTs to data driven (#20365)
				
					
				
			This commit is contained in:
		
							parent
							
								
									941e159a28
								
							
						
					
					
						commit
						5bd68e3695
					
				
					 1443 changed files with 45214 additions and 59923 deletions
				
			
		| 
						 | 
				
			
			@ -18,59 +18,59 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"x":0, "y":0},
 | 
			
		||||
                {"x":1, "y":0},
 | 
			
		||||
                {"x":2, "y":0},
 | 
			
		||||
                {"x":3, "y":0},
 | 
			
		||||
                {"x":4, "y":0},
 | 
			
		||||
                {"x":5, "y":0},
 | 
			
		||||
                {"x":6, "y":0},
 | 
			
		||||
                {"x":7, "y":0},
 | 
			
		||||
                {"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},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":1},
 | 
			
		||||
                {"x":1, "y":1},
 | 
			
		||||
                {"x":2, "y":1},
 | 
			
		||||
                {"x":3, "y":1},
 | 
			
		||||
                {"x":4, "y":1},
 | 
			
		||||
                {"x":5, "y":1},
 | 
			
		||||
                {"x":6, "y":1},
 | 
			
		||||
                {"x":7, "y":1},
 | 
			
		||||
                {"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},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":2, "w":1.5},
 | 
			
		||||
                {"x":1.5, "y":2},
 | 
			
		||||
                {"x":2.5, "y":2},
 | 
			
		||||
                {"x":3.5, "y":2},
 | 
			
		||||
                {"x":4.5, "y":2},
 | 
			
		||||
                {"x":5.5, "y":2},
 | 
			
		||||
                {"x":6.5, "y":2},
 | 
			
		||||
                {"x":7.5, "y":2},
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
 | 
			
		||||
                {"matrix": [2, 1], "x": 1.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 2], "x": 2.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 3.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 4.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 5.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 6.5, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 7.5, "y": 2},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":3, "w":1.75},
 | 
			
		||||
                {"x":1.75, "y":3},
 | 
			
		||||
                {"x":2.75, "y":3},
 | 
			
		||||
                {"x":3.75, "y":3},
 | 
			
		||||
                {"x":4.75, "y":3},
 | 
			
		||||
                {"x":5.75, "y":3},
 | 
			
		||||
                {"x":6.75, "y":3},
 | 
			
		||||
                {"x":7.75, "y":3},
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 3], "x": 3.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 4], "x": 4.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 5], "x": 5.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 6], "x": 6.75, "y": 3},
 | 
			
		||||
                {"matrix": [3, 7], "x": 7.75, "y": 3},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":4, "w":2.25},
 | 
			
		||||
                {"x":2.25, "y":4},
 | 
			
		||||
                {"x":3.25, "y":4},
 | 
			
		||||
                {"x":4.25, "y":4},
 | 
			
		||||
                {"x":5.25, "y":4},
 | 
			
		||||
                {"x":6.25, "y":4},
 | 
			
		||||
                {"x":7.25, "y":4},
 | 
			
		||||
                {"x":8.25, "y":4},
 | 
			
		||||
                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
 | 
			
		||||
                {"matrix": [4, 1], "x": 2.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 2], "x": 3.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 3], "x": 4.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 4], "x": 5.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 5], "x": 6.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 6], "x": 7.25, "y": 4},
 | 
			
		||||
                {"matrix": [4, 7], "x": 8.25, "y": 4},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":5, "w":1.5},
 | 
			
		||||
                {"x":1.5, "y":5},
 | 
			
		||||
                {"x":2.5, "y":5},
 | 
			
		||||
                {"x":3.5, "y":5, "w":1.25},
 | 
			
		||||
                {"x":4.75, "y":5, "w":2.25},
 | 
			
		||||
                {"x":7, "y":5},
 | 
			
		||||
                {"x":8, "y":5},
 | 
			
		||||
                {"x":9, "y":5}
 | 
			
		||||
                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
 | 
			
		||||
                {"matrix": [5, 1], "x": 1.5, "y": 5},
 | 
			
		||||
                {"matrix": [5, 2], "x": 2.5, "y": 5},
 | 
			
		||||
                {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
 | 
			
		||||
                {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2.25},
 | 
			
		||||
                {"matrix": [5, 5], "x": 7, "y": 5},
 | 
			
		||||
                {"matrix": [5, 6], "x": 8, "y": 5},
 | 
			
		||||
                {"matrix": [5, 7], "x": 9, "y": 5}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,37 +0,0 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2020 Ckat <ckat@teknik.io>
 | 
			
		||||
 | 
			
		||||
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"
 | 
			
		||||
 | 
			
		||||
#define LAYOUT( \
 | 
			
		||||
    k00, k06, k12, k18, k24, k30, k36, k42, \
 | 
			
		||||
    k01, k07, k13, k19, k25, k31, k37, k43, \
 | 
			
		||||
    k02, k08, k14, k20, k26, k32, k38, k44, \
 | 
			
		||||
    k03, k09, k15, k21, k27, k33, k39, k45, \
 | 
			
		||||
    k04, k10, k16, k22, k28, k34, k40, k46, \
 | 
			
		||||
    k05, k11, k17, k23, k29, k35, k41, k47 \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k06, k12, k18, k24, k30, k36, k42 }, \
 | 
			
		||||
    { k01, k07, k13, k19, k25, k31, k37, k43 }, \
 | 
			
		||||
    { k02, k08, k14, k20, k26, k32, k38, k44 }, \
 | 
			
		||||
    { k03, k09, k15, k21, k27, k33, k39, k45 }, \
 | 
			
		||||
    { k04, k10, k16, k22, k28, k34, k40, k46 }, \
 | 
			
		||||
    { k05, k11, k17, k23, k29, k35, k41, k47 } \
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue