Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
		
							parent
							
								
									06664e8a94
								
							
						
					
					
						commit
						4869b8061c
					
				
					 589 changed files with 19002 additions and 25368 deletions
				
			
		| 
						 | 
				
			
			@ -1,61 +0,0 @@
 | 
			
		|||
/* Copyright 2020 Yiancar
 | 
			
		||||
 *
 | 
			
		||||
 * 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_ortho_6x4( \
 | 
			
		||||
    K00, K01, K02, K03, \
 | 
			
		||||
    K10, K11, K12, K13, \
 | 
			
		||||
    K20, K21, K22, K23, \
 | 
			
		||||
    K30, K31, K32, K33, \
 | 
			
		||||
    K40, K41, K42, K43, \
 | 
			
		||||
    K50, K51, K52, K53  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { K00, K01, K02, K03 }, \
 | 
			
		||||
    { K10, K11, K12, K13 }, \
 | 
			
		||||
    { K20, K21, K22, K23 }, \
 | 
			
		||||
    { K30, K31, K32, K33 }, \
 | 
			
		||||
    { K40, K41, K42, K43 }, \
 | 
			
		||||
    { K50, K51, K52, K53 }  \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_numpad_6x4( \
 | 
			
		||||
    K00, K01, K02, K03, \
 | 
			
		||||
    K10, K11, K12, K13, \
 | 
			
		||||
    K20, K21, K22,      \
 | 
			
		||||
    K30, K31, K32, K33, \
 | 
			
		||||
    K40, K41, K42,      \
 | 
			
		||||
    K50,      K52, K53  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { K00, K01,   K02, K03   }, \
 | 
			
		||||
    { K10, K11,   K12, K13   }, \
 | 
			
		||||
    { K20, K21,   K22, KC_NO }, \
 | 
			
		||||
    { K30, K31,   K32, K33   }, \
 | 
			
		||||
    { K40, K41,   K42, KC_NO }, \
 | 
			
		||||
    { K50, KC_NO, K52, K53   }  \
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -24,65 +24,65 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT_ortho_6x4": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"0,0", "x":0, "y":0},
 | 
			
		||||
                {"label":"0,1", "x":1, "y":0},
 | 
			
		||||
                {"label":"0,2", "x":2, "y":0},
 | 
			
		||||
                {"label":"0,3", "x":3, "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},
 | 
			
		||||
 | 
			
		||||
                {"label":"1,0", "x":0, "y":1.25},
 | 
			
		||||
                {"label":"1,1", "x":1, "y":1.25},
 | 
			
		||||
                {"label":"1,2", "x":2, "y":1.25},
 | 
			
		||||
                {"label":"1,3", "x":3, "y":1.25},
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1, "y": 1.25},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2, "y": 1.25},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3, "y": 1.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"2,0", "x":0, "y":2.25},
 | 
			
		||||
                {"label":"2,1", "x":1, "y":2.25},
 | 
			
		||||
                {"label":"2,2", "x":2, "y":2.25},
 | 
			
		||||
                {"label":"2,3", "x":3, "y":2.25},
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2.25},
 | 
			
		||||
                {"matrix": [2, 1], "x": 1, "y": 2.25},
 | 
			
		||||
                {"matrix": [2, 2], "x": 2, "y": 2.25},
 | 
			
		||||
                {"matrix": [2, 3], "x": 3, "y": 2.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"3,0", "x":0, "y":3.25},
 | 
			
		||||
                {"label":"3,1", "x":1, "y":3.25},
 | 
			
		||||
                {"label":"3,2", "x":2, "y":3.25},
 | 
			
		||||
                {"label":"3,3", "x":3, "y":3.25},
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3.25},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1, "y": 3.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2, "y": 3.25},
 | 
			
		||||
                {"matrix": [3, 3], "x": 3, "y": 3.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"4,0", "x":0, "y":4.25},
 | 
			
		||||
                {"label":"4,1", "x":1, "y":4.25},
 | 
			
		||||
                {"label":"4,2", "x":2, "y":4.25},
 | 
			
		||||
                {"label":"4,3", "x":3, "y":4.25},
 | 
			
		||||
                {"matrix": [4, 0], "x": 0, "y": 4.25},
 | 
			
		||||
                {"matrix": [4, 1], "x": 1, "y": 4.25},
 | 
			
		||||
                {"matrix": [4, 2], "x": 2, "y": 4.25},
 | 
			
		||||
                {"matrix": [4, 3], "x": 3, "y": 4.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"5,0", "x":0, "y":5.25},
 | 
			
		||||
                {"label":"5,1", "x":1, "y":5.25},
 | 
			
		||||
                {"label":"5,2", "x":2, "y":5.25},
 | 
			
		||||
                {"label":"5,3", "x":3, "y":5.25}
 | 
			
		||||
                {"matrix": [5, 0], "x": 0, "y": 5.25},
 | 
			
		||||
                {"matrix": [5, 1], "x": 1, "y": 5.25},
 | 
			
		||||
                {"matrix": [5, 2], "x": 2, "y": 5.25},
 | 
			
		||||
                {"matrix": [5, 3], "x": 3, "y": 5.25}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_numpad_6x4": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"0,0", "x":0, "y":0},
 | 
			
		||||
                {"label":"0,1", "x":1, "y":0},
 | 
			
		||||
                {"label":"0,2", "x":2, "y":0},
 | 
			
		||||
                {"label":"0,3", "x":3, "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},
 | 
			
		||||
 | 
			
		||||
                {"label":"1,0", "x":0, "y":1.25},
 | 
			
		||||
                {"label":"1,1", "x":1, "y":1.25},
 | 
			
		||||
                {"label":"1,2", "x":2, "y":1.25},
 | 
			
		||||
                {"label":"1,3", "x":3, "y":1.25},
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1, "y": 1.25},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2, "y": 1.25},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3, "y": 1.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"2,0", "x":0, "y":2.25},
 | 
			
		||||
                {"label":"2,1", "x":1, "y":2.25},
 | 
			
		||||
                {"label":"2,2", "x":2, "y":2.25},
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2.25},
 | 
			
		||||
                {"matrix": [2, 1], "x": 1, "y": 2.25},
 | 
			
		||||
                {"matrix": [2, 2], "x": 2, "y": 2.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"3,0", "x":0, "y":3.25},
 | 
			
		||||
                {"label":"3,1", "x":1, "y":3.25},
 | 
			
		||||
                {"label":"3,2", "x":2, "y":3.25},
 | 
			
		||||
                {"label":"3,3", "x":3, "y":2.25, "h":2},
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3.25},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1, "y": 3.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2, "y": 3.25},
 | 
			
		||||
                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
 | 
			
		||||
 | 
			
		||||
                {"label":"4,0", "x":0, "y":4.25},
 | 
			
		||||
                {"label":"4,1", "x":1, "y":4.25},
 | 
			
		||||
                {"label":"4,2", "x":2, "y":4.25},
 | 
			
		||||
                {"matrix": [4, 0], "x": 0, "y": 4.25},
 | 
			
		||||
                {"matrix": [4, 1], "x": 1, "y": 4.25},
 | 
			
		||||
                {"matrix": [4, 2], "x": 2, "y": 4.25},
 | 
			
		||||
 | 
			
		||||
                {"label":"5,0", "x":0, "y":5.25, "w":2},
 | 
			
		||||
                {"label":"5,2", "x":2, "y":5.25},
 | 
			
		||||
                {"label":"5,3", "x":3, "y":4.25, "h":2}
 | 
			
		||||
                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
 | 
			
		||||
                {"matrix": [5, 2], "x": 2, "y": 5.25},
 | 
			
		||||
                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue