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,10 +18,72 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0},
 | 
			
		||||
                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75},
 | 
			
		||||
                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25},
 | 
			
		||||
                {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3}
 | 
			
		||||
                {"matrix": [0, 13], "x": 0, "y": 0},
 | 
			
		||||
                {"matrix": [0, 14], "x": 1, "y": 0},
 | 
			
		||||
                {"matrix": [0, 15], "x": 2, "y": 0},
 | 
			
		||||
                {"matrix": [0, 16], "x": 3, "y": 0},
 | 
			
		||||
                {"matrix": [0, 0], "x": 4, "y": 0},
 | 
			
		||||
                {"matrix": [0, 1], "x": 5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 2], "x": 6, "y": 0},
 | 
			
		||||
                {"matrix": [0, 3], "x": 7, "y": 0},
 | 
			
		||||
                {"matrix": [0, 4], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 5], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 6], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 7], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [0, 8], "x": 12, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 13, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 14, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 15, "y": 0},
 | 
			
		||||
                {"matrix": [0, 12], "x": 16, "y": 0},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [1, 13], "x": 0, "y": 1},
 | 
			
		||||
                {"matrix": [1, 14], "x": 1, "y": 1},
 | 
			
		||||
                {"matrix": [1, 15], "x": 2, "y": 1},
 | 
			
		||||
                {"matrix": [1, 16], "x": 3, "y": 1},
 | 
			
		||||
                {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 5.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 6.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 7.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 8.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 9.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 10.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 11.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 12.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 13.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 10], "x": 14.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 12], "x": 15.25, "y": 1, "w": 1.75},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [2, 13], "x": 0, "y": 2},
 | 
			
		||||
                {"matrix": [2, 14], "x": 1, "y": 2},
 | 
			
		||||
                {"matrix": [2, 15], "x": 2, "y": 2},
 | 
			
		||||
                {"matrix": [2, 16], "x": 3, "y": 2},
 | 
			
		||||
                {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 2], "x": 5.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 6.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 7.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 8.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 9.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 10.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 11.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 12.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 10], "x": 13.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 14.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 1.25},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [3, 13], "x": 0, "y": 3},
 | 
			
		||||
                {"matrix": [3, 14], "x": 1, "y": 3},
 | 
			
		||||
                {"matrix": [3, 15], "x": 2, "y": 3},
 | 
			
		||||
                {"matrix": [3, 16], "x": 3, "y": 3},
 | 
			
		||||
                {"matrix": [3, 0], "x": 4, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 1], "x": 5.25, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 6.5, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 5], "x": 7.75, "y": 3, "w": 1.75},
 | 
			
		||||
                {"matrix": [3, 7], "x": 9.5, "y": 3},
 | 
			
		||||
                {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 2.25},
 | 
			
		||||
                {"matrix": [3, 9], "x": 12.75, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 10], "x": 14, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 15, "y": 3},
 | 
			
		||||
                {"matrix": [3, 12], "x": 16, "y": 3}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,31 +0,0 @@
 | 
			
		|||
