Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 63 insertions, 0 deletions

diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
new file mode 100644
index 000000000..022209502
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/info.json
@@ -0,0 +1,63 @@
+{
+  "keyboard_name": "Not So MiniDox",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 12,
+  "height": 5.75,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 42,
+      "layout": [
+        {"x":0, "y":0.375},
+        {"x":1, "y":0.25},
+        {"x":2, "y":0.125},
+        {"x":3, "y":0},
+        {"x":4, "y":0.125},
+        {"x":5, "y":0.25},
+
+        {"x":8, "y":0.25},
+        {"x":9, "y":0.125},
+        {"x":10, "y":0},
+        {"x":11, "y":0.125},
+        {"x":12, "y":0.25},
+        {"x":13, "y":0.375},
+
+        {"x":0, "y":1.375},
+        {"x":1, "y":1.25},
+        {"x":2, "y":1.125},
+        {"x":3, "y":1},
+        {"x":4, "y":1.125},
+        {"x":5, "y":1.25},
+
+        {"x":8, "y":1.25},
+        {"x":9, "y":1.125},
+        {"x":10, "y":1},
+        {"x":11, "y":1.125},
+        {"x":12, "y":1.25},
+        {"x":13, "y":1.375},
+
+        {"x":0, "y":2.375},
+        {"x":1, "y":2.25},
+        {"x":2, "y":2.125},
+        {"x":3, "y":2},
+        {"x":4, "y":2.125},
+        {"x":5, "y":2.25},
+
+        {"x":8, "y":2.25},
+        {"x":9, "y":2.125},
+        {"x":10, "y":2},
+        {"x":11, "y":2.125},
+        {"x":12, "y":2.25},
+        {"x":13, "y":2.375},
+
+        {"x":3.5, "y":4.75},
+        {"x":4.5, "y":4.75},
+        {"x":5.5, "y":3.75, "h":2},
+
+        {"x":7.5, "y":3.75, "h":2},
+        {"x":8.5, "y":4.75},
+        {"x":9.5, "y":4.75}
+      ]
+    }
+  }
+}