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
				
			
		| 
						 | 
				
			
			@ -23,30 +23,30 @@
 | 
			
		|||
  "layouts": {
 | 
			
		||||
    "LAYOUT_ortho_5x4": {
 | 
			
		||||
        "layout": [
 | 
			
		||||
            {"x":0, "y":0},
 | 
			
		||||
            {"x":1, "y":0},
 | 
			
		||||
            {"x":2, "y":0},
 | 
			
		||||
            {"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},
 | 
			
		||||
 | 
			
		||||
            {"x":0, "y":1},
 | 
			
		||||
            {"x":1, "y":1},
 | 
			
		||||
            {"x":2, "y":1},
 | 
			
		||||
            {"x":3, "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},
 | 
			
		||||
 | 
			
		||||
            {"x":0, "y":2},
 | 
			
		||||
            {"x":1, "y":2},
 | 
			
		||||
            {"x":2, "y":2},
 | 
			
		||||
            {"x":3, "y":2},
 | 
			
		||||
            {"matrix": [2, 0], "x": 0, "y": 2},
 | 
			
		||||
            {"matrix": [2, 1], "x": 1, "y": 2},
 | 
			
		||||
            {"matrix": [2, 2], "x": 2, "y": 2},
 | 
			
		||||
            {"matrix": [2, 3], "x": 3, "y": 2},
 | 
			
		||||
 | 
			
		||||
            {"x":0, "y":3},
 | 
			
		||||
            {"x":1, "y":3},
 | 
			
		||||
            {"x":2, "y":3},
 | 
			
		||||
            {"x":3, "y":3},
 | 
			
		||||
            {"matrix": [3, 0], "x": 0, "y": 3},
 | 
			
		||||
            {"matrix": [3, 1], "x": 1, "y": 3},
 | 
			
		||||
            {"matrix": [3, 2], "x": 2, "y": 3},
 | 
			
		||||
            {"matrix": [3, 3], "x": 3, "y": 3},
 | 
			
		||||
 | 
			
		||||
            {"x":0, "y":4},
 | 
			
		||||
            {"x":1, "y":4},
 | 
			
		||||
            {"x":2, "y":4},
 | 
			
		||||
            {"x":3, "y":4}
 | 
			
		||||
            {"matrix": [4, 0], "x": 0, "y": 4},
 | 
			
		||||
            {"matrix": [4, 1], "x": 1, "y": 4},
 | 
			
		||||
            {"matrix": [4, 2], "x": 2, "y": 4},
 | 
			
		||||
            {"matrix": [4, 3], "x": 3, "y": 4}
 | 
			
		||||
        ]
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,7 +13,7 @@
 | 
			
		|||
 * You should have received a copy of the GNU General Public License
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
#include "launch_pad.h"
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
led_config_t g_led_config = { {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,70 +0,0 @@
 | 
			
		|||
/* Copyright 2020 Ungodly Design <hello@ungodly.design>
 | 
			
		||||
 *
 | 
			
		||||
 * 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 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.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/* 4x5 numpad matrix layout
 | 
			
		||||
   * ,-------------------.
 | 
			
		||||
   * | 00 | 01 | 02 | 03 |
 | 
			
		||||
   * |----|----|----|----|
 | 
			
		||||
   * | 10 | 11 | 12 | 13 |
 | 
			
		||||
   * |----|----|----|----|
 | 
			
		||||
   * | 20 | 21 | 22 | 23 |
 | 
			
		||||
   * |----|----|----|----|
 | 
			
		||||
   * | 30 | 31 | 32 | 33 |
 | 
			
		||||
   * |----|----|----|----|
 | 
			
		||||
   * | 40 | 41 | 42 | 43 |
 | 
			
		||||
   * `-------------------'
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
 /* Numpad matrix layout
 | 
			
		||||
    * ,-------------------.
 | 
			
		||||
    * | 00 | 01 | 02 | 03 |
 | 
			
		||||
    * |----|----|----|----|
 | 
			
		||||
    * | 10 | 11 | 12 | 13 |
 | 
			
		||||
    * |----|----|----|----|
 | 
			
		||||
    * | 20 | 21 | 22 | 23 |
 | 
			
		||||
    * |----|----|----|----|
 | 
			
		||||
    * | 30 | 31 | 32 |    |
 | 
			
		||||
    * |----|----|----| 33 |
 | 
			
		||||
    * |   41    | 42 |    |
 | 
			
		||||
    * `-------------------'
 | 
			
		||||
  */
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_ortho_5x4( \
 | 
			
		||||
	k00, k01, k02, k03,  \
 | 
			
		||||
	k10, k11, k12, k13,  \
 | 
			
		||||
	k20, k21, k22, k23,  \
 | 
			
		||||
	k30, k31, k32, k33,  \
 | 
			
		||||
	k40, k41, k42, k43   \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
	{k00, k01, k02, k03}, \
 | 
			
		||||
	{k10, k11, k12, k13}, \
 | 
			
		||||
	{k20, k21, k22, k23}, \
 | 
			
		||||
	{k30, k31, k32, k33}, \
 | 
			
		||||
	{k40, k41, k42, k43}  \
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue