summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-07-12 10:21:29 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-12 10:21:29 -0700
commite3299db9e33304589d75a5dc332a6c5c484a82be (patch)
treea71c41a00c78a187427a7456021af22a4a69df73
parent168d180a743737fb126ef6f508fda6ee1f81248f (diff)
downloadqmk_firmware-e3299db9e33304589d75a5dc332a6c5c484a82be.tar.gz
qmk_firmware-e3299db9e33304589d75a5dc332a6c5c484a82be.zip
Minidox refactor and Configurator support (#3373)
* Matrix refactor * Keymap refactor: #include QMK_KEYBOARD_H * Configurator support
-rw-r--r--keyboards/minidox/keymaps/default/keymap.c4
-rw-r--r--keyboards/minidox/keymaps/haegin/keymap.c4
-rw-r--r--keyboards/minidox/keymaps/khitsule/keymap.c4
-rw-r--r--keyboards/minidox/keymaps/that_canadian/keymap.c4
-rw-r--r--keyboards/minidox/keymaps/tomb0y/keymap.c4
-rw-r--r--keyboards/minidox/keymaps/xyverz/keymap.c2
-rw-r--r--keyboards/minidox/rev1/info.json13
-rw-r--r--keyboards/minidox/rev1/rev1.h33
8 files changed, 36 insertions, 32 deletions
diff --git a/keyboards/minidox/keymaps/default/keymap.c b/keyboards/minidox/keymaps/default/keymap.c
index 32b407e787..521db63aab 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 a32492eaa1..221427b28a 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 ba07e0a4e7..750510579c 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 dbdd397066..9d81283b67 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 de93789324..cb7cd4d0a5 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 3dd9903cad..3e62815655 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 0000000000..c86e9a0d74
--- /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 b419c5fc90..99c579d6eb 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