Browse Source

Minidox refactor and Configurator support (#3373)

* Matrix refactor

* Keymap refactor: #include QMK_KEYBOARD_H

* Configurator support
noroadsleft 7 years ago
parent
commit
e3299db9e3

+ 1 - 3
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;
 

+ 1 - 3
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;
 

+ 1 - 3
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;
 

+ 1 - 3
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;
 

+ 1 - 3
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;
 

+ 0 - 2
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;
 

+ 13 - 0
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}]
+    }
+  }
+}

+ 18 - 15
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