Merge branch 'develop'

4 files changed, 19 insertions, 43 deletions

diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index 3127ee9411..682f1a7531 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -14,21 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.#pragma once
  */
 
- /* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6 }
-#define MATRIX_COL_PINS { F4, F1, F0, D5 }
-
- /* COL2ROW or 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 */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */
-#define RGB_DI_PIN B6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index b910faac32..b10260aa0b 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0003",
     "device_version": "0.0.4"
   },
+  "ws2812": {
+    "pin": "B6"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F1", "F0", "D5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D6", "pin_b": "D7"}
@@ -17,7 +25,17 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":4, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":4, "y":1}]
+      "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": 4, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/soap/soap.c b/keyboards/kingly_keys/soap/soap.c
deleted file mode 100644
index a467c54b74..0000000000
--- a/keyboards/kingly_keys/soap/soap.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "soap.h"
diff --git a/keyboards/kingly_keys/soap/soap.h b/keyboards/kingly_keys/soap/soap.h
deleted file mode 100644
index 8d5eba3ad2..0000000000
--- a/keyboards/kingly_keys/soap/soap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * 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/>.
- * 
- * Note:  Matrix is a little wacky with the rotary encoder click mapping being
- * on the opposite side of the board.  Remember to pay attention to 
- * the 13th column where the lone key mapped for rotary encoder click (K132).
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13 \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 } \
-}