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

7 files changed, 243 insertions, 0 deletions

diff --git a/keyboards/jels/boaty/config.h b/keyboards/jels/boaty/config.h
new file mode 100644
index 0000000000..d78952f261
--- /dev/null
+++ b/keyboards/jels/boaty/config.h
@@ -0,0 +1,23 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * 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
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json
new file mode 100644
index 0000000000..43065a895a
--- /dev/null
+++ b/keyboards/jels/boaty/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "Boaty",
+    "manufacurer": "Jels",
+    "usb": {
+        "vid": "0x6A6B",
+        "pid": "0x000B",
+        "device_version": "1.0.0"
+    },
+    "url": "",
+    "maintainer": "Jels",
+    "processor":"atmega328p",
+    "bootloader":"usbasploader",
+    "features":
+    {
+        "bootmagic": true,
+        "nkro": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "backlight": false
+    },
+    "matrix_pins": {
+        "cols": [ "B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5" ],
+        "rows": ["D6", "B0", "D7", "B5", "B3", "B4", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Num Lock", "matrix": [2, 10], "x":6.75, "y": 0 },
+                { "label": "-", "matrix": [1, 10],  "x":6.75, "y": 1 },
+                { "label": "*", "matrix": [1, 9], "x":7.75, "y": 1 },
+                { "label": "7", "matrix": [0, 8], "x":6.75, "y": 2 },
+                { "label": "8", "matrix": [0, 9], "x":7.75, "y": 2 },
+                { "label": "9", "matrix": [0, 10], "x":8.75, "y": 2 },
+                { "label": "4", "matrix": [0, 4], "x":6.75, "y": 3 },
+                { "label": "5", "matrix": [0, 5], "x":7.75, "y": 3 },
+                { "label": "6", "matrix": [0, 6], "x":8.75, "y": 3 },
+                { "label": "+", "matrix": [0, 7], "x":9.75, "y": 3 },
+                { "label": "1", "matrix": [1, 4], "x":6.75, "y": 4 },
+                { "label": "2", "matrix": [1, 5], "x":7.75, "y": 4 },
+                { "label": "3", "matrix": [1, 6], "x":8.75, "y": 4 },
+                { "label": "Ent", "matrix": [1, 7], "x":9.75, "y": 4 },
+                { "label": "/", "matrix": [1, 8], "x":10.75, "y": 4 },
+                { "label": "0", "matrix": [2, 4], "x":6.75, "y": 5 },
+                { "label": "00", "matrix": [2, 5], "x":7.75, "y": 5 },
+                { "label": ".", "matrix": [2, 6], "x":8.75, "y": 5 },
+                { "label": "Ent", "matrix": [2, 7], "x":9.75, "y": 5 },
+                { "label": "=", "matrix": [2, 8], "x":10.75, "y": 5 },
+                { "label": "Back", "matrix": [2, 9], "x":11.75, "y": 5 },
+                { "label": "Esc", "matrix": [6, 0], "x":0, "y": 7.25 },
+                { "label": "Tab", "matrix": [4, 0], "x":1, "y": 7.25 },
+                { "label": "Q", "matrix": [5, 0], "x":2, "y": 7.25 },
+                { "label": "W", "matrix": [5, 1], "x":3, "y": 7.25 },
+                { "label": "E", "matrix": [5, 2], "x":4, "y": 7.25 },
+                { "label": "R", "matrix": [5, 3], "x":5, "y": 7.25 },
+                { "label": "T", "matrix": [5, 4], "x":6, "y": 7.25 },
+                { "label": "Y", "matrix": [3, 5], "x":7, "y": 7.25 },
+                { "label": "U", "matrix": [3, 6], "x":8, "y": 7.25 },
+                { "label": "I", "matrix": [3, 7], "x":9, "y": 7.25 },
+                { "label": "O", "matrix": [3, 8], "x":10, "y": 7.25 },
+                { "label": "P", "matrix": [3, 9], "x":11, "y": 7.25 },
+                { "label": "Back", "matrix": [3, 10], "x":12, "y": 7.25 },
+                { "label": "Del", "matrix": [5, 10], "x":13, "y": 7.25 },
+                { "label": "Caps", "matrix": [6, 1], "x":1, "y": 8.25 },
+                { "label": "A", "matrix": [3, 0], "x":2, "y": 8.25 },
+                { "label": "S", "matrix": [3, 1], "x":3, "y": 8.25 },
+                { "label": "D", "matrix": [3, 2], "x":4, "y": 8.25 },
+                { "label": "F", "matrix": [3, 3], "x":5, "y": 8.25 },
+                { "label": "G", "matrix": [3, 4], "x":6, "y": 8.25 },
+                { "label": "H", "matrix": [4, 5], "x":7, "y": 8.25 },
+                { "label": "J", "matrix": [4, 6], "x":8, "y": 8.25 },
+                { "label": "K", "matrix": [4, 7], "x":9, "y": 8.25 },
+                { "label": "L", "matrix": [4, 8], "x":10, "y": 8.25 },
+                { "label": ":", "matrix": [4, 9], "x":11, "y": 8.25 },
+                { "label": "Enter", "matrix": [4, 10], "x":12, "y": 8.25 },
+                { "label": "Shift", "matrix": [6, 2], "x":2, "y": 9.25 },
+                { "label": "Z", "matrix": [4, 1], "x":3, "y": 9.25 },
+                { "label": "X", "matrix": [4, 2], "x":4, "y": 9.25 },
+                { "label": "C", "matrix": [4, 3], "x":5, "y": 9.25 },
+                { "label": "V", "matrix": [4, 4], "x":6, "y": 9.25 },
+                { "label": "B", "matrix": [5, 5], "x":7, "y": 9.25 },
+                { "label": "N", "matrix": [5, 6], "x":8, "y": 9.25 },
+                { "label": "M", "matrix": [5, 7], "x":9, "y": 9.25 },
+                { "label": "<", "matrix": [5, 8], "x":10, "y": 9.25 },
+                { "label": "Shift", "matrix": [5, 9], "x":11, "y": 9.25 },
+                { "label": "Ctl", "matrix": [6, 3], "x":4, "y": 10.25 },
+                { "label": "Alt", "matrix": [6, 4], "x":5, "y": 10.25 },
+                { "matrix": [6, 6], "x":6, "y": 10.25 },
+                { "matrix": [6, 7], "x":7, "y": 10.25 },
+                { "label": "Alt", "matrix": [6, 8], "x":8, "y": 10.25 },
+                { "label": "Ctl", "matrix": [6, 9], "x":9, "y": 10.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jels/boaty/keymaps/default/keymap.c b/keyboards/jels/boaty/keymaps/default/keymap.c
new file mode 100644
index 0000000000..885056246d
--- /dev/null
+++ b/keyboards/jels/boaty/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+/*  Copyright 2022 Joah Nelson (jels)
+*
+*   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 <https://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+                                            KC_NUM,
+                                            KC_PAST, KC_PSLS,
+                                            KC_P7,   KC_P8,   KC_P9,
+                                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                                            KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
+                                            KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
+
+KC_1, KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC, KC_DEL,
+        KC_1, KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,    KC_J,    KC_K,   KC_L,    KC_ENT,
+            KC_1,  KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   KC_RSFT,
+                          KC_LCTL, KC_LALT, KC_SPC, KC_1, KC_RALT, KC_RCTL
+),
+[1] = LAYOUT_all(
+                                            KC_F2,
+                                            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, 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, 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, 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
+)
+};
diff --git a/keyboards/jels/boaty/keymaps/via/keymap.c b/keyboards/jels/boaty/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f88a3774da
--- /dev/null
+++ b/keyboards/jels/boaty/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/*  Copyright 2022 Joah Nelson (jels)
+*
+*   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 <https://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+                                            KC_NUM,
+                                            KC_PAST, KC_PSLS,
+                                            KC_P7,   KC_P8,   KC_P9,
+                                            KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                                            KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PPLS,
+                                            KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_PMNS, KC_F1,
+
+KC_ESC, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSPC, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,    KC_COMM, KC_RSFT,
+                          KC_LCTL, KC_LALT, KC_SPC,  MO(1), KC_RALT, KC_RCTL
+),
+[1] = LAYOUT_all(
+                                            KC_F2,
+                                            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, 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, 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, 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
+)
+};
diff --git a/keyboards/jels/boaty/keymaps/via/rules.mk b/keyboards/jels/boaty/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/jels/boaty/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jels/boaty/readme.md b/keyboards/jels/boaty/readme.md
new file mode 100644
index 0000000000..d5084b1098
--- /dev/null
+++ b/keyboards/jels/boaty/readme.md
@@ -0,0 +1,27 @@
+# Boaty
+
+![Boaty](https://i.imgur.com/6LEaYxSh.jpg)
+
+* Keyboard Maintainer: [jels](https://github.com/JoahNelson)
+* Hardware Supported: Boaty
+* Hardware Availabililty: Limited Group buy from: [jels](https://jels.au)
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make jels/boaty:default
+    
+Flashing example for this keyboard:
+
+    make jels/boaty: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 leftmost key (ESC) and plug in the keyboard
+* **USBASPLoader**: Press down the BOOT switch and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+* **Exit Bootloader**: To exit the bootloader, press the RESET switch (Left of BOOT).
diff --git a/keyboards/jels/boaty/rules.mk b/keyboards/jels/boaty/rules.mk
new file mode 100644
index 0000000000..837f4bffb5
--- /dev/null
+++ b/keyboards/jels/boaty/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank