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

12 files changed, 279 insertions, 0 deletions

diff --git a/keyboards/balloondogcaps/tr90/info.json b/keyboards/balloondogcaps/tr90/info.json
new file mode 100644
index 0000000000..c17cafaebf
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90/info.json
@@ -0,0 +1,41 @@
+{
+    "manufacturer": "Balloondog",
+    "keyboard_name": "TR90",
+    "maintainer": "balloondogcaps",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "D5"],
+        "rows": ["F0", "F1", "F4"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4243"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c b/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c
new file mode 100644
index 0000000000..793212e002
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 Balloondog
+ *
+ * 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( /* Base */
+        KC_1,  KC_2, KC_3,
+        KC_4,  KC_5, KC_6,
+        KC_VOLD,  KC_VOLU, MO(1)
+    ),
+    [1] = LAYOUT(
+        KC_7, KC_8, KC_9,
+        KC_0, KC_MINUS, KC_PLUS,
+        RESET, KC_AT , KC_TRNS
+    ),
+};
+
+
diff --git a/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c b/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c
new file mode 100644
index 0000000000..efe6eefa77
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2021 Balloondog
+ *
+ * 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( /* Base */
+        KC_1,  KC_2, KC_3,
+        KC_4,  KC_5, KC_6,
+        KC_VOLD,  KC_VOLU, MO(1)
+    ),
+    [1] = LAYOUT(
+        KC_7, KC_8, KC_9,
+        KC_0, KC_MINUS, KC_PLUS,
+        RESET, KC_AT , KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+
diff --git a/keyboards/balloondogcaps/tr90/keymaps/via/rules.mk b/keyboards/balloondogcaps/tr90/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/balloondogcaps/tr90/readme.md b/keyboards/balloondogcaps/tr90/readme.md
new file mode 100644
index 0000000000..06b8a232ef
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90/readme.md
@@ -0,0 +1,25 @@
+# balloondogcaps/tr90
+
+![balloondogcaps/tr90](https://i.imgur.com/GCAZotn.jpeg)
+
+A 3x3 Pro Macropad with programmer pins
+
+* Keyboard Maintainer: [Balloondog](https://instagram.com/balloondogcaps)
+* Hardware Supported: Balloondog Play Rough series case(s)
+* Hardware Availability: [Balloondog](http://store.balloondog.nl)   
+
+Make example for this keyboard (after setting up your build environment):
+
+    make balloondogcaps/tr90:default
+
+Flashing example for this keyboard:
+
+    make balloondogcaps/tr90: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 2 ways:
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Hold the bottom right key and then press the bottom left key to enter the bootloader
diff --git a/keyboards/balloondogcaps/tr90/rules.mk b/keyboards/balloondogcaps/tr90/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90/rules.mk
diff --git a/keyboards/balloondogcaps/tr90pm/info.json b/keyboards/balloondogcaps/tr90pm/info.json
new file mode 100644
index 0000000000..d028b4a3cd
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90pm/info.json
@@ -0,0 +1,41 @@
+{
+    "manufacturer": "Balloondog",
+    "keyboard_name": "TR90PM",
+    "maintainer": "balloondogcaps",
+    "bootloader": "caterina",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4"],
+        "rows": ["C6", "D7", "E6"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0x4243"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c b/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c
new file mode 100644
index 0000000000..793212e002
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 Balloondog
+ *
+ * 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( /* Base */
+        KC_1,  KC_2, KC_3,
+        KC_4,  KC_5, KC_6,
+        KC_VOLD,  KC_VOLU, MO(1)
+    ),
+    [1] = LAYOUT(
+        KC_7, KC_8, KC_9,
+        KC_0, KC_MINUS, KC_PLUS,
+        RESET, KC_AT , KC_TRNS
+    ),
+};
+
+
diff --git a/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c b/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c
new file mode 100644
index 0000000000..efe6eefa77
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2021 Balloondog
+ *
+ * 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( /* Base */
+        KC_1,  KC_2, KC_3,
+        KC_4,  KC_5, KC_6,
+        KC_VOLD,  KC_VOLU, MO(1)
+    ),
+    [1] = LAYOUT(
+        KC_7, KC_8, KC_9,
+        KC_0, KC_MINUS, KC_PLUS,
+        RESET, KC_AT , KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+
diff --git a/keyboards/balloondogcaps/tr90pm/keymaps/via/rules.mk b/keyboards/balloondogcaps/tr90pm/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90pm/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/balloondogcaps/tr90pm/readme.md b/keyboards/balloondogcaps/tr90pm/readme.md
new file mode 100644
index 0000000000..7a7c35660c
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90pm/readme.md
@@ -0,0 +1,25 @@
+# balloondogcaps/tr90pm
+
+![balloondogcaps/tr90pm](https://i.imgur.com/AO5anzZh.png)
+
+A 3x3 Pro Micro enabled Macropad
+
+* Keyboard Maintainer: [Balloondog](https://instagram.com/balloondogcaps)
+* Hardware Supported: Balloondog Play Rough series case(s)
+* Hardware Availability: [Balloondog](http://store.balloondog.nl)   
+
+Make example for this keyboard (after setting up your build environment):
+
+    make balloondogcaps/tr90pm:default
+
+Flashing example for this keyboard:
+
+    make balloondogcaps/tr90pm: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 2 ways:
+* **Physical reset button**: Briefly press the button on the back of the PCB. Some Pro Micro's require a double press.
+* **Keycode in layout**: Hold the bottom right key and then press the bottom left key to enter the bootloader
diff --git a/keyboards/balloondogcaps/tr90pm/rules.mk b/keyboards/balloondogcaps/tr90pm/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/balloondogcaps/tr90pm/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank