Merge branch 'develop'

4 files changed, 80 insertions, 131 deletions

diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index 0e5ca7a6b6..ef9b518920 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -15,16 +15,10 @@
  */
 #pragma once
 
-#define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { F4, F1, F7, B2, D1, D2, B3, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define GRAVE_ESC_CTRL_OVERRIDE
 
 /* RGB Light Configuration */
 
-#define RGB_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,7 +34,6 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 200
 
 /* Handle volume control issue with rotary encoder */
 
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index 7455762b51..a226d236c3 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB44C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F7", "B2", "D1", "D2", "B3", "B1"],
+        "rows": ["E6", "F0", "F5", "F6", "C7", "C6", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "B0"}
@@ -21,84 +26,89 @@
     "indicators": {
         "caps_lock": "B6"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"0,0", "x":0.62, "y":0.25},
-                {"label":"1,0", "x":1.62, "y":0.25},
-                {"label":"0,1", "x":2.62, "y":0.19},
-                {"label":"1,1", "x":4, "y":0.44},
-                {"label":"0,2", "x":5, "y":0.44},
-                {"label":"1,2", "x":6, "y":0.44},
-                {"label":"0,3", "x":7, "y":0.44},
-                {"label":"1,3", "x":10.25, "y":0.44},
-                {"label":"0,4", "x":11.25, "y":0.44},
-                {"label":"1,4", "x":12.25, "y":0.44},
-                {"label":"0,5", "x":13.25, "y":0.44},
-                {"label":"1,5", "x":14.94, "y":0.19},
-                {"label":"0,6", "x":15.94, "y":0.25},
-                {"label":"1,6", "x":16.94, "y":0.25, "w":2},
-                {"label":"0,7", "x":19.19, "y":0},
-
+                {"matrix": [0, 0], "x": 0.62, "y": 0.25},
+                {"matrix": [1, 0], "x": 1.62, "y": 0.25},
+                {"matrix": [0, 1], "x": 2.62, "y": 0.19},
+                {"matrix": [1, 1], "x": 4, "y": 0.44},
+                {"matrix": [0, 2], "x": 5, "y": 0.44},
+                {"matrix": [1, 2], "x": 6, "y": 0.44},
+                {"matrix": [0, 3], "x": 7, "y": 0.44},
+                {"matrix": [1, 3], "x": 10.25, "y": 0.44},
+                {"matrix": [0, 4], "x": 11.25, "y": 0.44},
+                {"matrix": [1, 4], "x": 12.25, "y": 0.44},
+                {"matrix": [0, 5], "x": 13.25, "y": 0.44},
+                {"matrix": [1, 5], "x": 14.94, "y": 0.19},
+                {"matrix": [0, 6], "x": 15.94, "y": 0.25},
+                {"matrix": [1, 6], "x": 16.94, "y": 0.25, "w": 2},
+                {"matrix": [0, 7], "x": 19.19, "y": 0},
 
-                {"label":"2,0", "x":0.43, "y":1.25, "w":1.5},
-                {"label":"3,0", "x":1.93, "y":1.25},
-                {"label":"2,1", "x":3.5, "y":1.44},
-                {"label":"3,1", "x":4.5, "y":1.44},
-                {"label":"2,2", "x":5.5, "y":1.44},
-                {"label":"3,2", "x":6.5, "y":1.44},
-                {"label":"2,3", "x":9.75, "y":1.44},
-                {"label":"3,3", "x":10.75, "y":1.44},
-                {"label":"2,4", "x":11.75, "y":1.44},
-                {"label":"3,4", "x":12.75, "y":1.44},
-                {"label":"2,5", "x":13.75, "y":1.44},
-                {"label":"3,5", "x":15.69, "y":1.25},
-                {"label":"2,6", "x":16.69, "y":1.25},
-                {"label":"3,6", "x":17.94, "y":1.25, "w":1.25, "h":2},
-                {"label":"2,7", "x":19.44, "y":1},
+                {"matrix": [2, 0], "x": 0.43, "y": 1.25, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.93, "y": 1.25},
+                {"matrix": [2, 1], "x": 3.5, "y": 1.44},
+                {"matrix": [3, 1], "x": 4.5, "y": 1.44},
+                {"matrix": [2, 2], "x": 5.5, "y": 1.44},
+                {"matrix": [3, 2], "x": 6.5, "y": 1.44},
+                {"matrix": [2, 3], "x": 9.75, "y": 1.44},
+                {"matrix": [3, 3], "x": 10.75, "y": 1.44},
+                {"matrix": [2, 4], "x": 11.75, "y": 1.44},
+                {"matrix": [3, 4], "x": 12.75, "y": 1.44},
+                {"matrix": [2, 5], "x": 13.75, "y": 1.44},
+                {"matrix": [3, 5], "x": 15.69, "y": 1.25},
+                {"matrix": [2, 6], "x": 16.69, "y": 1.25},
+                {"matrix": [3, 6], "x": 17.94, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 7], "x": 19.44, "y": 1},
 
-                {"label":"4,0", "x":0.18, "y":2.25, "w":1.75},
-                {"label":"5,0", "x":1.93, "y":2.25},
-                {"label":"4,1", "x":3.75, "y":2.44},
-                {"label":"5,1", "x":4.75, "y":2.44},
-                {"label":"4,2", "x":5.75, "y":2.44},
-                {"label":"5,2", "x":6.75, "y":2.44},
-                {"label":"4,3", "x":10, "y":2.44},
-                {"label":"5,3", "x":11, "y":2.44},
-                {"label":"4,4", "x":12, "y":2.44},
-                {"label":"5,4", "x":13, "y":2.44},
-                {"label":"4,5", "x":14.94, "y":2.25},
-                {"label":"5,5", "x":15.94, "y":2.25},
-                {"label":"4,6", "x":16.94, "y":2.25},
-                {"label":"4,7", "x":19.69, "y":2.0},
+                {"matrix": [4, 0], "x": 0.18, "y": 2.25, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.93, "y": 2.25},
+                {"matrix": [4, 1], "x": 3.75, "y": 2.44},
+                {"matrix": [5, 1], "x": 4.75, "y": 2.44},
+                {"matrix": [4, 2], "x": 5.75, "y": 2.44},
+                {"matrix": [5, 2], "x": 6.75, "y": 2.44},
+                {"matrix": [4, 3], "x": 10, "y": 2.44},
+                {"matrix": [5, 3], "x": 11, "y": 2.44},
+                {"matrix": [4, 4], "x": 12, "y": 2.44},
+                {"matrix": [5, 4], "x": 13, "y": 2.44},
+                {"matrix": [4, 5], "x": 14.94, "y": 2.25},
+                {"matrix": [5, 5], "x": 15.94, "y": 2.25},
+                {"matrix": [4, 6], "x": 16.94, "y": 2.25},
+                {"matrix": [4, 7], "x": 19.69, "y": 2},
 
-                {"label":"6,0", "x":0, "y":3.25, "w":1.25},
-                {"label":"8,0", "x":1.25, "y":3.25},
-                {"label":"7,0", "x":2.25, "y":3.25},
-                {"label":"6,1", "x":4.25, "y":3.44},
-                {"label":"7,1", "x":5.25, "y":3.44},
-                {"label":"6,2", "x":6.25, "y":3.44},
-                {"label":"7,2", "x":7.25, "y":3.44},
-                {"label":"8,3", "x":9.25, "y":3.44},
-                {"label":"6,3", "x":10.25, "y":3.44},
-                {"label":"7,3", "x":11.25, "y":3.44},
-                {"label":"6,4", "x":12.25, "y":3.44},
-                {"label":"7,4", "x":13.25, "y":3.44},
-                {"label":"6,5", "x":15.44, "y":3.25},
-                {"label":"6,6", "x":16.44, "y":3.25, "w":1.75},
-                {"label":"7,6", "x":18.44, "y":3.5},
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 3.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3.25},
+                {"matrix": [6, 1], "x": 4.25, "y": 3.44},
+                {"matrix": [7, 1], "x": 5.25, "y": 3.44},
+                {"matrix": [6, 2], "x": 6.25, "y": 3.44},
+                {"matrix": [7, 2], "x": 7.25, "y": 3.44},
+                {"matrix": [8, 3], "x": 9.25, "y": 3.44},
+                {"matrix": [6, 3], "x": 10.25, "y": 3.44},
+                {"matrix": [7, 3], "x": 11.25, "y": 3.44},
+                {"matrix": [6, 4], "x": 12.25, "y": 3.44},
+                {"matrix": [7, 4], "x": 13.25, "y": 3.44},
+                {"matrix": [6, 5], "x": 15.44, "y": 3.25},
+                {"matrix": [6, 6], "x": 16.44, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 6], "x": 18.44, "y": 3.5},
 
