From e3299db9e33304589d75a5dc332a6c5c484a82be Mon Sep 17 00:00:00 2001
From: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 12 Jul 2018 10:21:29 -0700
Subject: [PATCH] Minidox refactor and Configurator support (#3373)

* Matrix refactor

* Keymap refactor: #include QMK_KEYBOARD_H

* Configurator support
---
 keyboards/minidox/keymaps/default/keymap.c    |  4 +--
 keyboards/minidox/keymaps/haegin/keymap.c     |  4 +--
 keyboards/minidox/keymaps/khitsule/keymap.c   |  4 +--
 .../minidox/keymaps/that_canadian/keymap.c    |  4 +--
 keyboards/minidox/keymaps/tomb0y/keymap.c     |  4 +--
 keyboards/minidox/keymaps/xyverz/keymap.c     |  2 --
 keyboards/minidox/rev1/info.json              | 13 ++++++++
 keyboards/minidox/rev1/rev1.h                 | 33 ++++++++++---------
 8 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 keyboards/minidox/rev1/info.json

diff --git a/keyboards/minidox/keymaps/default/keymap.c b/keyboards/minidox/keymaps/default/keymap.c
index 32b407e787abd1b98fcf9f6a6ce25ce06055b1b1..521db63aab35dac97ef40076f9fd2ffcdc1ff57a 100644
--- a/keyboards/minidox/keymaps/default/keymap.c
+++ b/keyboards/minidox/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "minidox.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/minidox/keymaps/haegin/keymap.c b/keyboards/minidox/keymaps/haegin/keymap.c
index a32492eaa17fbb16cf9bdee9a219946cc8fd3530..221427b28af396620301eb4e33563757580340a8 100644
--- a/keyboards/minidox/keymaps/haegin/keymap.c
+++ b/keyboards/minidox/keymaps/haegin/keymap.c
@@ -1,6 +1,4 @@
-#include "minidox.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/minidox/keymaps/khitsule/keymap.c b/keyboards/minidox/keymaps/khitsule/keymap.c
index ba07e0a4e7f17854517647cb693f22c487951ed0..750510579cf97c438b68b38190f2edb8e12b9f42 100644
--- a/keyboards/minidox/keymaps/khitsule/keymap.c
+++ b/keyboards/minidox/keymaps/khitsule/keymap.c
@@ -1,6 +1,4 @@
-#include "minidox.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/minidox/keymaps/that_canadian/keymap.c
index dbdd397066fc4e4c46879f8645fc8e04e7ab2e8c..9d81283b675fee625ad4ce2fd954d78fe8d80d48 100644
--- a/keyboards/minidox/keymaps/that_canadian/keymap.c
+++ b/keyboards/minidox/keymaps/that_canadian/keymap.c
@@ -1,6 +1,4 @@
-#include "minidox.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/minidox/keymaps/tomb0y/keymap.c b/keyboards/minidox/keymaps/tomb0y/keymap.c
index de9378932465b43dded2a54e27a5db8e765814f2..cb7cd4d0a5575cf78c7606f1b04a3f9eab8a17a2 100644
--- a/keyboards/minidox/keymaps/tomb0y/keymap.c
+++ b/keyboards/minidox/keymaps/tomb0y/keymap.c
@@ -1,6 +1,4 @@
-#include "minidox.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/minidox/keymaps/xyverz/keymap.c b/keyboards/minidox/keymaps/xyverz/keymap.c
index 3dd9903cad9926a382c38a8b7d32e52cefdc6a78..3e62815655c877a03d45b3fc26b1f7df8750fb9f 100644
--- a/keyboards/minidox/keymaps/xyverz/keymap.c
+++ b/keyboards/minidox/keymaps/xyverz/keymap.c
@@ -1,6 +1,4 @@
 #include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/minidox/rev1/info.json b/keyboards/minidox/rev1/info.json
new file mode 100644
index 0000000000000000000000000000000000000000..c86e9a0d745ce22733feab22a50aa6d6baf783be
--- /dev/null
+++ b/keyboards/minidox/rev1/info.json
@@ -0,0 +1,13 @@
+{
+  "keyboard_name": "MiniDox",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 12,
+  "height": 5.75,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 36,
+      "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]
+    }
+  }
+}
diff --git a/keyboards/minidox/rev1/rev1.h b/keyboards/minidox/rev1/rev1.h
index b419c5fc90a7b53d4e7a6a59051f6029ca6db421..99c579d6eb58fb271b75f06acb2eed38df483fdf 100644
--- a/keyboards/minidox/rev1/rev1.h
+++ b/keyboards/minidox/rev1/rev1.h
@@ -8,21 +8,24 @@
 
 //void promicro_bootloader_jmp(bool program);
 
+// readability
+#define ___ KC_NO
+
 #define LAYOUT( \
-	k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, \
-	k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, \
-	k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, \
-	          k33, k34, k35, k75, k74, k73            \
-	) \
-	{ \
-		{ k01, k02, k03, k04, k05 }, \
-		{ k11, k12, k13, k14, k15 }, \
-		{ k21, k22, k23, k24, k25 }, \
-		{ KC_NO, KC_NO, k33, k34, k35 }, \
-		{ k41, k42, k43, k44, k45 }, \
-		{ k51, k52, k53, k54, k55 }, \
-		{ k61, k62, k63, k64, k65 }, \
-		{ KC_NO, KC_NO, k73, k74, k75 } \
-	}
+  k01, k02, k03, k04, k05,    k45, k44, k43, k42, k41, \
+  k11, k12, k13, k14, k15,    k55, k54, k53, k52, k51, \
+  k21, k22, k23, k24, k25,    k65, k64, k63, k62, k61, \
+            k33, k34, k35,    k75, k74, k73            \
+  ) \
+  { \
+    { k01, k02, k03, k04, k05 }, \
+    { k11, k12, k13, k14, k15 }, \
+    { k21, k22, k23, k24, k25 }, \
+    { ___, ___, k33, k34, k35 }, \
+    { k41, k42, k43, k44, k45 }, \
+    { k51, k52, k53, k54, k55 }, \
+    { k61, k62, k63, k64, k65 }, \
+    { ___, ___, k73, k74, k75 } \
+  }
 
 #endif