Merge upstream master

3 files changed, 41 insertions, 0 deletions

diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h
new file mode 100644
index 0000000000..a2a2a64835
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_2/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2019
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define ADC_PIN F6
+
+#define RGB_CI_PIN F7
+
+#define QMK_WAITING_TEST_BUSY_PIN F6
+#define QMK_WAITING_TEST_YIELD_PIN F7
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json
new file mode 100644
index 0000000000..2425168462
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_2/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "Onekey Teensy 2.0",
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "matrix_pins": {
+        "cols": ["F4"],
+        "rows": ["F5"]
+    },
+    "backlight": {
+        "pin": "B6"
+    },
+    "rgblight": {
+        "pin": "F6"
+    }
+}
diff --git a/keyboards/handwired/onekey/teensy_2/rules.mk b/keyboards/handwired/onekey/teensy_2/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_2/rules.mk