Merge branch 'develop'

4 files changed, 92 insertions, 162 deletions

diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h
index 5001da5590..3cf449a32b 100644
--- a/keyboards/roseslite/config.h
+++ b/keyboards/roseslite/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/roseslite/info.json b/keyboards/roseslite/info.json
index 81572eac9f..0d8931301c 100644
--- a/keyboards/roseslite/info.json
+++ b/keyboards/roseslite/info.json
@@ -8,98 +8,103 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-
-                {"x": 1.5, "y": 0},
-                {"x": 2.5, "y": 0},
-                {"x": 3.5, "y": 0},
-                {"x": 4.5, "y": 0},
-                {"x": 5.5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0},
-                {"x": 17, "y": 0},
-
-                {"x": 18.5, "y": 0},
-
-                {"x": 0, "y": 1},
-
-                {"x": 1.5, "y": 1, "w": 1.5},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1},
-                {"x": 14.5, "y": 1},
-                {"x": 15.5, "y": 1},
-                {"x": 16.5, "y": 1, "w": 1.5},
-
-                {"x": 18.5, "y": 1},
-
-                {"x": 0, "y": 2},
-
-                {"x": 1.5, "y": 2, "w": 1.75},
-                {"x": 3.25, "y": 2},
-                {"x": 4.25, "y": 2},
-                {"x": 5.25, "y": 2},
-                {"x": 6.25, "y": 2},
-                {"x": 7.25, "y": 2},
-
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2},
-                {"x": 14.75, "y": 2},
-                {"x": 15.75, "y": 2, "w": 2.25},
-
-                {"x": 18.5, "y": 2},
-
-                {"x": 1.5, "y": 3, "w": 2},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3},
-                {"x": 13.25, "y": 3},
-                {"x": 14.25, "y": 3},
-                {"x": 15.25, "y": 3, "w": 1.75},
-
-                {"x": 17.5, "y": 3},
-
-                {"x": 1.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 1.25},
-                {"x": 5, "y": 4, "w": 2.75},
-                {"x": 7.75, "y": 4},
-
-                {"x": 10.25, "y": 4, "w": 2.75},
-                {"x": 13, "y": 4, "w": 1.25},
-
-                {"x": 16.5, "y": 4},
-                {"x": 17.5, "y": 4},
-                {"x": 18.5, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 14], "x": 18.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 7], "x": 10.5, "y": 1},
+                {"matrix": [1, 8], "x": 11.5, "y": 1},
+                {"matrix": [1, 9], "x": 12.5, "y": 1},
+                {"matrix": [1, 10], "x": 13.5, "y": 1},
+                {"matrix": [1, 11], "x": 14.5, "y": 1},
+                {"matrix": [1, 12], "x": 15.5, "y": 1},
+                {"matrix": [1, 13], "x": 16.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 18.5, "y": 1},
+
+                {"matrix": [4, 2], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2},
+                {"matrix": [2, 7], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 9], "x": 12.75, "y": 2},
+                {"matrix": [2, 10], "x": 13.75, "y": 2},
+                {"matrix": [2, 11], "x": 14.75, "y": 2},
+                {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 18.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 6], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 15.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 5, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 7.75, "y": 4},
+
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.5, "y": 4},
+                {"matrix": [4, 13], "x": 17.5, "y": 4},
+                {"matrix": [4, 14], "x": 18.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/roseslite/roseslite.c b/keyboards/roseslite/roseslite.c
deleted file mode 100644
index fa3a93fed7..0000000000
--- a/keyboards/roseslite/roseslite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Fate
- *
- * 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 "roseslite.h"
diff --git a/keyboards/roseslite/roseslite.h b/keyboards/roseslite/roseslite.h
deleted file mode 100644
index 1fcaaffa13..0000000000
--- a/keyboards/roseslite/roseslite.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 vk2fgav
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define XXX KC_NO
-#define LAYOUT( \
-    k40, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
-    k41, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k2E, \
-    k42, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k3E, \
-         k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,           \
-         k45,      k47,      k48, k49, k4A,           k4B,           k4C, k4D, k4E       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, k4A, k4B, k4C, k4D, k4E }  \
-}