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

9 files changed, 227 insertions, 0 deletions

diff --git a/keyboards/teleport/numpad/config.h b/keyboards/teleport/numpad/config.h
new file mode 100644
index 0000000000..f3573483b7
--- /dev/null
+++ b/keyboards/teleport/numpad/config.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 Moritz Plattner
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x7470      //"tp"
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    tlprt
+#define PRODUCT         NumPad
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { D7, D4, D6, B4, B5 }
+#define MATRIX_COL_PINS { F6, F5, F7, F4 }
+#define UNUSED_PINS { B0, B1, B2, B3, B6, B7, D0, D1, D2, D3, D5, F0, F1, E6, C6, C7 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/info.json
new file mode 100644
index 0000000000..a05b7440ba
--- /dev/null
+++ b/keyboards/teleport/numpad/info.json
@@ -0,0 +1,27 @@
+{
+  "keyboard_name": "tlprt_NumPad",
+  "maintainer": "ebastler",
+  "layouts": {
+    "LAYOUT_numpad_5x4": {
+      "layout": [
+        {"label":"Num Lock", "x":0, "y":0}, 
+        {"label":"/", "x":1, "y":0}, 
+        {"label":"*", "x":2, "y":0}, 
+        {"label":"-", "x":3, "y":0}, 
+        {"label":"7", "x":0, "y":1}, 
+        {"label":"8", "x":1, "y":1}, 
+        {"label":"9", "x":2, "y":1}, 
+        {"label":"4", "x":0, "y":2}, 
+        {"label":"5", "x":1, "y":2}, 
+        {"label":"6", "x":2, "y":2}, 
+        {"label":"+", "x":3, "y":1, "h":2}, 
+        {"label":"1", "x":0, "y":3}, 
+        {"label":"2", "x":1, "y":3}, 
+        {"label":"3", "x":2, "y":3}, 
+        {"label":"0", "x":0, "y":4, "w":2}, 
+        {"label":",", "x":2, "y":4}, 
+        {"label":"Enter", "x":3, "y":3, "h":2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/teleport/numpad/keymaps/default/keymap.c b/keyboards/teleport/numpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..64f805f5da
--- /dev/null
+++ b/keyboards/teleport/numpad/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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_numpad_5x4(
+    LT(1, KC_NLCK), KC_PSLS,  KC_PAST, KC_PMNS,
+    KC_P7,          KC_P8,    KC_P9,           
+    KC_P4,          KC_P5,    KC_P6,   KC_PPLS, 
+    KC_P1,          KC_P2,    KC_P3,            
+              KC_P0,          KC_PDOT,  KC_PENT  
+  ),
+
+  [1] = LAYOUT_numpad_5x4(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS, 
+             KC_TRNS, KC_TRNS, RESET    
+  ),
diff --git a/keyboards/teleport/numpad/keymaps/via/keymap.c b/keyboards/teleport/numpad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..28271c9d58
--- /dev/null
+++ b/keyboards/teleport/numpad/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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_numpad_5x4(
+    LT(1, KC_NLCK), KC_PSLS,  KC_PAST, KC_PMNS,
+    KC_P7,          KC_P8,    KC_P9,           
+    KC_P4,          KC_P5,    KC_P6,   KC_PPLS, 
+    KC_P1,          KC_P2,    KC_P3,            
+              KC_P0,          KC_PDOT,  KC_PENT  
+  ),
+
+  [1] = LAYOUT_numpad_5x4(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS, 
+             KC_TRNS, KC_TRNS, RESET    
+  ),
+};
diff --git a/keyboards/teleport/numpad/keymaps/via/rules.mk b/keyboards/teleport/numpad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/teleport/numpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/teleport/numpad/numpad.c b/keyboards/teleport/numpad/numpad.c
new file mode 100644
index 0000000000..375e240589
--- /dev/null
+++ b/keyboards/teleport/numpad/numpad.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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 "numpad.h"
diff --git a/keyboards/teleport/numpad/numpad.h b/keyboards/teleport/numpad/numpad.h
new file mode 100644
index 0000000000..9c7413cd8e
--- /dev/null
+++ b/keyboards/teleport/numpad/numpad.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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 "quantum.h"
+
+#define LAYOUT_numpad_5x4(    \
+      K00,  K01,  K02,  K03,  \
+      K10,  K11,  K12,        \
+      K20,  K21,  K22,  K13,  \
+      K30,  K31,  K32,        \
+         K40,     K41,  K42   \
+) { \
+    { K00,  K01,  K02,  K03   }, \
+    { K10,  K11,  K12,  K13   }, \
+    { K20,  K21,  K22,  KC_NO }, \
+    { K30,  K31,  K32,  KC_NO }, \
+    { K40,  K41,  K42,  KC_NO }, \
+}
diff --git a/keyboards/teleport/numpad/readme.md b/keyboards/teleport/numpad/readme.md
new file mode 100644
index 0000000000..aebde6f160
--- /dev/null
+++ b/keyboards/teleport/numpad/readme.md
@@ -0,0 +1,20 @@
+# The Teleport NumPad
+
+* Keyboard Maintainer: [ebastler](https://github.com/ebastler)
+* Hardware Supported: Teleport NumPad
+* Hardware Availability: [TheTeleport.de](https://www.theteleport.de/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make teleport/numpad:default
+
+Flash example for this keyboard:
+
+    make teleport/numpad: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).
+
+## Bootloader Enter the bootloader in 3 ways: 
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (In this case NumLock) and plug in the keyboard 
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` (With the default keymap, hold NumLock, then press Enter)
\ No newline at end of file
diff --git a/keyboards/teleport/numpad/rules.mk b/keyboards/teleport/numpad/rules.mk
new file mode 100644
index 0000000000..d13c9980f7
--- /dev/null
+++ b/keyboards/teleport/numpad/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+
+LAYOUTS = numpad_5x4