Merge branch 'develop'

4 files changed, 82 insertions, 341 deletions

diff --git a/keyboards/nemui/config.h b/keyboards/nemui/config.h
index 04f94fe86c..a371cd708d 100644
--- a/keyboards/nemui/config.h
+++ b/keyboards/nemui/config.h
@@ -16,10 +16,6 @@
  */
 #pragma once
 
-#define MATRIX_COL_PINS { B2, B1, B0, B10, B11, A7, B12, B13, B14, A10, A9, A8, B7, B8, B9 }
-#define MATRIX_ROW_PINS { A3, A4, A5, A6, A2 }
-#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/nemui/info.json b/keyboards/nemui/info.json
index 3ac29f519c..867512a8f5 100644
--- a/keyboards/nemui/info.json
+++ b/keyboards/nemui/info.json
@@ -8,294 +8,89 @@
     "pid": "0x2371",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B1", "B0", "B10", "B11", "A7", "B12", "B13", "B14", "A10", "A9", "A8", "B7", "B8", "B9"],
+    "rows": ["A3", "A4", "A5", "A6", "A2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
   "layouts": {
-    "LAYOUT": {
-      "layout": [
-    {
-      "x": 0,
-      "y": 0
-    },
-    {
-      "x": 1,
-      "y": 0
-    },
-    {
-      "x": 2,
-      "y": 0
-    },
-    {
-      "x": 3,
-      "y": 0
-    },
-    {
-      "x": 4,
-      "y": 0
-    },
-    {
-      "x": 5,
-      "y": 0
-    },
-    {
-      "x": 6,
-      "y": 0
-    },
-    {
-      "x": 7,
-      "y": 0
-    },
-    {
-      "x": 8,
-      "y": 0
-    },
-    {
-      "x": 9,
-      "y": 0
-    },
-    {
-      "x": 10,
-      "y": 0
-    },
-    {
-      "x": 11,
-      "y": 0
-    },
-    {
-      "x": 12,
-      "y": 0
-    },
-    {
-      "x": 13,
-      "y": 0,
-      "w": 1
-    },
-    {
-      "x": 14,
-      "y": 0,
-      "w": 1
-    },
-    {
-      "x": 0,
-      "y": 1,
-      "w": 1.5
-    },
-    {
-      "x": 1.5,
-      "y": 1
-    },
-    {
-      "x": 2.5,
-      "y": 1
-    },
-    {
-      "x": 3.5,
-      "y": 1
-    },
-    {
-      "x": 4.5,
-      "y": 1
-    },
-    {
-      "x": 5.5,
-      "y": 1
-    },
-    {
-      "x": 6.5,
-      "y": 1
-    },
-    {
-      "x": 7.5,
-      "y": 1
-    },
-    {
-      "x": 8.5,
-      "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,
-      "w": 1.5
-    },
-    {
-      "x": 15,
-      "y": 1
-    },
-    {
-      "x": 0,
-      "y": 2,
-      "w": 1.75
-    },
-    {
-      "x": 1.75,
-      "y": 2
-    },
-    {
-      "x": 2.75,
-      "y": 2
-    },
-    {
-      "x": 3.75,
-      "y": 2
-    },
-    {
-      "x": 4.75,
-      "y": 2
-    },
-    {
-      "x": 5.75,
-      "y": 2
-    },
-    {
-      "x": 6.75,
-      "y": 2
-    },
-    {
-      "x": 7.75,
-      "y": 2
-    },
-    {
-      "x": 8.75,
-      "y": 2
-    },
-    {
-      "x": 9.75,
-      "y": 2
-    },
-    {
-      "x": 10.75,
-      "y": 2
-    },
-    {
-      "x": 11.75,
-      "y": 2
-    },
-    {
-      "x": 12.75,
-      "y": 2,
-      "w": 2.25
-    },
-    {
-      "x": 15,
-      "y": 2
-    },
-    {
-      "x": 0,
-      "y": 3,
-      "w": 2.25
-    },
-    {
-      "x": 2.25,
-      "y": 3
-    },
-    {
-      "x": 3.25,
-      "y": 3
-    },
-    {
-      "x": 4.25,
-      "y": 3
-    },
-    {
-      "x": 5.25,
-      "y": 3
-    },
-    {
-      "x": 6.25,
-      "y": 3
-    },
-    {
-      "x": 7.25,
-      "y": 3
-    },
-    {
-      "x": 8.25,
-      "y": 3
-    },
-    {
-      "x": 9.25,
-      "y": 3
-    },
-    {
-      "x": 10.25,
-      "y": 3
-    },
-    {
-      "x": 11.25,
-      "y": 3
-    },
-    {
-      "x": 12.25,
-      "y": 3,
-      "w": 1.75
-    },
-    {
-      "x": 14,
-      "y": 3
-    },
-    {
-      "x": 15,
-      "y": 3
-    },
-    {
-      "x": 0,
-      "y": 4,
-      "w": 1.25
-    },
-    {
-      "x": 1.25,
-      "y": 4,
-      "w": 1.25
-    },
-    {
-      "x": 2.5,
-      "y": 4,
-      "w": 1.25
-    },
-    {
-      "x": 3.75,
-      "y": 4,
-      "w": 6.25
-    },
-    {
-      "x": 10,
-      "y": 4,
-      "w": 1.25
-    },
-    {
-      "x": 11.25,
-      "y": 4,
-      "w": 1.25
-    },
-    {
-      "x": 13,
-      "y": 4
-    },
-    {
-      "x": 14,
-      "y": 4
-    },
-    {
-      "x": 15,
-      "y": 4
-    }
-  ]
-}
-}
+      "LAYOUT": {
+          "layout": [
+              {"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": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 10, "y": 0},
+              {"matrix": [0, 11], "x": 11, "y": 0},
+              {"matrix": [0, 12], "x": 12, "y": 0},
+              {"matrix": [0, 13], "x": 13, "y": 0},
+              {"matrix": [0, 14], "x": 14, "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": [1, 6], "x": 6.5, "y": 1},
+              {"matrix": [1, 7], "x": 7.5, "y": 1},
+              {"matrix": [1, 8], "x": 8.5, "y": 1},
+              {"matrix": [1, 9], "x": 9.5, "y": 1},
+              {"matrix": [1, 10], "x": 10.5, "y": 1},
+              {"matrix": [1, 11], "x": 11.5, "y": 1},
+              {"matrix": [1, 12], "x": 12.5, "y": 1},
+              {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+              {"matrix": [1, 14], "x": 15, "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": [2, 6], "x": 6.75, "y": 2},
+              {"matrix": [2, 7], "x": 7.75, "y": 2},
+              {"matrix": [2, 8], "x": 8.75, "y": 2},
+              {"matrix": [2, 9], "x": 9.75, "y": 2},
+              {"matrix": [2, 10], "x": 10.75, "y": 2},
+              {"matrix": [2, 11], "x": 11.75, "y": 2},
+              {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+              {"matrix": [2, 14], "x": 15, "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": [3, 6], "x": 7.25, "y": 3},
+              {"matrix": [3, 7], "x": 8.25, "y": 3},
+              {"matrix": [3, 8], "x": 9.25, "y": 3},
+              {"matrix": [3, 9], "x": 10.25, "y": 3},
+              {"matrix": [3, 10], "x": 11.25, "y": 3},
+              {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+              {"matrix": [3, 12], "x": 14, "y": 3},
+              {"matrix": [3, 14], "x": 15, "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, 5], "x": 3.75, "y": 4, "w": 6.25},
+              {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+              {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+              {"matrix": [4, 11], "x": 13, "y": 4},
+              {"matrix": [4, 12], "x": 14, "y": 4},
+              {"matrix": [4, 14], "x": 15, "y": 4}
+          ]
+      }
+  }
 }
diff --git a/keyboards/nemui/nemui.c b/keyboards/nemui/nemui.c
deleted file mode 100644
index cdfebb0555..0000000000
--- a/keyboards/nemui/nemui.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2020 Bachoo
- *
- * 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 "nemui.h"
diff --git a/keyboards/nemui/nemui.h b/keyboards/nemui/nemui.h
deleted file mode 100644
index 87c9626ed3..0000000000
--- a/keyboards/nemui/nemui.h
+++ /dev/null
@@ -1,34 +0,0 @@
- /* Copyright 2020 Bachoo
- *
- * 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"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-    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,      k2e, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e, \
-    k40, k41, k42,           k45,                k49, k4a, k4b, k4c,      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, ___, k2e }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, k3e }, \
-    { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4a, k4b, k4c, ___, k4e }  \
-}