Merge remote-tracking branch 'upstream/develop'

5 files changed, 49 insertions, 44 deletions

diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 5953b90249..0e6121ec48 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -17,23 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
 
 #define MATRIX_COL_PINS {  B3 , B2 , B6 , B5 , B4 , E6 , D7 , C6 , F4 , F5 , F6 }
 #define MATRIX_ROW_PINS {  F7 , B1 , D4 , D0 }
 
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    5
-
 /* 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/tanuki/info.json b/keyboards/tanuki/info.json
index d4e9140849..6dbc793b7f 100644
--- a/keyboards/tanuki/info.json
+++ b/keyboards/tanuki/info.json
@@ -8,9 +8,57 @@
     "pid": "0x6464",
     "device_version": "0.0.1"
   },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Game", "x":11.25, "y":1}, {"label":"Shift", "x":0.25, "y":2, "w":1.5}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"\"", "x":8.75, "y":2}, {"label":"?", "x":9.75, "y":2}, {"label":"Enter", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3}, {"label":"<", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2}, {"label":">", "x":8.5, "y":3}, {"label":"GUI", "x":9.5, "y":3, "w":1.25}]
+      "layout": [
+        {"x":0, "y":0, "matrix": [3, 1]},
+        {"x":1, "y":0, "matrix": [0, 0]},
+        {"x":2, "y":0, "matrix": [0, 1]},
+        {"x":3, "y":0, "matrix": [0, 2]},
+        {"x":4, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]},
+        {"x":6, "y":0, "matrix": [0, 5]},
+        {"x":7, "y":0, "matrix": [0, 6]},
+        {"x":8, "y":0, "matrix": [0, 7]},
+        {"x":9, "y":0, "matrix": [0, 8]},
+        {"x":10, "y":0, "matrix": [0, 9]},
+        {"x":11, "y":0, "w":1.25, "matrix": [0, 10]},
+
+        {"x":0, "y":1, "w":1.25, "matrix": [3, 0]},
+        {"x":1.25, "y":1, "matrix": [1, 0]},
+        {"x":2.25, "y":1, "matrix": [1, 1]},
+        {"x":3.25, "y":1, "matrix": [1, 2]},
+        {"x":4.25, "y":1, "matrix": [1, 3]},
+        {"x":5.25, "y":1, "matrix": [1, 4]},
+        {"x":6.25, "y":1, "matrix": [1, 5]},
+        {"x":7.25, "y":1, "matrix": [1, 6]},
+        {"x":8.25, "y":1, "matrix": [1, 7]},
+        {"x":9.25, "y":1, "matrix": [1, 8]},
+        {"x":10.25, "y":1, "matrix": [1, 9]},
+        {"x":11.25, "y":1, "matrix": [1, 10]},
+
+        {"x":0.25, "y":2, "w":1.5, "matrix": [2, 0]},
+        {"x":1.75, "y":2, "matrix": [2, 1]},
+        {"x":2.75, "y":2, "matrix": [2, 2]},
+        {"x":3.75, "y":2, "matrix": [2, 3]},
+        {"x":4.75, "y":2, "matrix": [2, 4]},
+        {"x":5.75, "y":2, "matrix": [2, 5]},
+        {"x":6.75, "y":2, "matrix": [2, 6]},
+        {"x":7.75, "y":2, "matrix": [2, 7]},
+        {"x":8.75, "y":2, "matrix": [2, 8]},
+        {"x":9.75, "y":2, "matrix": [2, 9]},
+        {"x":10.75, "y":2, "w":1.25, "matrix": [2, 10]},
+
+        {"x":1.25, "y":3, "w":1.25, "matrix": [3, 2]},
+        {"x":2.5, "y":3, "matrix": [3, 3]},
+        {"x":3.5, "y":3, "matrix": [3, 4]},
+        {"x":4.5, "y":3, "w":2, "matrix": [3, 5]},
+        {"x":6.5, "y":3, "w":2, "matrix": [3, 6]},
+        {"x":8.5, "y":3, "matrix": [3, 8]},
+        {"x":9.5, "y":3, "w":1.25, "matrix": [3, 9]}
+      ]
     }
   }
 }
diff --git a/keyboards/tanuki/rules.mk b/keyboards/tanuki/rules.mk
index 453b0fb12f..9047eadf71 100644
--- a/keyboards/tanuki/rules.mk
+++ b/keyboards/tanuki/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/tanuki/tanuki.c b/keyboards/tanuki/tanuki.c
deleted file mode 100644
index 97f7446640..0000000000
--- a/keyboards/tanuki/tanuki.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "tanuki.h"
-#include "rgblight.h"
-#include "config.h"
-#include "rgblight.h"
diff --git a/keyboards/tanuki/tanuki.h b/keyboards/tanuki/tanuki.h
deleted file mode 100644
index 9615e44f33..0000000000
--- a/keyboards/tanuki/tanuki.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "quantum.h"
-
-
-// readability
-#define XXX KC_NO
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-	k31, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, \
-	k30, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, \
-	k32, k33, k34, k35, k36, k38, k39 \
-) \
-{ \
-		{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
-		{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
-		{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \
-		{k30, k31, k32, k33, k34, k35, k36, XXX, k38, k39, XXX} \
-}
-
-