Merge branch 'develop'

4 files changed, 80 insertions, 96 deletions

diff --git a/keyboards/handwired/concertina/64key/64key.c b/keyboards/handwired/concertina/64key/64key.c
deleted file mode 100644
index 31211b0a9a..0000000000
--- a/keyboards/handwired/concertina/64key/64key.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 Viktor Eikman
- *
- * 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 "64key.h"
diff --git a/keyboards/handwired/concertina/64key/64key.h b/keyboards/handwired/concertina/64key/64key.h
deleted file mode 100644
index a9e557fc78..0000000000
--- a/keyboards/handwired/concertina/64key/64key.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2020-2021 Viktor Eikman
- *
- * 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"
-
-/*
- * The matrix is constructed for ease of soldering and for density.
- * The nomenclature is <side><cluster>_<column><row>.
- *
- * L: Left hand.
- * R: Right hand.
- * T: Thumb cluster.
- * M: Main cluster.
- *
- * Numbers increase going to the right and away from the user on the
- * right-hand side of the keyboard, looking directly at each of the two
- * key clusters (main and thumb), one by one.
- * This coordinate system is mirrored for the left-hand side.
- */
-
-#define LAYOUT_64key( \
-                  LT_32, LT_22, LT_12,                 RT_12, RT_22, RT_32,               \
-                  LT_31, LT_21, LT_11, LT_01,   RT_01, RT_11, RT_21, RT_31,               \
-                         LT_20, LT_10, LT_00,   RT_00, RT_10, RT_20,                      \
-                                                                                          \
-                  LM_34, LM_24, LM_14, LM_04,   RM_04, RM_14, RM_24, RM_34,               \
-    LM_53, LM_43, LM_33, LM_23, LM_13, LM_03,   RM_03, RM_13, RM_23, RM_33, RM_43, RM_53, \
-    LM_52, LM_42, LM_32, LM_22, LM_12, LM_02,   RM_02, RM_12, RM_22, RM_32, RM_42, RM_52, \
-    LM_51, LM_41, LM_31, LM_21, LM_11,                 RM_11, RM_21, RM_31, RM_41, RM_51, \
-                         LM_20,                               RM_20                       \
-  ) \
-  { \
-    { LT_00, LT_10, LT_20, LT_31, LM_20, LM_31, LM_41, LM_51 }, \
-    { LT_01, LT_11, LT_21, LM_11, LM_21, LM_32, LM_42, LM_52 }, \
-    { LT_12, LT_22, LT_32, LM_12, LM_22, LM_33, LM_43, LM_53 }, \
-    { LM_02, LM_03, LM_04, LM_13, LM_23, LM_14, LM_24, LM_34 }, \
-    { RT_00, RT_10, RT_20, RT_31, RM_20, RM_31, RM_41, RM_51 }, \
-    { RT_01, RT_11, RT_21, RM_11, RM_21, RM_32, RM_42, RM_52 }, \
-    { RT_12, RT_22, RT_32, RM_12, RM_22, RM_33, RM_43, RM_53 }, \
-    { RM_02, RM_03, RM_04, RM_13, RM_23, RM_14, RM_24, RM_34 }, \
-  }
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index 2eb9a4cd67..b315e309ae 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -16,14 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
 /* LEDs are not used in the standard 64key configuration. */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 0
 
-#define DIODE_DIRECTION COL2ROW
-
 #define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 39db710673..1bca5a6fa4 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,34 +8,98 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_64key": {
             "layout": [
-                {"x":2.5, "y":0.4}, {"x":3.5, "y":0}, {"x":4.5, "y":0.3},
-                {"x":8.5, "y":0.3}, {"x":9.5, "y":0}, {"x":10.5, "y":0.4},
+                {"matrix": [2, 2], "x": 2.5, "y": 0.4},
+                {"matrix": [2, 1], "x": 3.5, "y": 0},
+                {"matrix": [2, 0], "x": 4.5, "y": 0.3},
+
+                {"matrix": [6, 0], "x": 8.5, "y": 0.3},
+                {"matrix": [6, 1], "x": 9.5, "y": 0},
+                {"matrix": [6, 2], "x": 10.5, "y": 0.4},
+
+                {"matrix": [0, 3], "x": 2.5, "y": 1.4},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 1], "x": 4.5, "y": 1.3},
+                {"matrix": [1, 0], "x": 5.5, "y": 0.9},
+
+                {"matrix": [5, 0], "x": 7.5, "y": 0.9},
+                {"matrix": [5, 1], "x": 8.5, "y": 1.3},
+                {"matrix": [5, 2], "x": 9.5, "y": 1},
+                {"matrix": [4, 3], "x": 10.5, "y": 1.4},
+
+                {"matrix": [0, 2], "x": 3.5, "y": 2},
+                {"matrix": [0, 1], "x": 4.5, "y": 2.3},
+                {"matrix": [0, 0], "x": 5.5, "y": 1.9},
+
+                {"matrix": [4, 0], "x": 7.5, "y": 1.9},
+                {"matrix": [4, 1], "x": 8.5, "y": 2.3},
+                {"matrix": [4, 2], "x": 9.5, "y": 2},
+
+                {"matrix": [3, 7], "x": 2, "y": 4},
+                {"matrix": [3, 6], "x": 3, "y": 3.8},
+                {"matrix": [3, 5], "x": 4, "y": 4},
+                {"matrix": [3, 2], "x": 5, "y": 4.3},
+
+                {"matrix": [7, 2], "x": 8, "y": 4.3},
+                {"matrix": [7, 5], "x": 9, "y": 4},
+                {"matrix": [7, 6], "x": 10, "y": 3.8},
+                {"matrix": [7, 7], "x": 11, "y": 4},
+
+                {"matrix": [2, 7], "x": 0, "y": 5},
+                {"matrix": [2, 6], "x": 1, "y": 5},
+                {"matrix": [2, 5], "x": 2, "y": 5},
+                {"matrix": [3, 4], "x": 3, "y": 4.8},
+                {"matrix": [3, 3], "x": 4, "y": 5},
+                {"matrix": [3, 1], "x": 5, "y": 5.3},
 
