summaryrefslogtreecommitdiff
path: root/keyboards/salicylic_acid3
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/salicylic_acid3
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/salicylic_acid3')
-rw-r--r--keyboards/salicylic_acid3/7skb/rev1/info.json135
-rw-r--r--keyboards/salicylic_acid3/7skb/rev1/rev1.h40
-rw-r--r--keyboards/salicylic_acid3/7splus/7splus.h61
-rw-r--r--keyboards/salicylic_acid3/7splus/info.json184
-rw-r--r--keyboards/salicylic_acid3/ajisai74/ajisai74.h54
-rw-r--r--keyboards/salicylic_acid3/ajisai74/info.json159
-rw-r--r--keyboards/salicylic_acid3/ergoarrows/ergoarrows.h59
-rw-r--r--keyboards/salicylic_acid3/ergoarrows/info.json153
-rw-r--r--keyboards/salicylic_acid3/getta25/rev1/info.json55
-rw-r--r--keyboards/salicylic_acid3/getta25/rev1/rev1.h35
-rw-r--r--keyboards/salicylic_acid3/jisplit89/rev1/info.json194
-rw-r--r--keyboards/salicylic_acid3/jisplit89/rev1/rev1.h61
-rw-r--r--keyboards/salicylic_acid3/nknl7en/info.json156
-rw-r--r--keyboards/salicylic_acid3/nknl7en/nknl7en.h54
-rw-r--r--keyboards/salicylic_acid3/nknl7jp/info.json159
-rw-r--r--keyboards/salicylic_acid3/nknl7jp/nknl7jp.h54
16 files changed, 642 insertions, 971 deletions
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 3aab930399..da6acd3a3a 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -24,69 +24,78 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":7, "y":0},
- {"label":"7", "x":8, "y":0},
- {"label":"8", "x":9, "y":0},
- {"label":"9", "x":10, "y":0},
- {"label":"0", "x":11, "y":0},
- {"label":"-", "x":12, "y":0},
- {"label":"=", "x":13, "y":0},
- {"label":"\\", "x":14, "y":0},
- {"label":"`", "x":15, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":7.5, "y":1},
- {"label":"U", "x":8.5, "y":1},
- {"label":"I", "x":9.5, "y":1},
- {"label":"O", "x":10.5, "y":1},
- {"label":"P", "x":11.5, "y":1},
- {"label":"[", "x":12.5, "y":1},
- {"label":"]", "x":13.5, "y":1},
- {"label":"Delete", "x":14.5, "y":1, "w":1.5},
- {"label":"Control", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "x":10.75, "y":2},
- {"label":";", "x":11.75, "y":2},
- {"label":"'", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":8.25, "y":3},
- {"label":"M", "x":9.25, "y":3},
- {"label":",", "x":10.25, "y":3},
- {"label":".", "x":11.25, "y":3},
- {"label":"/", "x":12.25, "y":3},
- {"label":"Shift", "x":13.25, "y":3, "w":1.75},
- {"label":"Fn", "x":15, "y":3},
- {"label":"Alt", "x":1.5, "y":4},
- {"label":"GUI", "x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":1.5},
- {"x":5.5, "y":4, "w":1.25},
- {"x":7.75, "y":4, "w":1.25},
- {"x":9, "y":4, "w":2},
- {"label":"GUI", "x":11, "y":4, "w":1.5},
- {"label":"Alt", "x":12.5, "y":4}
+ {"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": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+ {"matrix": [5, 6], "x": 13, "y": 0},
+ {"matrix": [5, 7], "x": 14, "y": 0},
+ {"matrix": [6, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.5, "y": 1},
+ {"matrix": [6, 1], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 5], "x": 12.5, "y": 1},
+ {"matrix": [6, 6], "x": 13.5, "y": 1},
+ {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.75, "y": 2},
+ {"matrix": [7, 1], "x": 8.75, "y": 2},
+ {"matrix": [7, 2], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 5], "x": 12.75, "y": 2},
+ {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.25, "y": 3},
+ {"matrix": [8, 1], "x": 9.25, "y": 3},
+ {"matrix": [8, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 4], "x": 12.25, "y": 3},
+ {"matrix": [8, 5], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 6], "x": 15, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 9, "y": 4, "w": 2},
+ {"matrix": [9, 3], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 4], "x": 12.5, "y": 4}
]
}
}
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
deleted file mode 100644
index d523bf96e5..0000000000
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use 7skb.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------ ------------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R17 |
- * |---------------------------------------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R27 |
- * |---------------------------------------- ---------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |---------------------------------------------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 |
- * |------------------------------------------- -----------------------------------------------'
- * | L41 | L42 | L43 | L44 | | R40 | R41 | R43 | R44 |
- * |------------------------------ ---------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R17, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R27, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, \
- L41, L42, L43, L44, R40, R41, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \
- {KC_NO, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO }, \
- { R40, R41, KC_NO, R43, R44, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/salicylic_acid3/7splus/7splus.h b/keyboards/salicylic_acid3/7splus/7splus.h
deleted file mode 100644
index 55b9c24f9c..0000000000
--- a/keyboards/salicylic_acid3/7splus/7splus.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-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 | R60 |
- * |-------------------------------------- ------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R62 |
- * |---------------------------------------------------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 |
- * |---------------------------------------- ---------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 |
- * |---------------------------------------------------------------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R47 | R57 |
- * |---------------------------------------------------------------------------------------------------+
- * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R53 | R54 | R55 | R56 | R64 |
- * |---------------------------------------- ------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R62, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R47, R57, \
- L50, L51, L52, L54, L55, R50, R51, R53, R54, R55, R56, R64 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \
- { L50, L51, L52, KC_NO, L54, L55, KC_NO, KC_NO }, \
- {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37 }, \
- { R40, R41, R42, R43, R44, R45, KC_NO, R47 }, \
- { R50, R51, KC_NO, R53, R54, R55, R56, R57 }, \
- { R60, KC_NO, R62, R63, R64, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index 47f3bcc5c2..40f449c126 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -24,91 +24,105 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":1.25, "y":0},
- {"label":"F2", "x":2.25, "y":0},
- {"label":"F3", "x":3.25, "y":0},
- {"label":"F4", "x":4.25, "y":0},
- {"label":"F5", "x":5.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":10.75, "y":0},
- {"label":"F10", "x":11.75, "y":0},
- {"label":"F11", "x":12.75, "y":0},
- {"label":"F12", "x":13.75, "y":0},
- {"label":"PrtScr", "x":15, "y":0},
- {"label":"Delete", "x":16, "y":0},
- {"label":"~", "x":0, "y":1.25},
- {"label":"1", "x":1, "y":1.25},
- {"label":"2", "x":2, "y":1.25},
- {"label":"3", "x":3, "y":1.25},
- {"label":"4", "x":4, "y":1.25},
- {"label":"5", "x":5, "y":1.25},
- {"label":"6", "x":7, "y":1.25},
- {"label":"7", "x":8, "y":1.25},
- {"label":"8", "x":9, "y":1.25},
- {"label":"9", "x":10, "y":1.25},
- {"label":"0", "x":11, "y":1.25},
- {"label":"-", "x":12, "y":1.25},
- {"label":"=", "x":13, "y":1.25},
- {"label":"Back Space", "x":14, "y":1.25, "w":2},
- {"label":"Home", "x":16, "y":1.25},
- {"label":"Tab", "x":0, "y":2.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.25},
- {"label":"W", "x":2.5, "y":2.25},
- {"label":"E", "x":3.5, "y":2.25},
- {"label":"R", "x":4.5, "y":2.25},
- {"label":"T", "x":5.5, "y":2.25},
- {"label":"Y", "x":7.5, "y":2.25},
- {"label":"U", "x":8.5, "y":2.25},
- {"label":"I", "x":9.5, "y":2.25},
- {"label":"O", "x":10.5, "y":2.25},
- {"label":"P", "x":11.5, "y":2.25},
- {"label":"[", "x":12.5, "y":2.25},
- {"label":"]", "x":13.5, "y":2.25},
- {"label":"\"", "x":14.5, "y":2.25, "w":1.5},
- {"label":"Page Up", "x":16, "y":2.25},
- {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
- {"label":"A", "x":1.75, "y":3.25},
- {"label":"S", "x":2.75, "y":3.25},
- {"label":"D", "x":3.75, "y":3.25},
- {"label":"F", "x":4.75, "y":3.25},
- {"label":"G", "x":5.75, "y":3.25},
- {"label":"H", "x":7.75, "y":3.25},
- {"label":"J", "x":8.75, "y":3.25},
- {"label":"K", "x":9.75, "y":3.25},
- {"label":"L", "x":10.75, "y":3.25},
- {"label":":", "x":11.75, "y":3.25},
- {"label":"'", "x":12.75, "y":3.25},
- {"label":"Enter", "x":13.75, "y":3.25, "w":2.25},
- {"label":"Page Down", "x":16, "y":3.25},
- {"label":"Shift", "x":0, "y":4.25, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.25},
- {"label":"X", "x":3.25, "y":4.25},
- {"label":"C", "x":4.25, "y":4.25},
- {"label":"V", "x":5.25, "y":4.25},
- {"label":"B", "x":6.25, "y":4.25},
- {"label":"N", "x":8.25, "y":4.25},
- {"label":"M", "x":9.25, "y":4.25},
- {"label":"<", "x":10.25, "y":4.25},
- {"label":">", "x":11.25, "y":4.25},
- {"label":"?", "x":12.25, "y":4.25},
- {"label":"Shift","x":13.25, "y":4.25, "w":1.75},
- {"label":"Up", "x":15, "y":4.25},
- {"label":"End", "x":16, "y":4.25},
- {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":2},
- {"x":5.75, "y":5.25},
- {"x":7.75, "y":5.25},
- {"x":8.75, "y":5.25, "w":2.75},
- {"label":"Alt", "x":11.5, "y":5.25, "w":1.25},
- {"label":"App", "x":12.75, "y":5.25, "w":1.25},
- {"label":"Left", "x":14, "y":5.25},
- {"label":"Down", "x":15, "y":5.25},
- {"label":"Right", "x":16, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [7, 0], "x": 7.5, "y": 0},
+ {"matrix": [7, 1], "x": 8.5, "y": 0},
+ {"matrix": [7, 2], "x": 9.5, "y": 0},
+
+ {"matrix": [7, 3], "x": 10.75, "y": 0},
+ {"matrix": [7, 4], "x": 11.75, "y": 0},
+ {"matrix": [7, 5], "x": 12.75, "y": 0},
+ {"matrix": [7, 6], "x": 13.75, "y": 0},
+
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 0], "x": 16, "y": 0},
+
+ {"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},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [8, 0], "x": 7, "y": 1.25},
+ {"matrix": [8, 1], "x": 8, "y": 1.25},
+ {"matrix": [8, 2], "x": 9, "y": 1.25},
+ {"matrix": [8, 3], "x": 10, "y": 1.25},
+ {"matrix": [8, 4], "x": 11, "y": 1.25},
+ {"matrix": [8, 5], "x": 12, "y": 1.25},
+ {"matrix": [8, 6], "x": 13, "y": 1.25},
+ {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2},
+ {"matrix": [13, 2], "x": 16, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+ {"matrix": [13, 3], "x": 16, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+
+ {"matrix": [10, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25},
+ {"matrix": [10, 7], "x": 16, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+
+ {"matrix": [11, 0], "x": 8.25, "y": 4.25},
+ {"matrix": [11, 1], "x": 9.25, "y": 4.25},
+ {"matrix": [11, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 11.25, "y": 4.25},
+ {"matrix": [11, 4], "x": 12.25, "y": 4.25},
+ {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [11, 7], "x": 15, "y": 4.25},
+ {"matrix": [12, 7], "x": 16, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2},
+ {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+
+ {"matrix": [12, 0], "x": 7.75, "y": 5.25},
+ {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75},
+ {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 5], "x": 14, "y": 5.25},
+ {"matrix": [12, 6], "x": 15, "y": 5.25},
+ {"matrix": [13, 4], "x": 16, "y": 5.25}
]
}
}
diff --git a/keyboards/salicylic_acid3/ajisai74/ajisai74.h b/keyboards/salicylic_acid3/ajisai74/ajisai74.h
deleted file mode 100644
index 40c7d8b31b..0000000000
--- a/keyboards/salicylic_acid3/ajisai74/ajisai74.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-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 | R08 | R18 |
- * |---------------------------------------------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R28 |
- * |---------------------------------------- ---------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R38 |
- * |---------------------------------------------------------------------------------------------------+
- * | L30 | L45 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 |
- * |------------------------------------------- -----------------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | | R40 | R41 | R42 | R43 | R44 | | R46 | R47 | R48 |
- * |---------------------------------------- --------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, R18, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R28, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R38, \
- L30, L45, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R46, R47, R48 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
- { 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, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, R46, R47, R48 } \
- }
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
index 8378a1cd5d..681737a069 100644
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ b/keyboards/salicylic_acid3/ajisai74/info.json
@@ -21,80 +21,91 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6.75, "y":0},
- {"label":"7", "x":7.75, "y":0},
- {"label":"8", "x":8.75, "y":0},
- {"label":"9", "x":9.75, "y":0},
- {"label":"0", "x":10.75, "y":0},
- {"label":"-", "x":11.75, "y":0},
- {"label":"=", "x":12.75, "y":0},
- {"label":"Back", "x":13.75, "y":0},
- {"label":"Back", "x":14.75, "y":0},
- {"label":"Insert", "x":15.75, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":7.25, "y":1},
- {"label":"U", "x":8.25, "y":1},
- {"label":"I", "x":9.25, "y":1},
- {"label":"O", "x":10.25, "y":1},
- {"label":"P", "x":11.25, "y":1},
- {"label":"[", "x":12.25, "y":1},
- {"label":"]", "x":13.25, "y":1},
- {"label":"\"", "x":14.25, "y":1, "w":1.5},
- {"label":"Del", "x":15.75, "y":1},
- {"label":"CapsLock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":":", "x":11.5, "y":2},
- {"label":"'", "x":12.5, "y":2},
- {"label":"Return", "x":13.5, "y":2},
- {"label":"Return", "x":14.5, "y":2, "w":1.25},
- {"label":"PgUp", "x":15.75, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":1.25},
- {"label":"Shift", "x":1.25, "y":3},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":8, "y":3},
- {"label":"M", "x":9, "y":3},
- {"label":"<", "x":10, "y":3},
- {"label":">", "x":11, "y":3},
- {"label":"?", "x":12, "y":3},
- {"label":"Shift", "x":13, "y":3, "w":1.75},
- {"label":"Up", "x":14.75, "y":3},
- {"label":"PgDwn", "x":15.75, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5},
- {"label":"Win", "x":1.5, "y":4},
- {"label":"Alt", "x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":1.5},
- {"x":5.5, "y":4, "w":1.25},
- {"x":7.5, "y":4, "w":1.25},
- {"x":8.75, "y":4, "w":1.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Win", "x":11.25, "y":4},
- {"label":"Fn", "x":12.25, "y":4},
- {"label":"Left", "x":13.75, "y":4},
- {"label":"Down", "x":14.75, "y":4},
- {"label":"Right", "x":15.75, "y":4}]
+ {"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": [5, 0], "x": 6.75, "y": 0},
+ {"matrix": [5, 1], "x": 7.75, "y": 0},
+ {"matrix": [5, 2], "x": 8.75, "y": 0},
+ {"matrix": [5, 3], "x": 9.75, "y": 0},
+ {"matrix": [5, 4], "x": 10.75, "y": 0},
+ {"matrix": [5, 5], "x": 11.75, "y": 0},
+ {"matrix": [5, 6], "x": 12.75, "y": 0},
+ {"matrix": [5, 7], "x": 13.75, "y": 0},
+ {"matrix": [5, 8], "x": 14.75, "y": 0},
+ {"matrix": [6, 8], "x": 15.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.25, "y": 1},
+ {"matrix": [6, 1], "x": 8.25, "y": 1},
+ {"matrix": [6, 2], "x": 9.25, "y": 1},
+ {"matrix": [6, 3], "x": 10.25, "y": 1},
+ {"matrix": [6, 4], "x": 11.25, "y": 1},
+ {"matrix": [6, 5], "x": 12.25, "y": 1},
+ {"matrix": [6, 6], "x": 13.25, "y": 1},
+ {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+ {"matrix": [7, 8], "x": 15.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2},
+ {"matrix": [7, 1], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [7, 3], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 5], "x": 12.5, "y": 2},
+ {"matrix": [7, 6], "x": 13.5, "y": 2},
+ {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25},
+ {"matrix": [8, 8], "x": 15.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [4, 5], "x": 1.25, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
+ {"matrix": [8, 6], "x": 14.75, "y": 3},
+ {"matrix": [8, 7], "x": 15.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 4], "x": 12.25, "y": 4},
+
+ {"matrix": [9, 6], "x": 13.75, "y": 4},
+ {"matrix": [9, 7], "x": 14.75, "y": 4},
+ {"matrix": [9, 8], "x": 15.75, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
deleted file mode 100644
index 7944337b4e..0000000000
--- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 | L06 | | R06 | R05 | R04 | R03 | R02 | R01 | R00 |
- * |------------------------------------------ ------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R16 | R15 | R14 | R13 | R12 | R11 | R10 |
- * |------------------------------------------ ------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R26 | R25 | R24 | R23 | R22 | R21 | R20 |
- * |------------------------------------------ ------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R36 | R35 | R34 | R33 | R32 | R31 | R30 |
- * |------------------------------------------ ------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | L45 | L46 | | R46 | R45 | R44 | R43 | R42 | R41 | R40 |
- * |------------------------------------------ ------------------------------------------+
- * | L51 | L52 | L53 | | R53 | R52 | R51 |
- * ------------------- ------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30, \
- L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40, \
- L51, L52, L53, R53, R52, R51 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- {KC_NO, L51, L52, L53, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, R43, R44, R45, R46 }, \
- {KC_NO, R51, R52, R53, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 415a7e1945..0957f6628d 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -24,94 +24,95 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0.375},
- {"label":"1", "x":1, "y":0.375},
- {"label":"2", "x":2, "y":0.125},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0.125},
- {"label":"5", "x":5, "y":0.25},
- {"label":"6", "x":6, "y":0.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
- {"label":"5", "x":8.8, "y":0.5},
- {"label":"6", "x":9.8, "y":0.25},
- {"label":"7", "x":10.8, "y":0.125},
- {"label":"8", "x":11.8, "y":0},
- {"label":"9", "x":12.8, "y":0.125},
- {"label":"0", "x":13.8, "y":0.375},
- {"label":"PrtScr", "x":14.8, "y":0.375},
+ {"matrix": [6, 6], "x": 8.8, "y": 0.5},
+ {"matrix": [6, 5], "x": 9.8, "y": 0.25},
+ {"matrix": [6, 4], "x": 10.8, "y": 0.125},
+ {"matrix": [6, 3], "x": 11.8, "y": 0},
+ {"matrix": [6, 2], "x": 12.8, "y": 0.125},
+ {"matrix": [6, 1], "x": 13.8, "y": 0.375},
+ {"matrix": [6, 0], "x": 14.8, "y": 0.375},
- {"label":"Tab", "x":0, "y":1.375},
- {"label":"Q", "x":1, "y":1.375},
- {"label":"W", "x":2, "y":1.125},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1.125},
- {"label":"T", "x":5, "y":1.25},
- {"label":"Y", "x":6, "y":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"label":"T", "x":8.8, "y":1.5},
- {"label":"Y", "x":9.8, "y":1.25},
- {"label":"U", "x":10.8, "y":1.125},
- {"label":"I", "x":11.8, "y":1},
- {"label":"O", "x":12.8, "y":1.125},
- {"label":"P", "x":13.8, "y":1.375},
- {"label":"[", "x":14.8, "y":1.375},
+ {"matrix": [7, 6], "x": 8.8, "y": 1.5},
+ {"matrix": [7, 5], "x": 9.8, "y": 1.25},
+ {"matrix": [7, 4], "x": 10.8, "y": 1.125},
+ {"matrix": [7, 3], "x": 11.8, "y": 1},
+ {"matrix": [7, 2], "x": 12.8, "y": 1.125},
+ {"matrix": [7, 1], "x": 13.8, "y": 1.375},
+ {"matrix": [7, 0], "x": 14.8, "y": 1.375},
- {"label":"Caps", "x":0, "y":2.375},
- {"label":"A", "x":1, "y":2.375},
- {"label":"S", "x":2, "y":2.125},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2.125},
- {"label":"G", "x":5, "y":2.25},
- {"label":"H", "x":6, "y":2.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
- {"label":"G", "x":8.8, "y":2.5},
- {"label":"H", "x":9.8, "y":2.25},
- {"label":"J", "x":10.8, "y":2.125},
- {"label":"K", "x":11.8, "y":2},
- {"label":"L", "x":12.8, "y":2.125},
- {"label":":", "x":13.8, "y":2.375},
- {"label":"Ent", "x":14.8, "y":2.375},
+ {"matrix": [8, 6], "x": 8.8, "y": 2.5},
+ {"matrix": [8, 5], "x": 9.8, "y": 2.25},
+ {"matrix": [8, 4], "x": 10.8, "y": 2.125},
+ {"matrix": [8, 3], "x": 11.8, "y": 2},
+ {"matrix": [8, 2], "x": 12.8, "y": 2.125},
+ {"matrix": [8, 1], "x": 13.8, "y": 2.375},
+ {"matrix": [8, 0], "x": 14.8, "y": 2.375},
- {"label":"Shift", "x":0, "y":3.375},
- {"label":"Z", "x":1, "y":3.375},
- {"label":"X", "x":2, "y":3.125},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3.125},
- {"label":"B", "x":5, "y":3.25},
- {"label":"N", "x":6, "y":3.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.5},
- {"label":"B", "x":8.8, "y":3.5},
- {"label":"N", "x":9.8, "y":3.25},
- {"label":"M", "x":10.8, "y":3.125},
- {"label":"<", "x":11.8, "y":3},
- {"label":">", "x":12.8, "y":3.125},
- {"label":"?", "x":13.8, "y":3.375},
- {"label":"_", "x":14.8, "y":3.375},
+ {"matrix": [9, 6], "x": 8.8, "y": 3.5},
+ {"matrix": [9, 5], "x": 9.8, "y": 3.25},
+ {"matrix": [9, 4], "x": 10.8, "y": 3.125},
+ {"matrix": [9, 3], "x": 11.8, "y": 3},
+ {"matrix": [9, 2], "x": 12.8, "y": 3.125},
+ {"matrix": [9, 1], "x": 13.8, "y": 3.375},
+ {"matrix": [9, 0], "x": 14.8, "y": 3.375},
- {"label":"Ctrl", "x":0, "y":4.375},
- {"label":"Win", "x":1, "y":4.375},
- {"label":"&uarr;", "x":2.125, "y":4.5},
- {"label":"Alt", "x":3.25, "y":4.375},
- {"label":"Ent", "x":4.25, "y":4.375},
- {"label":"BS", "x":5.35, "y":4.625},
- {"label":"Del", "x":6.4, "y":5.125},
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2.125, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.375},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.375},
+ {"matrix": [4, 5], "x": 5.35, "y": 4.625},
+ {"matrix": [4, 6], "x": 6.4, "y": 5.125},
- {"label":"BS", "x":8.4, "y":5.125},
- {"label":"Del", "x":9.45, "y":4.625},
- {"label":"Spc", "x":10.55, "y":4.375},
- {"label":"Alt", "x":11.55, "y":4.375},
- {"label":"&uarr;", "x":12.675, "y":4.5},
- {"label":"Alt", "x":13.8, "y":4.375},
- {"label":"App", "x":14.8, "y":4.375},
+ {"matrix": [10, 6], "x": 8.4, "y": 5.125},
+ {"matrix": [10, 5], "x": 9.45, "y": 4.625},
+ {"matrix": [10, 4], "x": 10.55, "y": 4.375},
+ {"matrix": [10, 3], "x": 11.55, "y": 4.375},
+ {"matrix": [10, 2], "x": 12.675, "y": 4.5},
+ {"matrix": [10, 1], "x": 13.8, "y": 4.375},
+ {"matrix": [10, 0], "x": 14.8, "y": 4.375},
- {"label":"&larr;", "x":1.125, "y":5.5},
- {"label":"&dArr;", "x":2.125, "y":5.5},
- {"label":"&rarr;", "x":3.125, "y":5.5},
+ {"matrix": [5, 1], "x": 1.125, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.125, "y": 5.5},
+ {"matrix": [5, 3], "x": 3.125, "y": 5.5},
- {"label":"&larr;", "x":11.675, "y":5.5},
- {"label":"&dArr;", "x":12.675, "y":5.5},
- {"label":"&rarr;", "x":13.675, "y":5.5}
+ {"matrix": [11, 3], "x": 11.675, "y": 5.5},
+ {"matrix": [11, 2], "x": 12.675, "y": 5.5},
+ {"matrix": [11, 1], "x": 13.675, "y": 5.5}
]
}
}
+
}
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index c63baa8942..c128df0f79 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -21,31 +21,36 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"=", "x":2, "y":0},
- {"label":"DEL", "x":3, "y":0},
- {"label":"Num Lock", "x":0, "y":1.25},
- {"label":"/", "x":1, "y":1.25},
- {"label":"*", "x":2, "y":1.25},
- {"label":"-", "x":3, "y":1.25},
- {"label":"7", "x":0, "y":2.25},
- {"label":"8", "x":1, "y":2.25},
- {"label":"9", "x":2, "y":2.25},
- {"label":"ESC", "x":4.25, "y":2.25},
- {"label":"4", "x":0, "y":3.25},
- {"label":"5", "x":1, "y":3.25},
- {"label":"6", "x":2, "y":3.25},
- {"label":"+", "x":3, "y":2.25, "h":2},
- {"label":"F2", "x":4.25, "y":3.25},
- {"label":"1", "x":0, "y":4.25},
- {"label":"2", "x":1, "y":4.25},
- {"label":"3", "x":2, "y":4.25},
- {"label":"DEL", "x":4.25, "y":4.25},
- {"label":"0", "x":0, "y":5.25, "w":2},
- {"label":".", "x":2, "y":5.25},
- {"label":"Enter", "x":3, "y":4.25, "h":2},
- {"label":"BSPC", "x":4.25, "y":5.25}
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [1, 5], "x": 1, "y": 0},
+ {"matrix": [2, 5], "x": 2, "y": 0},
+ {"matrix": [3, 5], "x": 3, "y": 0},
+
+ {"matrix": [0, 4], "x": 0, "y": 1.25},
+ {"matrix": [1, 4], "x": 1, "y": 1.25},
+ {"matrix": [2, 4], "x": 2, "y": 1.25},
+ {"matrix": [3, 4], "x": 3, "y": 1.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 2.25},
+ {"matrix": [1, 3], "x": 1, "y": 2.25},
+ {"matrix": [2, 3], "x": 2, "y": 2.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 2.25},
+
+ {"matrix": [0, 2], "x": 0, "y": 3.25},
+ {"matrix": [1, 2], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2},
+ {"matrix": [4, 2], "x": 4.25, "y": 3.25},
+
+ {"matrix": [0, 1], "x": 0, "y": 4.25},
+ {"matrix": [1, 1], "x": 1, "y": 4.25},
+ {"matrix": [2, 1], "x": 2, "y": 4.25},
+ {"matrix": [4, 1], "x": 4.25, "y": 4.25},
+
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [2, 0], "x": 2, "y": 5.25},
+ {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2},
+ {"matrix": [4, 0], "x": 4.25, "y": 5.25}
]
}
}
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
deleted file mode 100644
index f2c5b9b8ed..0000000000
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/*
- * ,-----------------------.
- * | L05 | L15 | L25 | L35 |
- * |-----------------------+
- * | L04 | L14 | L24 | L34 |
- * |-----------------------------+
- * | L03 | L13 | L23 | | L43 |
- * |-----------------------------+
- * | L02 | L12 | L22 | L32 | L42 |
- * |-----------------------------+
- * | L01 | L11 | L21 | | L41 |
- * |-----------------------------+
- * | L00 | | L20 | L30 | L40 |
- * ,-----------------------------'
- */
-
-#define LAYOUT( \
- L05, L15, L25, L35, \
- L04, L14, L24, L34, \
- L03, L13, L23, L43, \
- L02, L12, L22, L32, L42, \
- L01, L11, L21, L41, \
- L00, L20, L30, L40 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- {KC_NO, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30,KC_NO, L32,KC_NO, L34, L35 }, \
- { L40, L41, L42, L43,KC_NO,KC_NO } \
- }
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index c362ba54e1..d0d3f1df63 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -24,95 +24,111 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":1.25, "y":0},
- {"label":"F2", "x":2.25, "y":0},
- {"label":"F3", "x":3.25, "y":0},
- {"label":"F4", "x":4.25, "y":0},
- {"label":"F5", "x":5.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":10.75, "y":0},
- {"label":"F10", "x":11.75, "y":0},
- {"label":"F11", "x":12.75, "y":0},
- {"label":"F12", "x":13.75, "y":0},
- {"label":"Insert", "x":15, "y":0},
- {"label":"Print Screen", "x":16, "y":0},
- {"label":"Hankaku/Zenkaku", "x":0, "y":1.25},
- {"label":"!", "x":1, "y":1.25},
- {"label":"\"", "x":2, "y":1.25},
- {"label":"#", "x":3, "y":1.25},
- {"label":"$", "x":4, "y":1.25},
- {"label":"%", "x":5, "y":1.25},
- {"label":"&", "x":7, "y":1.25},
- {"label":"'", "x":8, "y":1.25},
- {"label":"(", "x":9, "y":1.25},
- {"label":")", "x":10, "y":1.25},
- {"label":"", "x":11, "y":1.25},
- {"label":"=", "x":12, "y":1.25},
- {"label":"~", "x":13, "y":1.25},
- {"label":"|", "x":14, "y":1.25},
- {"label":"Back", "x":15, "y":1.25},
- {"label":"Del", "x":16, "y":1.25},
- {"label":"Tab", "x":0, "y":2.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.25},
- {"label":"W", "x":2.5, "y":2.25},
- {"label":"E", "x":3.5, "y":2.25},
- {"label":"R", "x":4.5, "y":2.25},
- {"label":"T", "x":5.5, "y":2.25},
- {"label":"Y", "x":7.5, "y":2.25},
- {"label":"U", "x":8.5, "y":2.25},
- {"label":"I", "x":9.5, "y":2.25},
- {"label":"O", "x":10.5, "y":2.25},
- {"label":"P", "x":11.5, "y":2.25},
- {"label":"`", "x":12.5, "y":2.25},
- {"label":"{", "x":13.5, "y":2.25},
- {"label":"Return", "x":14.75, "y":2.25, "w":1.25, "h":2},
- {"label":"Home", "x":16, "y":2.25},
- {"label":"Caps", "x":0, "y":3.25, "w":1.75},
- {"label":"A", "x":1.75, "y":3.25},
- {"label":"S", "x":2.75, "y":3.25},
- {"label":"D", "x":3.75, "y":3.25},
- {"label":"F", "x":4.75, "y":3.25},
- {"label":"G", "x":5.75, "y":3.25},
- {"label":"H", "x":7.75, "y":3.25},
- {"label":"J", "x":8.75, "y":3.25},
- {"label":"K", "x":9.75, "y":3.25},
- {"label":"L", "x":10.75, "y":3.25},
- {"label":"+", "x":11.75, "y":3.25},
- {"label":"*", "x":12.75, "y":3.25},
- {"label":"}", "x":13.75, "y":3.25},
- {"label":"End", "x":16, "y":3.25},
- {"label":"Shift", "x":0, "y":4.25, "w":2},
- {"label":"Z", "x":2, "y":4.25},
- {"label":"X", "x":3, "y":4.25},
- {"label":"C", "x":4, "y":4.25},
- {"label":"V", "x":5, "y":4.25},
- {"label":"B", "x":6, "y":4.25},
- {"label":"N", "x":8, "y":4.25},
- {"label":"M", "x":9, "y":4.25},
- {"label":"<", "x":10, "y":4.25},
- {"label":">", "x":11, "y":4.25},
- {"label":"?", "x":12, "y":4.25},
- {"label":"_", "x":13, "y":4.25},
- {"label":"PgDwn", "x":14, "y":4.25},
- {"label":"Up", "x":15, "y":4.25},
- {"label":"PgUp", "x":16, "y":4.25},
- {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.25},
- {"label":"Alt", "x":2.25, "y":5.25, "w":1.25},
- {"label":"Muhenkan", "x":3.5, "y":5.25},
- {"label":"Alt", "x":4.5, "y":5.25, "w":1.25},
- {"label":"1", "x":5.75, "y":5.25},
- {"label":"2", "x":7.75, "y":5.25},
- {"label":"Ctrl", "x":8.75, "y":5.25, "w":1.25},
- {"label":"Henkan", "x":10, "y":5.25, "w":1.25},
- {"label":"Kana", "x":11.25, "y":5.25, "w":1.25},
- {"label":"App", "x":12.5, "y":5.25},
- {"label":"Left", "x":14, "y":5.25},
- {"label":"Down", "x":15, "y":5.25},
- {"label":"Right", "x":16, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 0},
+ {"matrix": [7, 1], "x": 8.5, "y": 0},
+ {"matrix": [7, 2], "x": 9.5, "y": 0},
+
+ {"matrix": [7, 3], "x": 10.75, "y": 0},
+ {"matrix": [7, 4], "x": 11.75, "y": 0},
+ {"matrix": [7, 5], "x": 12.75, "y": 0},
+ {"matrix": [7, 6], "x": 13.75, "y": 0},
+
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 0], "x": 16, "y": 0},
+
+ {"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},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [8, 0], "x": 7, "y": 1.25},
+ {"matrix": [8, 1], "x": 8, "y": 1.25},
+ {"matrix": [8, 2], "x": 9, "y": 1.25},
+ {"matrix": [8, 3], "x": 10, "y": 1.25},
+ {"matrix": [8, 4], "x": 11, "y": 1.25},
+ {"matrix": [8, 5], "x": 12, "y": 1.25},
+ {"matrix": [8, 6], "x": 13, "y": 1.25},
+ {"matrix": [8, 7], "x": 14, "y": 1.25},
+ {"matrix": [13, 1], "x": 15, "y": 1.25},
+ {"matrix": [13, 2], "x": 16, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+ {"matrix": [13, 3], "x": 16, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+
+ {"matrix": [10, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [10, 6], "x": 13.75, "y": 3.25},
+ {"matrix": [10, 7], "x": 16, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2},
+ {"matrix": [4, 1], "x": 2, "y": 4.25},
+ {"matrix": [4, 2], "x": 3, "y": 4.25},
+ {"matrix": [4, 3], "x": 4, "y": 4.25},
+ {"matrix": [4, 4], "x": 5, "y": 4.25},
+ {"matrix": [4, 5], "x": 6, "y": 4.25},
+
+ {"matrix": [11, 0], "x": 8, "y": 4.25},
+ {"matrix": [11, 1], "x": 9, "y": 4.25},
+ {"matrix": [11, 2], "x": 10, "y": 4.25},
+ {"matrix": [11, 3], "x": 11, "y": 4.25},
+ {"matrix": [11, 4], "x": 12, "y": 4.25},
+ {"matrix": [11, 5], "x": 13, "y": 4.25},
+ {"matrix": [11, 6], "x": 14, "y": 4.25},
+ {"matrix": [11, 7], "x": 15, "y": 4.25},
+ {"matrix": [12, 7], "x": 16, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+
+ {"matrix": [12, 0], "x": 7.75, "y": 5.25},
+ {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 2], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 3], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 4], "x": 12.5, "y": 5.25},
+
+ {"matrix": [12, 5], "x": 14, "y": 5.25},
+ {"matrix": [12, 6], "x": 15, "y": 5.25},
+ {"matrix": [13, 4], "x": 16, "y": 5.25}
]
}
}
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
deleted file mode 100644
index 7a1887dc2d..0000000000
--- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright 2020 Salicylic_Acid
-
-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 | R60 |
- * |-------------------------------------- ------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R61 | R62 |
- * |---------------------------------------------------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 |
- * |---------------------------------------- ---------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | | R37 |
- * |---------------------------------------------------------------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 | R47 | R57 |
- * |------------------------------------------- -----------------------------------------------------+
- * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R52 | R53 | R54 | | R55 | R56 | R64 |
- * |---------------------------------------- ------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R61, R62, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R46, R47, R57, \
- L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, R55, R56, R64 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \
- { L50, L51, L52, L53, L54, L55, KC_NO, KC_NO }, \
- {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37 }, \
- { R40, R41, R42, R43, R44, R45, R46, R47 }, \
- { R50, R51, R52, R53, R54, R55, R56, R57 }, \
- { R60, R61, R62, R63, R64, KC_NO, KC_NO, KC_NO } \
- }
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index 0777289c5c..9dfb147f42 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -24,76 +24,92 @@
"layouts": {
"LAYOUT": {
"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},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"5,0", "x":6.75, "y":0},
- {"label":"5,1", "x":7.75, "y":0},
- {"label":"5,2", "x":8.75, "y":0},
- {"label":"5,3", "x":9.75, "y":0},
- {"label":"5,4", "x":10.75, "y":0},
- {"label":"5,5", "x":11.75, "y":0},
- {"label":"5,6", "x":12.75, "y":0},
- {"label":"5,7", "x":13.75, "y":0, "w":2},
- {"label":"5,8", "x":16.25, "y":0},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"6,0", "x":7.25, "y":1},
- {"label":"6,1", "x":8.25, "y":1},
- {"label":"6,2", "x":9.25, "y":1},
- {"label":"6,3", "x":10.25, "y":1},
- {"label":"6,4", "x":11.25, "y":1},
- {"label":"6,5", "x":12.25, "y":1},
- {"label":"6,6", "x":13.25, "y":1},
- {"label":"6,7", "x":14.25, "y":1, "w":1.5},
- {"label":"6,8", "x":16.25, "y":1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"7,0", "x":7.5, "y":2},
- {"label":"7,1", "x":8.5, "y":2},
- {"label":"7,2", "x":9.5, "y":2},
- {"label":"7,3", "x":10.5, "y":2},
- {"label":"7,4", "x":11.5, "y":2},
- {"label":"7,5", "x":12.5, "y":2},
- {"label":"7,6", "x":13.5, "y":2, "w":2.25},
- {"label":"7,8", "x":16.25, "y":2},
- {"label":"3,0", "x":0, "y":3, "w":2.25},
- {"label":"3,1", "x":2.25, "y":3},
- {"label":"3,2", "x":3.25, "y":3},
- {"label":"3,3", "x":4.25, "y":3},
- {"label":"3,4", "x":5.25, "y":3},
- {"label":"3,5", "x":6.25, "y":3},
- {"label":"8,0", "x":8, "y":3},
- {"label":"8,1", "x":9, "y":3},
- {"label":"8,2", "x":10, "y":3},
- {"label":"8,3", "x":11, "y":3},
- {"label":"8,4", "x":12, "y":3},
- {"label":"8,5", "x":13, "y":3, "w":1.75},
- {"label":"8,6", "x":15, "y":3.25},
- {"label":"8,8", "x":16.25, "y":3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4, "w":1.25},
- {"label":"4,2", "x":2.5, "y":4, "w":1.25},
- {"label":"4,3", "x":3.75, "y":4, "w":2},
- {"label":"4,4", "x":5.75, "y":4},
- {"label":"9,0", "x":7.5, "y":4, "w":2.75},
- {"label":"9,2", "x":10.25, "y":4, "w":1.25},
- {"label":"9,3", "x":11.5, "y":4, "w":1.25},
- {"label":"9,4", "x":12.75, "y":4},
- {"label":"9,6", "x":14, "y":4.25},
- {"label":"8,7", "x":15, "y":4.25},
- {"label":"9,7", "x":16, "y":4.25}]
+ {"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": [5, 0], "x": 6.75, "y": 0},
+ {"matrix": [5, 1], "x": 7.75, "y": 0},
+ {"matrix": [5, 2], "x": 8.75, "y": 0},
+ {"matrix": [5, 3], "x": 9.75, "y": 0},
+ {"matrix": [5, 4], "x": 10.75, "y": 0},
+ {"matrix": [5, 5], "x": 11.75, "y": 0},
+ {"matrix": [5, 6], "x": 12.75, "y": 0},
+ {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2},
+
+ {"matrix": [5, 8], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.25, "y": 1},
+ {"matrix": [6, 1], "x": 8.25, "y": 1},
+ {"matrix": [6, 2], "x": 9.25, "y": 1},
+ {"matrix": [6, 3], "x": 10.25, "y": 1},
+ {"matrix": [6, 4], "x": 11.25, "y": 1},
+ {"matrix": [6, 5], "x": 12.25, "y": 1},
+ {"matrix": [6, 6], "x": 13.25, "y": 1},
+ {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 8], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2},
+ {"matrix": [7, 1], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [7, 3], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 5], "x": 12.5, "y": 2},
+ {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 8], "x": 16.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 15, "y": 3.25},
+
+ {"matrix": [8, 8], "x": 16.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.75, "y": 4},
+
+ {"matrix": [9, 6], "x": 14, "y": 4.25},
+ {"matrix": [8, 7], "x": 15, "y": 4.25},
+ {"matrix": [9, 7], "x": 16, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/salicylic_acid3/nknl7en/nknl7en.h b/keyboards/salicylic_acid3/nknl7en/nknl7en.h
deleted file mode 100644
index 945e42956f..0000000000
--- a/keyboards/salicylic_acid3/nknl7en/nknl7en.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 | R08 |
- * |---------------------------------------------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R18 |
- * |---------------------------------------- ---------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R28 |
- * |---------------------------------------------------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R38 |
- * |------------------------------------------- -----------------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | | R40 | R42 | R43 | R44 | R46 | R37 | R47 |
- * |---------------------------------------- --------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R28, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R38, \
- L40, L41, L42, L43, L44, R40, R42, R43, R44, R46, R37, R47 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
- { R20, R21, R22, R23, R24, R25, R26, KC_NO, R28 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
- { R40, KC_NO, R42, R43, R44, KC_NO, R46, R47, KC_NO } \
- }
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index 83505e513c..3eb51b4965 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -24,77 +24,94 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"\"", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"&", "x":6.75, "y":0},
- {"label":"'", "x":7.75, "y":0},
- {"label":"(", "x":8.75, "y":0},
- {"label":")", "x":9.75, "y":0},
- {"label":"", "x":10.75, "y":0},
- {"label":"=", "x":11.75, "y":0},
- {"label":"~", "x":12.75, "y":0},
- {"label":"|", "x":13.75, "y":0},
- {"label":"Back", "x":14.75, "y":0},
- {"label":"Del", "x":16.25, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":7.25, "y":1},
- {"label":"U", "x":8.25, "y":1},
- {"label":"I", "x":9.25, "y":1},
- {"label":"O", "x":10.25, "y":1},
- {"label":"P", "x":11.25, "y":1},
- {"label":"`", "x":12.25, "y":1},
- {"label":"{", "x":13.25, "y":1},
- {"label":"Return", "x":14.5, "y":1, "w":1.25, "h":2},
- {"label":"Page", "x":16.25, "y":1},
- {"label":"CapsLock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":7.5, "y":2},
- {"label":"J", "x":8.5, "y":2},
- {"label":"K", "x":9.5, "y":2},
- {"label":"L", "x":10.5, "y":2},
- {"label":":", "x":11.5, "y":2},
- {"label":"\"", "x":12.5, "y":2},
- {"label":"}", "x":13.5, "y":2},
- {"label":"Page", "x":16.25, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":8, "y":3},
- {"label":"M", "x":9, "y":3},
- {"label":"<", "x":10, "y":3},
- {"label":">", "x":11, "y":3},
- {"label":"?", "x":12, "y":3},
- {"label":"_", "x":13, "y":3},
- {"label":"App", "x":14, "y":3},
- {"label":"\u2191", "x":15.25, "y":3.25},
- {"label":"Control", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4},
- {"label":"Alt", "x":2.25, "y":4, "w":1.25},
- {"label":"\u7121\u5909", "x":3.5, "y":4},
- {"x":4.5, "y":4, "w":1.25}, {"x":5.75, "y":4},
- {"x":7.5, "y":4}, {"x":8.5, "y":4, "w":1.75},
- {"label":"\u5909\u63db", "x":10.25, "y":4, "w":1.25},
- {"label":"\u304b\u306a", "x":11.5, "y":4, "w":1.25},
- {"label":"Alt", "x":12.75, "y":4, "w":1.25},
- {"label":"\u2190", "x":14.25, "y":4.25},
- {"label":"\u2193", "x":15.25, "y":4.25},
- {"label":"\u2192", "x":16.25, "y":4.25}]
+ {"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": [5, 0], "x": 6.75, "y": 0},
+ {"matrix": [5, 1], "x": 7.75, "y": 0},
+ {"matrix": [5, 2], "x": 8.75, "y": 0},
+ {"matrix": [5, 3], "x": 9.75, "y": 0},
+ {"matrix": [5, 4], "x": 10.75, "y": 0},
+ {"matrix": [5, 5], "x": 11.75, "y": 0},
+ {"matrix": [5, 6], "x": 12.75, "y": 0},
+ {"matrix": [5, 7], "x": 13.75, "y": 0},
+ {"matrix": [5, 8], "x": 14.75, "y": 0},
+
+ {"matrix": [6, 8], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.25, "y": 1},
+ {"matrix": [6, 1], "x": 8.25, "y": 1},
+ {"matrix": [6, 2], "x": 9.25, "y": 1},
+ {"matrix": [6, 3], "x": 10.25, "y": 1},
+ {"matrix": [6, 4], "x": 11.25, "y": 1},
+ {"matrix": [6, 5], "x": 12.25, "y": 1},
+ {"matrix": [6, 6], "x": 13.25, "y": 1},
+ {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [7, 8], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2},
+ {"matrix": [7, 1], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [7, 3], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 5], "x": 12.5, "y": 2},
+ {"matrix": [7, 6], "x": 13.5, "y": 2},
+
+ {"matrix": [7, 7], "x": 16.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 4},
+ {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.75},
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 7], "x": 14.25, "y": 4.25},
+ {"matrix": [8, 8], "x": 15.25, "y": 4.25},
+ {"matrix": [9, 8], "x": 16.25, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
deleted file mode 100644
index 3984ac7788..0000000000
--- a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 | R08 | R18 |
- * |---------------------------------------------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R28 |
- * |---------------------------------------- ---------------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 |
- * |---------------------------------------------------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37|
- * |------------------------------------------- -----------------------------------------------------+
- * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R47 | R38 | R48 |
- * |---------------------------------------- --------------------------------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, R18, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R28, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R47, R38, R48 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
- { 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, R38 }, \
- { R40, R41, R42, R43, R44, KC_NO, KC_NO, R47, R48 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 05:01:53 +0000