Merge remote-tracking branch 'origin/master' into develop

7 files changed, 97 insertions, 0 deletions

diff --git a/keyboards/millet/doksin/info.json b/keyboards/millet/doksin/info.json
new file mode 100644
index 0000000000..7a848662cd
--- /dev/null
+++ b/keyboards/millet/doksin/info.json
@@ -0,0 +1,31 @@
+{
+    "manufacturer": "millet",
+    "keyboard_name": "doksin",
+    "maintainer": "millet",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D4"]
+        ]
+    },
+    "processor": "atmega32u2",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1919",
+        "vid": "0xBDD1"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/millet/doksin/keymaps/default/keymap.c b/keyboards/millet/doksin/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2d9e565f3a
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+/* Copyright 2019 Biacco42
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_1x1(
+    KC_1
+  ),
+};
diff --git a/keyboards/millet/doksin/keymaps/default/readme.md b/keyboards/millet/doksin/keymaps/default/readme.md
new file mode 100644
index 0000000000..5ddd4572c4
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/default/readme.md
@@ -0,0 +1 @@
+# default keymap for DOKSIN
\ No newline at end of file
diff --git a/keyboards/millet/doksin/keymaps/via/keymap.c b/keyboards/millet/doksin/keymaps/via/keymap.c
new file mode 100644
index 0000000000..56d8f97084
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+/* Copyright 2019 Biacco42
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_1x1( /* Base */
+    KC_1
+  ),
+
+};
diff --git a/keyboards/millet/doksin/keymaps/via/rules.mk b/keyboards/millet/doksin/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/millet/doksin/readme.md b/keyboards/millet/doksin/readme.md
new file mode 100644
index 0000000000..175416eb8b
--- /dev/null
+++ b/keyboards/millet/doksin/readme.md
@@ -0,0 +1,19 @@
+# DOKСИН
+
+![DOKСИН](https://i.imgur.com/OaDlfwrh.jpg)
+
+Can be used as a keyboard...
+
+* Keyboard Maintainer: [millet](https://github.com/milletmilletmilletmilletmilletmilletmil)
+* Hardware Supported: The DOKСИН PCB
+* Hardware Availability: None
+
+Make example for this keyboard (after setting up your build environment):
+
+    make millet/doksin:default
+
+Flashing example for this keyboard:
+
+    make millet/doksin:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/millet/doksin/rules.mk b/keyboards/millet/doksin/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/millet/doksin/rules.mk