-                {"x":2.5, "y":1.4}, {"x":3.5, "y":1}, {"x":4.5, "y":1.3}, {"x":5.5, "y":0.9},
-                {"x":7.5, "y":0.9}, {"x":8.5, "y":1.3}, {"x":9.5, "y":1}, {"x":10.5, "y":1.4},
+                {"matrix": [7, 1], "x": 8, "y": 5.3},
+                {"matrix": [7, 3], "x": 9, "y": 5},
+                {"matrix": [7, 4], "x": 10, "y": 4.8},
+                {"matrix": [6, 5], "x": 11, "y": 5},
+                {"matrix": [6, 6], "x": 12, "y": 5},
+                {"matrix": [6, 7], "x": 13, "y": 5},
 
-                {"x":3.5, "y":2}, {"x":4.5, "y":2.3}, {"x":5.5, "y":1.9},
-                {"x":7.5, "y":1.9}, {"x":8.5, "y":2.3}, {"x":9.5, "y":2},
+                {"matrix": [1, 7], "x": 0, "y": 6},
+                {"matrix": [1, 6], "x": 1, "y": 6},
+                {"matrix": [1, 5], "x": 2, "y": 6},
+                {"matrix": [2, 4], "x": 3, "y": 5.8},
+                {"matrix": [2, 3], "x": 4, "y": 6},
+                {"matrix": [3, 0], "x": 5, "y": 6.3},
 
-                {"x":2, "y":4}, {"x":3, "y":3.8}, {"x":4, "y":4}, {"x":5, "y":4.3},
-                {"x":8, "y":4.3}, {"x":9, "y":4}, {"x":10, "y":3.8}, {"x":11, "y":4},
+                {"matrix": [7, 0], "x": 8, "y": 6.3},
+                {"matrix": [6, 3], "x": 9, "y": 6},
+                {"matrix": [6, 4], "x": 10, "y": 5.8},
+                {"matrix": [5, 5], "x": 11, "y": 6},
+                {"matrix": [5, 6], "x": 12, "y": 6},
+                {"matrix": [5, 7], "x": 13, "y": 6},
 
-                {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":4.8}, {"x":4, "y":5}, {"x":5, "y":5.3},
-                {"x":8, "y":5.3}, {"x":9, "y":5}, {"x":10, "y":4.8}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5},
+                {"matrix": [0, 7], "x": 0, "y": 7},
+                {"matrix": [0, 6], "x": 1, "y": 7},
+                {"matrix": [0, 5], "x": 2, "y": 7},
+                {"matrix": [1, 4], "x": 3, "y": 6.8},
+                {"matrix": [1, 3], "x": 4, "y": 7},
 
-                {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":5.8}, {"x":4, "y":6}, {"x":5, "y":6.3},
-                {"x":8, "y":6.3}, {"x":9, "y":6}, {"x":10, "y":5.8}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6},
+                {"matrix": [5, 3], "x": 9, "y": 7},
+                {"matrix": [5, 4], "x": 10, "y": 6.8},
+                {"matrix": [4, 5], "x": 11, "y": 7},
+                {"matrix": [4, 6], "x": 12, "y": 7},
+                {"matrix": [4, 7], "x": 13, "y": 7},
 
-                {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":6.8}, {"x":4, "y":7},
-                {"x":9, "y":7}, {"x":10, "y":6.8}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7},
+                {"matrix": [0, 4], "x": 3, "y": 7.8},
 
-                {"x":3, "y":7.8},
-                {"x":10, "y":7.8}
+                {"matrix": [4, 4], "x": 10, "y": 7.8}
             ]
         }
     }