Merge branch 'develop'

6 files changed, 70 insertions, 124 deletions

diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index 7019bf461f..a8788a8ad7 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 
 //#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
-#define FORCE_NKRO
-
-#define DIODE_DIRECTION COL2ROW
-
 
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h
index 17497c5ccd..49be10cce4 100644
--- a/keyboards/handwired/xealous/rev1/config.h
+++ b/keyboards/handwired/xealous/rev1/config.h
@@ -18,28 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-// Ascii art of pro micro. Pin names PD3, PD2, etc.
-//Usage| Name | Label      Label| Name | Usage
-//                   PORT          
-//     | PD3    TX0        RAW       |
-//     | PD2    RX1        GND       |SerGnd
-//     |        GND        RESET     |
-//     |        GND        VCC       |SerVCc
-//     | PD1    2          A3    PF4 | Col7
-//Ser  | PD0    3          A2    PF5 | Col6
-//Row4 | PD4    4          A1    PF6 | Col5
-//AUDIO| PC6    5          A0    PF7 | Col4
-//Row3 | PD7    6          15    PB1 | Col3
-//Row2 | PE6    7          14    PB3 | Col2
-//Row1 | PB4    8          13    PB2 | Col1
-//Row0 | PB5    9          10    PB6 | Col0
-
-// Note reservation of C6 for audio
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, D4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -55,5 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json
index c470e72a16..e233404347 100644
--- a/keyboards/handwired/xealous/rev1/info.json
+++ b/keyboards/handwired/xealous/rev1/info.json
@@ -6,85 +6,86 @@
   "usb": {
     "vid": "0x4131",
     "pid": "0x5141",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "force_nkro": true
   },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["B5", "B4", "E6", "D7", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-
-        {"label":"7", "x":7, "y":0},
-        {"label":"8", "x":8, "y":0},
-        {"label":"9", "x":9, "y":0},
-        {"label":"0", "x":10, "y":0},
-        {"label":"-", "x":11, "y":0},
-        {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2.0},
-
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x": 4.5,"y":1},
-        {"label":"T", "x":5.5, "y":1},
-
-        {"label":"Y", "x":6.5, "y":1},
-        {"label":"U", "x":7.5, "y":1},
-        {"label":"I", "x":8.5, "y":1},
-        {"label":"O", "x":9.5, "y":1},
-        {"label":"P", "x":10.5, "y":1},
-        {"label":"[", "x":11.5, "y":1},
-        {"label":"]", "x":12.5, "y":1},
-        {"label":"\\", "x":13.5, "y":1, "w":1.5},
-
-        {"label":"CapsLock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-
-        {"label":"H", "x":6.75, "y":2},
-        {"label":"J", "x":7.75, "y":2},
-        {"label":"K", "x":8.75, "y":2},
-        {"label":"L", "x":9.75, "y":2},
-        {"label":";", "x":10.75, "y":2},
-        {"label":"'", "x":11.75, "y":2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [0, 7], "x": 0, "y": 0},
+        {"matrix": [0, 6], "x": 1, "y": 0},
+        {"matrix": [0, 5], "x": 2, "y": 0},
+        {"matrix": [0, 4], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 2], "x": 5, "y": 0},
+        {"matrix": [0, 1], "x": 6, "y": 0},
+        {"matrix": [5, 6], "x": 7, "y": 0},
+        {"matrix": [5, 5], "x": 8, "y": 0},
+        {"matrix": [5, 4], "x": 9, "y": 0},
+        {"matrix": [5, 3], "x": 10, "y": 0},
+        {"matrix": [5, 2], "x": 11, "y": 0},
+        {"matrix": [5, 1], "x": 12, "y": 0},
+        {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
 
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
+        {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 1.5, "y": 1},
+        {"matrix": [1, 5], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 3], "x": 4.5, "y": 1},
+        {"matrix": [1, 2], "x": 5.5, "y": 1},
+        {"matrix": [6, 7], "x": 6.5, "y": 1},
+        {"matrix": [6, 6], "x": 7.5, "y": 1},
+        {"matrix": [6, 5], "x": 8.5, "y": 1},
+        {"matrix": [6, 4], "x": 9.5, "y": 1},
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
+        {"matrix": [6, 2], "x": 11.5, "y": 1},
+        {"matrix": [6, 1], "x": 12.5, "y": 1},
+        {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5},
 
-        {"label":"N", "x":7.25, "y":3},
-        {"label":"M", "x":8.25, "y":3},
-        {"label":",", "x":9.25, "y":3},
-        {"label":".", "x":10.25, "y":3},
-        {"label":"/", "x":11.25, "y":3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+        {"matrix": [2, 7], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 6], "x": 1.75, "y": 2},
+        {"matrix": [2, 5], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 3], "x": 4.75, "y": 2},
+        {"matrix": [2, 2], "x": 5.75, "y": 2},
+        {"matrix": [7, 6], "x": 6.75, "y": 2},
+        {"matrix": [7, 5], "x": 7.75, "y": 2},
+        {"matrix": [7, 4], "x": 8.75, "y": 2},
+        {"matrix": [7, 3], "x": 9.75, "y": 2},
+        {"matrix": [7, 2], "x": 10.75, "y": 2},
+        {"matrix": [7, 1], "x": 11.75, "y": 2},
+        {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25},
 
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":1.25},
-        {"x":5, "y":4, "w":2.25},
+        {"matrix": [3, 7], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 6], "x": 2.25, "y": 3},
+        {"matrix": [3, 5], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 3], "x": 5.25, "y": 3},
+        {"matrix": [3, 2], "x": 6.25, "y": 3},
+        {"matrix": [8, 5], "x": 7.25, "y": 3},
+        {"matrix": [8, 4], "x": 8.25, "y": 3},
+        {"matrix": [8, 3], "x": 9.25, "y": 3},
+        {"matrix": [8, 2], "x": 10.25, "y": 3},
+        {"matrix": [8, 1], "x": 11.25, "y": 3},
+        {"matrix": [8, 0], "x": 12.25, "y": 3, "w": 2.75},
 
-        {"x":7.25, "y":4, "w":2.75},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+        {"matrix": [4, 7], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 5, "y": 4, "w": 2.25},
+        {"matrix": [9, 4], "x": 7.25, "y": 4, "w": 2.75},
+        {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [9, 0], "x": 13.75, "y": 4, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c
deleted file mode 100644
index ad9f298c19..0000000000
--- a/keyboards/handwired/xealous/rev1/rev1.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "quantum.h"
-#include "rev1.h"
diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h
deleted file mode 100644
index ce8d68c2c1..0000000000
--- a/keyboards/handwired/xealous/rev1/rev1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06,      R06, R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,      R17, R16, R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,           R26, R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35,                R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42, L43, L44,                          R44, R43, R42, R41, R40 \
-) { \
-    { XXX, L06, L05, L04, L03, L02, L01, L00 }, \
-    { XXX, XXX, L15, L14, L13, L12, L11, L10 }, \
-    { XXX, XXX, L25, L24, L23, L22, L21, L20 }, \
-    { XXX, XXX, L35, L34, L33, L32, L31, L30 }, \
-    { XXX, XXX, XXX, L44, L43, L42, L41, L40 }, \
-    { R00, R01, R02, R03, R04, R05, R06, XXX }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, XXX }, \
-    { R30, R31, R32, R33, R34, R35, XXX, XXX }, \
-    { R40, R41, R42, R43, R44, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index 5e9547ec9d..a9391e9f56 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SPLIT_KEYBOARD = yes        # Use shared split_common code
-SUBPROJECT_rev1 = yes
 
 SRC += matrix.c
 DEBOUNCE_TYPE = sym_eager_pk