Merge branch 'develop'

3 files changed, 43 insertions, 110 deletions

diff --git a/keyboards/handwired/acacia/acacia.c b/keyboards/handwired/acacia/acacia.c
deleted file mode 100644
index 276b23552a..0000000000
--- a/keyboards/handwired/acacia/acacia.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>
- *
- * 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/>.
- */
-
-#include "acacia.h"
diff --git a/keyboards/handwired/acacia/acacia.h b/keyboards/handwired/acacia/acacia.h
deleted file mode 100644
index 060caa6adc..0000000000
--- a/keyboards/handwired/acacia/acacia.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com>
- *
- * 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"
-
-/*
- *             ┌───┐                                  ┌───┐
- *         ┌───┤02 ├───┐                          ┌───┤07 ├───┐
- *     ┌───┤01 ├───┤03 ├───┐                  ┌───┤06 ├───┤08 ├───┐
- * ┌───┤00 ├───┤12 ├───┤33 │                  │36 ├───┤17 ├───┤09 ├───┐
- * │30 ├───┤11 ├───┤13 ├───┤                  ├───┤16 ├───┤18 ├───┤39 │
- * ├───┤10 ├───┤22 ├───┤43 │                  │46 ├───┤27 ├───┤19 ├───┤
- * │40 ├───┤21 ├───┤23 ├───┘                  └───┤26 ├───┤28 ├───┤49 │
- * └───┤20 ├───┘   └───┘                          └───┘   └───┤29 ├───┘
- *     └───┘ ┌───┐ ┌───┬───┐                  ┌───┬───┐ ┌───┐ └───┘
- *           │04 │ │14 │24 ├───┐          ┌───┤25 │15 │ │05 │
- *           └───┘ └───┤   │34 ├───┐  ┌───┤35 │   ├───┘ └───┘ ┌───┐
- *                     └───┤   │44 │  │45 │   ├───┘           │38+│
- *                         └───┤   │  │   ├───┘               └───┘
- *                             └───┘  └───┘
- * + K38 is hidden.
- */
-#define LAYOUT( \
-  K30, K00, K01, K02, K03, K33,           K36, K06, K07, K08, K09, K39, \
-  K40, K10, K11, K12, K13, K43,           K46, K16, K17, K18, K19, K49, \
-       K20, K21, K22, K23,                     K26, K27, K28, K29, \
-       K04, K14, K24, K34, K44,           K45, K35, K25, K15, K05, K38 \
-) { \
-    { K00, K01,   K02,   K03, K04, K05, K06, K07,   K08,   K09 }, \
-    { K10, K11,   K12,   K13, K14, K15, K16, K17,   K18,   K19 }, \
-    { K20, K21,   K22,   K23, K24, K25, K26, K27,   K28,   K29 }, \
-    { K30, KC_NO, KC_NO, K33, K34, K35, K36, KC_NO, K38,   K39 }, \
-    { K40, KC_NO, KC_NO, K43, K44, K45, K46, KC_NO, KC_NO, K49 }, \
-}
diff --git a/keyboards/handwired/acacia/info.json b/keyboards/handwired/acacia/info.json
index 8054fff3ac..65a4b49a69 100644
--- a/keyboards/handwired/acacia/info.json
+++ b/keyboards/handwired/acacia/info.json
@@ -20,57 +20,56 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"B", "x":0, "y":0.5},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0.5},
+                {"matrix": [3, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 3], "x": 5, "y": 0.5},
 
-                {"label":"H", "x":10.5, "y":0.5},
-                {"label":"U", "x":11.5, "y":0},
-                {"label":"I", "x":12.5, "y":0},
-                {"label":"O", "x":13.5, "y":0},
-                {"label":"P", "x":14.5, "y":0},
-                {"label":"Y", "x":15.5, "y":0.5},
+                {"matrix": [3, 6], "x": 10.5, "y": 0.5},
+                {"matrix": [0, 6], "x": 11.5, "y": 0},
+                {"matrix": [0, 7], "x": 12.5, "y": 0},
+                {"matrix": [0, 8], "x": 13.5, "y": 0},
+                {"matrix": [0, 9], "x": 14.5, "y": 0},
+                {"matrix": [3, 9], "x": 15.5, "y": 0.5},
 
-                {"label":"Tab", "x":0, "y":1.5},
-                {"label":"A", "x":1, "y":1},
-                {"label":"S", "x":2, "y":1},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1},
-                {"label":"G", "x":5, "y":1.5},
+                {"matrix": [4, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [4, 3], "x": 5, "y": 1.5},
 
-                {"label":"N", "x":10.5, "y":1.5},
-                {"label":"J", "x":11.5, "y":1},
-                {"label":"K", "x":12.5, "y":1},
-                {"label":"L", "x":13.5, "y":1},
-                {"label":":", "x":14.5, "y":1},
-                {"label":"Enter", "x":15.5, "y":1.5},
+                {"matrix": [4, 6], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 11.5, "y": 1},
+                {"matrix": [1, 7], "x": 12.5, "y": 1},
+                {"matrix": [1, 8], "x": 13.5, "y": 1},
+                {"matrix": [1, 9], "x": 14.5, "y": 1},
+                {"matrix": [4, 9], "x": 15.5, "y": 1.5},
 
-                {"label":"Z", "x":1, "y":2},
-                {"label":"X", "x":2, "y":2},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2},
+                {"matrix": [2, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
 
-                {"label":"M", "x":11.5, "y":2},
-                {"label":"<", "x":12.5, "y":2},
-                {"label":">", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
+                {"matrix": [2, 6], "x": 11.5, "y": 2},
+                {"matrix": [2, 7], "x": 12.5, "y": 2},
+                {"matrix": [2, 8], "x": 13.5, "y": 2},
+                {"matrix": [2, 9], "x": 14.5, "y": 2},
 
-                {"label":"Next", "x":2.25, "y":3},
-                {"label":"Alt", "x":3.5, "y":3},
-                {"label":"BS", "x":4.5, "y":3},
-                {"label":"Esc", "x":5.5, "y":3},
-                {"label":"Shift", "x":6.5, "y":3},
+                {"matrix": [0, 4], "x": 2.25, "y": 3},
+                {"matrix": [1, 4], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [4, 4], "x": 6.5, "y": 3},
+                {"matrix": [4, 5], "x": 9.25, "y": 3},
 
-                {"label":"RAlt", "x":9.25, "y":3},
-                {"label":"Space", "x":10.25, "y":3},
-                {"label":"Del", "x":11.25, "y":3},
-                {"label":"Alt", "x":12.25, "y":3},
-                {"label":"Play", "x":13.5, "y":3},
-
-                {"label":"Debug", "x":8, "y":1}
+                {"matrix": [3, 5], "x": 10.25, "y": 3},
+                {"matrix": [2, 5], "x": 11.25, "y": 3},
+                {"matrix": [1, 5], "x": 12.25, "y": 3},
+                {"matrix": [0, 5], "x": 13.5, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 1}
             ]
         }
     }