-                {"label":"9,0", "x":0, "y":4.25, "w":1.5},
-                {"label":"8,1", "x":4.25, "y":4.44, "w":1.5},
-                {"label":"8,2", "x":5.75, "y":4.44, "w":2},
-                {"label":"9,2", "x":7.75, "y":4.44},
-                {"label":"9,3", "x":9.75, "y":4.44, "w":2.75},
-                {"label":"8,4", "x":12.5, "y":4.44, "w":1.5},
-                {"label":"8,6", "x":17.44, "y":4.5},
-                {"label":"9,6", "x":18.44, "y":4.5},
-                {"label":"8,7", "x":19.44, "y":4.5}
+                {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 1], "x": 4.25, "y": 4.44, "w": 1.5},
+                {"matrix": [8, 2], "x": 5.75, "y": 4.44, "w": 2},
+                {"matrix": [9, 2], "x": 7.75, "y": 4.44},
+                {"matrix": [9, 3], "x": 9.75, "y": 4.44, "w": 2.75},
+                {"matrix": [8, 4], "x": 12.5, "y": 4.44, "w": 1.5},
+                {"matrix": [8, 6], "x": 17.44, "y": 4.5},
+                {"matrix": [9, 6], "x": 18.44, "y": 4.5},
+                {"matrix": [8, 7], "x": 19.44, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c
deleted file mode 100644
index a05831ec17..0000000000
--- a/keyboards/neito/neito.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Oliver Granlund
- *
- * 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 "neito.h"
diff --git a/keyboards/neito/neito.h b/keyboards/neito/neito.h
deleted file mode 100644
index 35f1df2862..0000000000
--- a/keyboards/neito/neito.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 Oliver Granlund
- *
- * 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 LAYOUT( \
-    k00, k10, k01, k11, k02, k12, k03,      k13, k04, k14, k05,  k15,  k06, k16,  k07, \
-    k20, k30, k21, k31, k22, k32, k23,      k33, k24, k34, k25,  k35,  k26, k36,  k27, \
-    k40, k50, k41, k51, k42, k52, k43,      k53, k44, k54, k45,  k55,  k46,       k47, \
-    k60, k80, k70, k61, k71, k62, k72, k83, k63, k73, k64, k74,  k65,  k66, k76,       \
-    k90,      k81,      k82, k92, k93,      k84,                       k86, k96,  k87  \
-) { \
-    { k00, k01,   k02, k03, k04,   k05,   k06,   k07 }, \
-    { k10, k11,   k12, k13, k14,   k15,   k16,   KC_NO }, \
-    { k20, k21,   k22, k23, k24,   k25,   k26,   k27 }, \
-    { k30, k31,   k32, k33, k34,   k35,   k36,   KC_NO }, \
-    { k40, k41,   k42, k43, k44,   k45,   k46,   k47 }, \
-    { k50, k51,   k52, k53, k54,   k55,   KC_NO, KC_NO }, \
-    { k60, k61,   k62, k63, k64,   k65,   k66,   KC_NO }, \
-    { k70, k71,   k72, k73, k74,   KC_NO, k76,   KC_NO }, \
-    { k80, k81,   k82, k83, k84,   KC_NO, k86,   k87 }, \
-    { k90, KC_NO, k92, k93, KC_NO, KC_NO, k96,   KC_NO }, \
-}