summaryrefslogtreecommitdiff
path: root/keyboards/rate
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/rate
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/rate')
-rw-r--r--keyboards/rate/pistachio/info.json105
-rw-r--r--keyboards/rate/pistachio/rev1/info.json124
-rw-r--r--keyboards/rate/pistachio/rev1/rev1.h58
-rw-r--r--keyboards/rate/pistachio/rev2/info.json124
-rw-r--r--keyboards/rate/pistachio/rev2/rev2.h58
-rw-r--r--keyboards/rate/pistachio_mp/info.json36
-rw-r--r--keyboards/rate/pistachio_mp/pistachio_mp.h48
-rw-r--r--keyboards/rate/pistachio_pro/info.json188
-rw-r--r--keyboards/rate/pistachio_pro/pistachio_pro.h42
9 files changed, 363 insertions, 420 deletions
diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json
index e07d02061d..59329a2bd2 100644
--- a/keyboards/rate/pistachio/info.json
+++ b/keyboards/rate/pistachio/info.json
@@ -9,108 +9,5 @@
"device_version": "0.0.1"
},
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x":1.25, "y":0},
- {"x":2.75, "y":0},
- {"x":3.75, "y":0},
- {"x":4.75, "y":0},
- {"x":5.75, "y":0},
- {"x":7.25, "y":0},
- {"x":9.5, "y":0},
- {"x":10.5, "y":0},
- {"x":11.5, "y":0},
- {"x":12.5, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
- {"x":16, "y":0},
- {"x":17, "y":0},
-
- {"x":0, "y":1.5},
- {"x":1.25, "y":1.5},
- {"x":2.25, "y":1.5},
- {"x":3.25, "y":1.5},
- {"x":4.25, "y":1.5},
- {"x":5.25, "y":1.5},
- {"x":6.25, "y":1.5},
- {"x":7.25, "y":1.5},
- {"x":10, "y":1.5},
- {"x":11, "y":1.5},
- {"x":12, "y":1.5},
- {"x":13, "y":1.5},
- {"x":14, "y":1.5},
- {"x":15, "y":1.5},
- {"x":16, "y":1.5},
- {"x":17, "y":1.5},
- {"x":18.25, "y":1.5},
-
- {"x":0, "y":2.5},
- {"x":1.25, "y":2.5, "w":1.5},
- {"x":2.75, "y":2.5},
- {"x":3.75, "y":2.5},
- {"x":4.75, "y":2.5},
- {"x":5.75, "y":2.5},
- {"x":6.75, "y":2.5},
- {"x":9.5, "y":2.5},
- {"x":10.5, "y":2.5},
- {"x":11.5, "y":2.5},
- {"x":12.5, "y":2.5},
- {"x":13.5, "y":2.5},
- {"x":14.5, "y":2.5},
- {"x":15.5, "y":2.5},
- {"x":18.25, "y":2.5},
-
- {"x":0, "y":3.5},
- {"x":1.25, "y":3.5, "w":1.75},
- {"x":3, "y":3.5},
- {"x":4, "y":3.5},
- {"x":5, "y":3.5},
- {"x":6, "y":3.5},
- {"x":7, "y":3.5},
- {"x":9.75, "y":3.5},
- {"x":10.75, "y":3.5},
- {"x":11.75, "y":3.5},
- {"x":12.75, "y":3.5},
- {"x":13.75, "y":3.5},
- {"x":14.75, "y":3.5},
- {"x":15.75, "y":3.5},
- {"x":16.75, "y":2.5, "w":1.25, "h":2},
- {"x":18.25, "y":3.5},
-
- {"x":0, "y":4.5},
- {"x":1.25, "y":4.5, "w":2.25},
- {"x":3.5, "y":4.5},
- {"x":4.5, "y":4.5},
- {"x":5.5, "y":4.5},
- {"x":6.5, "y":4.5},
- {"x":7.5, "y":4.5},
- {"x":10.25, "y":4.5},
- {"x":11.25, "y":4.5},
- {"x":12.25, "y":4.5},
- {"x":13.25, "y":4.5},
- {"x":14.25, "y":4.5},
- {"x":15.25, "y":4.5},
- {"x":16.25, "y":4.5, "w":1.75},
- {"x":18.25, "y":4.5},
-
- {"x":0, "y":5.5},
- {"x":1.25, "y":5.5, "w":1.25},
- {"x":2.5, "y":5.5},
- {"x":3.5, "y":5.5, "w":1.25},
- {"x":4.75, "y":5.5},
- {"x":5.75, "y":5.5},
- {"x":6.75, "y":5.5, "w":1.25},
- {"x":10.5, "y":5.5, "w":1.25},
- {"x":11.75, "y":5.5},
- {"x":12.75, "y":5.5},
- {"x":13.75, "y":5.5},
- {"x":14.75, "y":5.5},
- {"x":15.75, "y":5.5},
- {"x":16.75, "y":5.5, "w":1.25},
- {"x":18.25, "y":5.5}
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
index c57493f8fe..a50ae8b991 100644
--- a/keyboards/rate/pistachio/rev1/info.json
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -6,5 +6,127 @@
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"],
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+ {"matrix": [6, 0], "x": 9.5, "y": 0},
+ {"matrix": [6, 1], "x": 10.5, "y": 0},
+ {"matrix": [6, 2], "x": 11.5, "y": 0},
+ {"matrix": [6, 3], "x": 12.5, "y": 0},
+
+ {"matrix": [6, 4], "x": 14, "y": 0},
+ {"matrix": [6, 5], "x": 15, "y": 0},
+ {"matrix": [6, 6], "x": 16, "y": 0},
+ {"matrix": [6, 7], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.25, "y": 1.5},
+
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 1], "x": 11, "y": 1.5},
+ {"matrix": [7, 2], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5},
+ {"matrix": [7, 4], "x": 14, "y": 1.5},
+ {"matrix": [7, 5], "x": 15, "y": 1.5},
+ {"matrix": [7, 6], "x": 16, "y": 1.5},
+ {"matrix": [7, 7], "x": 17, "y": 1.5},
+
+ {"matrix": [7, 8], "x": 18.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 2], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 13.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 14.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.5, "y": 2.5},
+
+ {"matrix": [8, 8], "x": 18.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 2], "x": 3, "y": 3.5},
+ {"matrix": [3, 3], "x": 4, "y": 3.5},
+ {"matrix": [3, 4], "x": 5, "y": 3.5},
+ {"matrix": [3, 5], "x": 6, "y": 3.5},
+ {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 1], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 2], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 13.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 14.75, "y": 3.5},
+ {"matrix": [9, 6], "x": 15.75, "y": 3.5},
+ {"matrix": [8, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [9, 7], "x": 18.25, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.5, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.5, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.5, "y": 4.5},
+
+ {"matrix": [10, 0], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 12.25, "y": 4.5},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 14.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 15.25, "y": 4.5},
+ {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75},
+
+ {"matrix": [10, 7], "x": 18.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5.5},
+ {"matrix": [5, 5], "x": 5.75, "y": 5.5},
+ {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 1], "x": 11.75, "y": 5.5},
+ {"matrix": [11, 2], "x": 12.75, "y": 5.5},
+ {"matrix": [11, 3], "x": 13.75, "y": 5.5},
+ {"matrix": [11, 4], "x": 14.75, "y": 5.5},
+ {"matrix": [11, 5], "x": 15.75, "y": 5.5},
+ {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [11, 7], "x": 18.25, "y": 5.5}
+ ]
+ }
+ }
}
diff --git a/keyboards/rate/pistachio/rev1/rev1.h b/keyboards/rate/pistachio/rev1/rev1.h
deleted file mode 100644
index e42de2d2b0..0000000000
--- a/keyboards/rate/pistachio/rev1/rev1.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2020 rate
-
-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"
-
-/*
- * ,------------------------------------------------- ---------------------------------------------------------.
- * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | |
- * |-------------------------------------- ---------- ---------------------------------------------------------+
- * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 |
- * |------------------------------------------------- ---------------------------------------------------------+
- * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 |
- * |--------------------------------------------- ------------------------------------------- ------+
- * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 |
- * |---------------------------------------------- -------------------------------------------------------+
- * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 |
- * |----------------------------------------------- -----------------------------------------------------+
- * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 |
- * |----------------------------------------------- ----------------------------------------------------
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \
- L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
- { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \
- { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \
- { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \
- }
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
index a98938f559..690c179151 100644
--- a/keyboards/rate/pistachio/rev2/info.json
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -6,5 +6,127 @@
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
"rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
},
- "diode_direction": "COL2ROW"
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+ {"matrix": [6, 0], "x": 9.5, "y": 0},
+ {"matrix": [6, 1], "x": 10.5, "y": 0},
+ {"matrix": [6, 2], "x": 11.5, "y": 0},
+ {"matrix": [6, 3], "x": 12.5, "y": 0},
+
+ {"matrix": [6, 4], "x": 14, "y": 0},
+ {"matrix": [6, 5], "x": 15, "y": 0},
+ {"matrix": [6, 6], "x": 16, "y": 0},
+ {"matrix": [6, 7], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.25, "y": 1.5},
+
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 1], "x": 11, "y": 1.5},
+ {"matrix": [7, 2], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5},
+ {"matrix": [7, 4], "x": 14, "y": 1.5},
+ {"matrix": [7, 5], "x": 15, "y": 1.5},
+ {"matrix": [7, 6], "x": 16, "y": 1.5},
+ {"matrix": [7, 7], "x": 17, "y": 1.5},
+
+ {"matrix": [7, 8], "x": 18.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 2], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 13.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 14.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.5, "y": 2.5},
+
+ {"matrix": [8, 7], "x": 18.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 2], "x": 3, "y": 3.5},
+ {"matrix": [3, 3], "x": 4, "y": 3.5},
+ {"matrix": [3, 4], "x": 5, "y": 3.5},
+ {"matrix": [3, 5], "x": 6, "y": 3.5},
+ {"matrix": [3, 6], "x": 7, "y": 3.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 1], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 2], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 13.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 14.75, "y": 3.5},
+ {"matrix": [9, 6], "x": 15.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [9, 8], "x": 18.25, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.5, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.5, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.5, "y": 4.5},
+
+ {"matrix": [10, 0], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 1], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 12.25, "y": 4.5},
+ {"matrix": [10, 3], "x": 13.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 14.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 15.25, "y": 4.5},
+ {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75},
+
+ {"matrix": [10, 7], "x": 18.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5.5},
+ {"matrix": [5, 5], "x": 5.75, "y": 5.5},
+ {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 1], "x": 11.75, "y": 5.5},
+ {"matrix": [11, 2], "x": 12.75, "y": 5.5},
+ {"matrix": [11, 3], "x": 13.75, "y": 5.5},
+ {"matrix": [11, 4], "x": 14.75, "y": 5.5},
+ {"matrix": [11, 5], "x": 15.75, "y": 5.5},
+ {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [11, 7], "x": 18.25, "y": 5.5}
+ ]
+ }
+ }
}
diff --git a/keyboards/rate/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h
deleted file mode 100644
index 750778a30e..0000000000
--- a/keyboards/rate/pistachio/rev2/rev2.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2020 rate
-
-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"
-
-/*
- * ,------------------------------------------------- ---------------------------------------------------------.
- * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | |
- * |-------------------------------------- ---------- ---------------------------------------------------------+
- * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 |
- * |------------------------------------------------- ---------------------------------------------------------+
- * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 |
- * |--------------------------------------------- ------------------------------------------- ------+
- * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 |
- * |---------------------------------------------- -------------------------------------------------------+
- * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 |
- * |----------------------------------------------- -----------------------------------------------------+
- * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 |
- * |----------------------------------------------- ----------------------------------------------------
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \
- L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \
- { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
- { R20, R21, R22, R23, R24, R25, R26, R28, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, R36, R27, R37 }, \
- { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \
- { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \
- }
diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index 0aca3a3f8e..648be80cd5 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -26,29 +26,29 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Encoder", "x":3, "y":0},
+ {"matrix": [1, 3], "x": 3, "y": 0},
- {"label":"Num Lock", "x":0, "y":1.5},
- {"label":"/", "x":1, "y":1.5},
- {"label":"*", "x":2, "y":1.5},
- {"label":"-", "x":3, "y":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 1.5},
+ {"matrix": [0, 1], "x": 1, "y": 1.5},
+ {"matrix": [0, 2], "x": 2, "y": 1.5},
+ {"matrix": [0, 3], "x": 3, "y": 1.5},
- {"label":"7", "x":0, "y":2.5},
- {"label":"8", "x":1, "y":2.5},
- {"label":"9", "x":2, "y":2.5},
+ {"matrix": [1, 0], "x": 0, "y": 2.5},
+ {"matrix": [1, 1], "x": 1, "y": 2.5},
+ {"matrix": [1, 2], "x": 2, "y": 2.5},
- {"label":"4", "x":0, "y":3.5},
- {"label":"5", "x":1, "y":3.5},
- {"label":"6", "x":2, "y":3.5},
- {"label":"+", "x":3, "y":2.5, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 3.5},
+ {"matrix": [2, 1], "x": 1, "y": 3.5},
+ {"matrix": [2, 2], "x": 2, "y": 3.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
- {"label":"1", "x":0, "y":4.5},
- {"label":"2", "x":1, "y":4.5},
- {"label":"3", "x":2, "y":4.5},
+ {"matrix": [3, 0], "x": 0, "y": 4.5},
+ {"matrix": [3, 1], "x": 1, "y": 4.5},
+ {"matrix": [3, 2], "x": 2, "y": 4.5},
- {"label":"0", "x":0, "y":5.5, "w":2},
- {"label":".", "x":2, "y":5.5},
- {"label":"Enter", "x":3, "y":4.5, "h":2}
+ {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 5.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2}
]
}
}
diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h
deleted file mode 100644
index d7c5c9bad9..0000000000
--- a/keyboards/rate/pistachio_mp/pistachio_mp.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 rate
- *
- * 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"
-
-/*
- * ,------------------------
- * | K07 |
- * |------------------------
- * | K00 | K01 | K02 | K03 |
- * |------------------------
- * | K04 | K05 | K06 | |
- * |------------------ K11 -
- * | K08 | K09 | K10 | |
- * |------------------------
- * | K12 | K13 | K14 | |
- * |------------------ K17 -
- * | K15 | K16 | |
- * |------------------------
- */
-#define LAYOUT( \
- K07, \
- K00, K01, K02, K03, \
- K04, K05, K06, \
- K08, K09, K10, K11, \
- K12, K13, K14, \
- K15, K16, K17 ) { \
- { K00, K01, K02, K03 }, \
- { K04, K05, K06, K07 }, \
- { K08, K09, K10, K11 }, \
- { K12, K13, K14, KC_NO }, \
- { K15, KC_NO, K16, K17 }, \
-}
diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json
index 743ff18155..cf0218b050 100644
--- a/keyboards/rate/pistachio_pro/info.json
+++ b/keyboards/rate/pistachio_pro/info.json
@@ -18,101 +18,109 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Pause", "x":17.25, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"label":"E/J", "x":0, "y":1.5},
- {"label":"!", "x":1, "y":1.5},
- {"label":"\"", "x":2, "y":1.5},
- {"label":"#", "x":3, "y":1.5},
- {"label":"$", "x":4, "y":1.5},
- {"label":"%", "x":5, "y":1.5},
- {"label":"&", "x":6, "y":1.5},
- {"label":"'", "x":7, "y":1.5},
- {"label":"(", "x":8, "y":1.5},
- {"label":")", "x":9, "y":1.5},
- {"label":"", "x":10, "y":1.5},
- {"label":"=", "x":11, "y":1.5},
- {"label":"~", "x":12, "y":1.5},
- {"label":"|", "x":13, "y":1.5},
- {"label":"BS", "x":14, "y":1.5},
- {"label":"Insert", "x":15.25, "y":1.5},
- {"label":"Home", "x":16.25, "y":1.5},
- {"label":"PgUp", "x":17.25, "y":1.5},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
- {"label":"Tab", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"`", "x":11.5, "y":2.5},
- {"label":"{", "x":12.5, "y":2.5},
- {"label":"Delete", "x":15.25, "y":2.5},
- {"label":"End", "x":16.25, "y":2.5},
- {"label":"PgDn", "x":17.25, "y":2.5},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
- {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":"+", "x":10.75, "y":3.5},
- {"label":"*", "x":11.75, "y":3.5},
- {"label":"}", "x":12.75, "y":3.5},
- {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
- {"label":"Shift", "x":0, "y":4.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":"<", "x":9.25, "y":4.5},
- {"label":">", "x":10.25, "y":4.5},
- {"label":"?", "x":11.25, "y":4.5},
- {"label":"_", "x":12.25, "y":4.5},
- {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
- {"label":"\u2191", "x":16.25, "y":4.5},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.5},
- {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
- {"x":3.5, "y":5.5},
- {"x":4.5, "y":5.5, "w":2.25},
- {"x":6.75, "y":5.5, "w":2.25},
- {"label":"kana", "x":9, "y":5.5, "w":1.25},
- {"x":10.25, "y":5.5, "w":1.25},
- {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
- {"label":"Menu", "x":12.75, "y":5.5},
- {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":15.25, "y":5.5},
- {"label":"\u2193", "x":16.25, "y":5.5},
- {"label":"\u2192", "x":17.25, "y":5.5}
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [1, 14], "x": 14, "y": 1.5},
+
+ {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 17], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+ {"matrix": [2, 13], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 13.25, "y": 4.5, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 5.5},
+ {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 2.25},
+ {"matrix": [5, 5], "x": 6.75, "y": 5.5, "w": 2.25},
+ {"matrix": [5, 6], "x": 9, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 10.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 8], "x": 11.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 9], "x": 12.75, "y": 5.5},
+ {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 11], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 12], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/rate/pistachio_pro/pistachio_pro.h b/keyboards/rate/pistachio_pro/pistachio_pro.h
deleted file mode 100644
index 42de95ea87..0000000000
--- a/keyboards/rate/pistachio_pro/pistachio_pro.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 rate
- *
- * 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( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, \
- k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
- k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, \
- k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513 ) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, KC_NO, KC_NO }, \
- { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO } \
-}