/* Copyright 2018 Jack Humbert
 | 
			
		||||
 *
 | 
			
		||||
 * 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( \
 | 
			
		||||
    k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
 | 
			
		||||
    k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
 | 
			
		||||
    k2d, k2e, k2f, k2g, k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
 | 
			
		||||
    k3d, k3e, k3f, k3g, k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c \
 | 
			
		||||
) { \
 | 
			
		||||
    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
 | 
			
		||||
    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
 | 
			
		||||
    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
 | 
			
		||||
    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,10 +18,72 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0},
 | 
			
		||||
                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75},
 | 
			
		||||
                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25},
 | 
			
		||||
                {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3}
 | 
			
		||||
                {"matrix": [0, 13], "x": 0, "y": 0},
 | 
			
		||||
                {"matrix": [0, 14], "x": 1, "y": 0},
 | 
			
		||||
                {"matrix": [0, 15], "x": 2, "y": 0},
 | 
			
		||||
                {"matrix": [0, 16], "x": 3, "y": 0},
 | 
			
		||||
                {"matrix": [0, 0], "x": 4, "y": 0},
 | 
			
		||||
                {"matrix": [0, 1], "x": 5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 2], "x": 6, "y": 0},
 | 
			
		||||
                {"matrix": [0, 3], "x": 7, "y": 0},
 | 
			
		||||
                {"matrix": [0, 4], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 5], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 6], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 7], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [0, 8], "x": 12, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 13, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 14, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 15, "y": 0},
 | 
			
		||||
                {"matrix": [0, 12], "x": 16, "y": 0},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [1, 13], "x": 0, "y": 1},
 | 
			
		||||
                {"matrix": [1, 14], "x": 1, "y": 1},
 | 
			
		||||
                {"matrix": [1, 15], "x": 2, "y": 1},
 | 
			
		||||
                {"matrix": [1, 16], "x": 3, "y": 1},
 | 
			
		||||
                {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 5.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 6.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 7.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 8.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 9.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 10.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 11.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 12.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 13.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 10], "x": 14.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 12], "x": 15.25, "y": 1, "w": 1.75},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [2, 13], "x": 0, "y": 2},
 | 
			
		||||
                {"matrix": [2, 14], "x": 1, "y": 2},
 | 
			
		||||
                {"matrix": [2, 15], "x": 2, "y": 2},
 | 
			
		||||
                {"matrix": [2, 16], "x": 3, "y": 2},
 | 
			
		||||
                {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 2], "x": 5.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 6.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 7.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 8.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 9.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 10.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 11.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 12.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 10], "x": 13.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 14.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 1.25},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [3, 13], "x": 0, "y": 3},
 | 
			
		||||
                {"matrix": [3, 14], "x": 1, "y": 3},
 | 
			
		||||
                {"matrix": [3, 15], "x": 2, "y": 3},
 | 
			
		||||
                {"matrix": [3, 16], "x": 3, "y": 3},
 | 
			
		||||
                {"matrix": [3, 0], "x": 4, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 1], "x": 5.25, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 6.5, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 5], "x": 7.75, "y": 3, "w": 1.75},
 | 
			
		||||
                {"matrix": [3, 7], "x": 9.5, "y": 3},
 | 
			
		||||
                {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 2.25},
 | 
			
		||||
                {"matrix": [3, 9], "x": 12.75, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 10], "x": 14, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 15, "y": 3},
 | 
			
		||||
                {"matrix": [3, 12], "x": 16, "y": 3}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,31 +0,0 @@
 | 
			
		|||
/* Copyright 2021 Terry Mathews
 | 
			
		||||
 *
 | 
			
		||||
 * 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( \
 | 
			
		||||
    k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
 | 
			
		||||
    k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
 | 
			
		||||
    k2d, k2e, k2f, k2g, k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
 | 
			
		||||
    k3d, k3e, k3f, k3g, k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c \
 | 
			
		||||
) { \
 | 
			
		||||
    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
 | 
			
		||||
    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
 | 
			
		||||
    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
 | 
			
		||||
    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,10 +18,73 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
				{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
 | 
			
		||||
				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
 | 
			
		||||
				{"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
 | 
			
		||||
				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
 | 
			
		||||
                {"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},
 | 
			
		||||
                {"matrix": [0, 8], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [0, 12], "x": 12, "y": 0},
 | 
			
		||||
                {"matrix": [0, 13], "x": 13, "y": 0},
 | 
			
		||||
                {"matrix": [0, 14], "x": 14, "y": 0},
 | 
			
		||||
                {"matrix": [0, 15], "x": 15, "y": 0},
 | 
			
		||||
                {"matrix": [0, 16], "x": 16, "y": 0},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 4.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 5.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 6.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 7.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 8.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 9.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 10], "x": 10.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
 | 
			
		||||
                {"matrix": [1, 13], "x": 13, "y": 1},
 | 
			
		||||
                {"matrix": [1, 14], "x": 14, "y": 1},
 | 
			
		||||
                {"matrix": [1, 15], "x": 15, "y": 1},
 | 
			
		||||
                {"matrix": [1, 16], "x": 16, "y": 1},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 2], "x": 1.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 2.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 3.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 4.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 5.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 6.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 7.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 8.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 10], "x": 9.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
 | 
			
		||||
                {"matrix": [2, 12], "x": 12, "y": 2},
 | 
			
		||||
                {"matrix": [2, 13], "x": 13, "y": 2},
 | 
			
		||||
                {"matrix": [2, 14], "x": 14, "y": 2},
 | 
			
		||||
                {"matrix": [2, 15], "x": 15, "y": 2},
 | 
			
		||||
                {"matrix": [2, 16], "x": 16, "y": 2},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 1.75},
 | 
			
		||||
                {"matrix": [3, 7], "x": 5.5, "y": 3},
 | 
			
		||||
                {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 2.25},
 | 
			
		||||
                {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 10], "x": 10, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 11, "y": 3},
 | 
			
		||||
                {"matrix": [3, 12], "x": 12, "y": 3},
 | 
			
		||||
                {"matrix": [3, 13], "x": 13, "y": 3},
 | 
			
		||||
                {"matrix": [3, 14], "x": 14, "y": 3},
 | 
			
		||||
                {"matrix": [3, 15], "x": 15, "y": 3},
 | 
			
		||||
                {"matrix": [3, 16], "x": 16, "y": 3}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,30 +0,0 @@
 | 
			
		|||
/* Copyright 2018 Jack Humbert
 | 
			
		||||
 *
 | 
			
		||||
 * 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, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, k1d, k1e, k1f, k1g, \
 | 
			
		||||
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
 | 
			
		||||
    k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
 | 
			
		||||
) { \
 | 
			
		||||
    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
 | 
			
		||||
    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
 | 
			
		||||
    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
 | 
			
		||||
    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,10 +18,73 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
				{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
 | 
			
		||||
				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
 | 
			
		||||
				{"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
 | 
			
		||||
				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
 | 
			
		||||
                {"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},
 | 
			
		||||
                {"matrix": [0, 8], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [0, 12], "x": 12, "y": 0},
 | 
			
		||||
                {"matrix": [0, 13], "x": 13, "y": 0},
 | 
			
		||||
                {"matrix": [0, 14], "x": 14, "y": 0},
 | 
			
		||||
                {"matrix": [0, 15], "x": 15, "y": 0},
 | 
			
		||||
                {"matrix": [0, 16], "x": 16, "y": 0},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 4.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 5.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 6.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 7.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 8.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 9.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 10], "x": 10.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
 | 
			
		||||
                {"matrix": [1, 13], "x": 13, "y": 1},
 | 
			
		||||
                {"matrix": [1, 14], "x": 14, "y": 1},
 | 
			
		||||
                {"matrix": [1, 15], "x": 15, "y": 1},
 | 
			
		||||
                {"matrix": [1, 16], "x": 16, "y": 1},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 2], "x": 1.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 2.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 3.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 4.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 5.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 6.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 7.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 8.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 10], "x": 9.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
 | 
			
		||||
                {"matrix": [2, 12], "x": 12, "y": 2},
 | 
			
		||||
                {"matrix": [2, 13], "x": 13, "y": 2},
 | 
			
		||||
                {"matrix": [2, 14], "x": 14, "y": 2},
 | 
			
		||||
                {"matrix": [2, 15], "x": 15, "y": 2},
 | 
			
		||||
                {"matrix": [2, 16], "x": 16, "y": 2},
 | 
			
		||||
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 1.75},
 | 
			
		||||
                {"matrix": [3, 7], "x": 5.5, "y": 3},
 | 
			
		||||
                {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 2.25},
 | 
			
		||||
                {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 1.25},
 | 
			
		||||
                {"matrix": [3, 10], "x": 10, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 11, "y": 3},
 | 
			
		||||
                {"matrix": [3, 12], "x": 12, "y": 3},
 | 
			
		||||
                {"matrix": [3, 13], "x": 13, "y": 3},
 | 
			
		||||
                {"matrix": [3, 14], "x": 14, "y": 3},
 | 
			
		||||
                {"matrix": [3, 15], "x": 15, "y": 3},
 | 
			
		||||
                {"matrix": [3, 16], "x": 16, "y": 3}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,30 +0,0 @@
 | 
			
		|||
/* Copyright 2021 Terry Mathews
 | 
			
		||||
 *
 | 
			
		||||
 * 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, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, k1d, k1e, k1f, k1g, \
 | 
			
		||||
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
 | 
			
		||||
    k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
 | 
			
		||||
) { \
 | 
			
		||||
    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
 | 
			
		||||
    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
 | 
			
		||||
    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
 | 
			
		||||
    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue