Merge branch 'develop'

3 files changed, 54 insertions, 101 deletions

diff --git a/keyboards/handwired/datahand/config.h b/keyboards/handwired/datahand/config.h
index 1cea39a739..0b2de61490 100644
--- a/keyboards/handwired/datahand/config.h
+++ b/keyboards/handwired/datahand/config.h
@@ -27,8 +27,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define FORCE_NKRO
-
 /*
  * Command/Windows key option
  *
diff --git a/keyboards/handwired/datahand/datahand.h b/keyboards/handwired/datahand/datahand.h
index cb9a4d3e3b..bd759be343 100644
--- a/keyboards/handwired/datahand/datahand.h
+++ b/keyboards/handwired/datahand/datahand.h
@@ -17,40 +17,6 @@
 
 #include "quantum.h"
 
-/* This a shortcut to help you visually see your layout.
- * The first section contains all of the arguements; the second converts the arguments into a two-dimensional array.
- */
-
-/* Each code is three letters
- * l or r - left or right hand
- * p, r, m, i, t - pinky, ring finger, middle finger, index finger, thumb
- * fingers: n, s, e, w, c - north, south, east, west, and center (manual calls this "well" but we already have "west")
- * thumb:   p, n, c, l, u, k - pad, nail, center, lock (harder center), up, knuckle
- */
-#define LAYOUT( \
-     lpn,             lrn,             lmn,             lin,                rin,             rmn,             rrn,             rpn,      \
-lpw, lpc, lpe,   lrw, lrc, lre,   lmw, lmc, lme,   liw, lic, lie,      riw, ric, rie,   rmw, rmc, rme,   rrw, rrc, rre,   rpw, rpc, rpe, \
-     lps,             lrs,             lms,             lis,                ris,             rms,             rrs,             rps,      \
-                                                       ltp,    ltn,  rtn,    rtp, \
-                                                           ltc,          rtc, \
-                                                           ltl,          rtl, \
-                                                       ltu,    ltk,  rtk,    rtu) \
-{ \
-  {riw, rin, lpw, lpn},\
-  {ric, rie, lpc, lpe},\
-  {ris, rms, lps, lrs},\
-  {rmw, rmn, lrw, lrn},\
-  {rmc, rme, lrc, lre},\
-  {rrw, rrn, lmw, lmn},\
-  {rrc, rre, lmc, lme},\
-  {rrs, rps, lms, lis},\
-  {rpw, rpn, liw, lin},\
-  {rpc, rpe, lic, lie},\
-  {rtk, rtn, ltk, ltn},\
-  {rtc, rtl, ltc, ltl},\
-  {rtp, rtu, ltp, ltu},\
-}
-
 /* Mode LEDs are active-low on Port B on the Teensy. */
 #define LED_MODE_PORT PORTB
 #define LED_TENKEY    (1<<3)
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json
index 61d95aa12a..372619565d 100644
--- a/keyboards/handwired/datahand/info.json
+++ b/keyboards/handwired/datahand/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x13BA",
         "pid": "0x0017",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "processor": "at90usb1286",
     "bootloader": "halfkay",
@@ -14,89 +15,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"lpn", "x":1, "y":2.75},
+                {"matrix": [0, 3], "x": 1, "y": 2.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 1.25},
 
-                {"label":"lrn", "x":3.25, "y":1.25},
+                {"matrix": [5, 3], "x": 5.75, "y": 0},
+                {"matrix": [8, 3], "x": 9, "y": 0.75},
 
-                {"label":"lmn", "x":5.75, "y":0},
+                {"matrix": [0, 1], "x": 13, "y": 0.75},
+                {"matrix": [3, 1], "x": 16.25, "y": 0},
 
-                {"label":"lin", "x":9, "y":0.75},
+                {"matrix": [5, 1], "x": 18.75, "y": 1.25},
+                {"matrix": [8, 1], "x": 21, "y": 2.75},
 
-                {"label":"rin", "x":13, "y":0.75},
+                {"matrix": [0, 2], "x": 0, "y": 3.75},
+                {"matrix": [1, 2], "x": 1, "y": 3.75},
+                {"matrix": [1, 3], "x": 2, "y": 3.75},
 
-                {"label":"rmn", "x":16.25, "y":0},
+                {"matrix": [3, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 2.25},
 
-                {"label":"rrn", "x":18.75, "y":1.25},
+                {"matrix": [5, 2], "x": 4.75, "y": 1},
+                {"matrix": [6, 2], "x": 5.75, "y": 1},
+                {"matrix": [6, 3], "x": 6.75, "y": 1},
 
-                {"label":"rpn", "x":21, "y":2.75},
+                {"matrix": [8, 2], "x": 8, "y": 1.75},
+                {"matrix": [9, 2], "x": 9, "y": 1.75},
+                {"matrix": [9, 3], "x": 10, "y": 1.75},
 
-                {"label":"lpw", "x":0, "y":3.75},
-                {"label":"lpc", "x":1, "y":3.75},
-                {"label":"lpe", "x":2, "y":3.75},
+                {"matrix": [0, 0], "x": 12, "y": 1.75},
+                {"matrix": [1, 0], "x": 13, "y": 1.75},
+                {"matrix": [1, 1], "x": 14, "y": 1.75},
 
-                {"label":"lrw", "x":2.25, "y":2.25},
-                {"label":"lrc", "x":3.25, "y":2.25},
-                {"label":"lre", "x":4.25, "y":2.25},
+                {"matrix": [3, 0], "x": 15.25, "y": 1},
+                {"matrix": [4, 0], "x": 16.25, "y": 1},
+                {"matrix": [4, 1], "x": 17.25, "y": 1},
 
-                {"label":"lmw", "x":4.75, "y":1},
-                {"label":"lmc", "x":5.75, "y":1},
-                {"label":"lme", "x":6.75, "y":1},
+                {"matrix": [5, 0], "x": 17.75, "y": 2.25},
+                {"matrix": [6, 0], "x": 18.75, "y": 2.25},
+                {"matrix": [6, 1], "x": 19.75, "y": 2.25},
 
-                {"label":"liw", "x":8, "y":1.75},
-                {"label":"lic", "x":9, "y":1.75},
-                {"label":"lie", "x":10, "y":1.75},
+                {"matrix": [8, 0], "x": 20, "y": 3.75},
+                {"matrix": [9, 0], "x": 21, "y": 3.75},
+                {"matrix": [9, 1], "x": 22, "y": 3.75},
 
-                {"label":"riw", "x":12, "y":1.75},
-                {"label":"ric", "x":13, "y":1.75},
-                {"label":"rie", "x":14, "y":1.75},
+                {"matrix": [2, 2], "x": 1, "y": 4.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
 
-                {"label":"rmw", "x":15.25, "y":1},
-                {"label":"rmc", "x":16.25, "y":1},
-                {"label":"rme", "x":17.25, "y":1},
+                {"matrix": [7, 2], "x": 5.75, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2.75},
 
-                {"label":"rrw", "x":17.75, "y":2.25},
-                {"label":"rrc", "x":18.75, "y":2.25},
-                {"label":"rre", "x":19.75, "y":2.25},
+                {"matrix": [2, 0], "x": 13, "y": 2.75},
+                {"matrix": [2, 1], "x": 16.25, "y": 2},
 
-                {"label":"rpw", "x":20, "y":3.75},
-                {"label":"rpc", "x":21, "y":3.75},
-                {"label":"rpe", "x":22, "y":3.75},
+                {"matrix": [7, 0], "x": 18.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 21, "y": 4.75},
 
-                {"label":"lps", "x":1, "y":4.75},
+                {"matrix": [12, 2], "x": 8, "y": 4.75},
+                {"matrix": [10, 3], "x": 10, "y": 4.75},
+                {"matrix": [10, 1], "x": 12, "y": 4.75},
+                {"matrix": [12, 0], "x": 14, "y": 4.75},
 
-                {"label":"lrs", "x":3.25, "y":3.25},
+                {"matrix": [11, 2], "x": 9, "y": 5.25},
+                {"matrix": [11, 0], "x": 13, "y": 5.25},
 
-                {"label":"lms", "x":5.75, "y":2},
+                {"matrix": [11, 3], "x": 9, "y": 6.25},
+                {"matrix": [11, 1], "x": 13, "y": 6.25},
 
-                {"label":"lis", "x":9, "y":2.75},
-
-                {"label":"ris", "x":13, "y":2.75},
-
-                {"label":"rms", "x":16.25, "y":2},
-
-                {"label":"rrs", "x":18.75, "y":3.25},
-
-                {"label":"rps", "x":21, "y":4.75},
-
-                {"label":"ltp", "x":8, "y":4.75},
-                {"label":"ltn", "x":10, "y":4.75},
-
-                {"label":"rtn", "x":12, "y":4.75},
-                {"label":"rtp", "x":14, "y":4.75},
-
-                {"label":"ltc", "x":9, "y":5.25},
-
-                {"label":"rtc", "x":13, "y":5.25},
-
-                {"label":"ltl", "x":9, "y":6.25},
-
-                {"label":"rtl", "x":13, "y":6.25},
-
-                {"label":"ltu", "x":8, "y":6.75},
-                {"label":"ltk", "x":10, "y":6.75},
-
-                {"label":"rtk", "x":12, "y":6.75},
-                {"label":"rtu", "x":14, "y":6.75}
+                {"matrix": [12, 3], "x": 8, "y": 6.75},
+                {"matrix": [10, 2], "x": 10, "y": 6.75},
+                {"matrix": [10, 0], "x": 12, "y": 6.75},
+                {"matrix": [12, 1], "x": 14, "y": 6.75}
             ]
         }
     }