summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/ci_builds.yml38
-rw-r--r--keyboards/keebio/kbo5000/rev1/info.json4
-rw-r--r--keyboards/prototypist/pt60/info.json238
-rw-r--r--keyboards/prototypist/pt60/keymaps/default/keymap.c38
-rw-r--r--keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c38
-rw-r--r--keyboards/prototypist/pt60/keymaps/via/keymap.c38
-rw-r--r--keyboards/prototypist/pt60/keymaps/via/rules.mk2
-rw-r--r--keyboards/prototypist/pt60/readme.md35
-rw-r--r--keyboards/prototypist/pt60/rules.mk3
-rw-r--r--keyboards/prototypist/pt80/info.json316
-rw-r--r--keyboards/prototypist/pt80/keymaps/default/keymap.c47
-rw-r--r--keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c47
-rw-r--r--keyboards/prototypist/pt80/keymaps/via/keymap.c47
-rw-r--r--keyboards/prototypist/pt80/keymaps/via/rules.mk1
-rw-r--r--keyboards/prototypist/pt80/readme.md35
-rw-r--r--keyboards/prototypist/pt80/rules.mk1
-rw-r--r--lib/python/qmk/info.py10
17 files changed, 936 insertions, 2 deletions
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
new file mode 100644
index 0000000000..1822b8e36a
--- /dev/null
+++ b/.github/workflows/ci_builds.yml
@@ -0,0 +1,38 @@
+name: CI Builds
+
+permissions:
+ contents: read
+
+on:
+ push:
+ branches:
+ - master
+ - develop
+
+jobs:
+ ci_builds:
+ runs-on: self-hosted
+
+ if: github.repository == 'qmk/qmk_firmware'
+
+ strategy:
+ matrix:
+ keymap:
+ - default
+ - via
+
+ container: qmkfm/qmk_cli
+
+ steps:
+ - name: Disable safe.directory check
+ run : git config --global --add safe.directory '*'
+
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+
+ - name: Install dependencies
+ run: pip3 install -r requirements.txt
+
+ - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
+ run: qmk mass-compile -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) -km ${{ matrix.keymap }}
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index 9d3445f880..5df36178e7 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -21,8 +21,8 @@
"encoder": {
"right": {
"rotary": [
- {"pin_a": "D6", "pin_b": "C7"},
- {"pin_a": "D4", "pin_b": "C6"}
+ {"pin_a": "D6", "pin_b": "D4"},
+ {"pin_a": "C7", "pin_b": "C6"}
]
}
}
diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json
new file mode 100644
index 0000000000..c902b16f4f
--- /dev/null
+++ b/keyboards/prototypist/pt60/info.json
@@ -0,0 +1,238 @@
+{
+ "manufacturer": "Proto[Typist]",
+ "keyboard_name": "PT-60",
+ "maintainer": "Anjheos",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B12", "B14", "A8", "A9", "A15", "B3", "B7", "B4", "B5", "B6", "A4", "A5", "A6", "A7" ],
+ "rows": ["B0", "B1", "B2", "B10", "B11"]
+ },
+ "processor": "STM32F303",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0001",
+ "vid": "0x4A46"
+ },
+ "community_layouts": ["60_iso", "60_ansi"],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 },
+ { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 },
+ { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 },
+ { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 },
+ { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 },
+ { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 },
+ { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 },
+ { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 },
+ { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 },
+ { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 },
+ { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 },
+ { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 },
+ { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 },
+ { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 },
+ { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 },
+ { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 },
+ { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 },
+ { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 },
+ { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 },
+ { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 },
+ { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 },
+ { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 },
+ { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 },
+ { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 },
+ { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 },
+ { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 },
+ { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 },
+ { "matrix": [ 1, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 },
+ { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 },
+ { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 },
+ { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 },
+ { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 },
+ { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 },
+ { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 },
+ { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 },
+ { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 },
+ { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 },
+ { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 },
+ { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 },
+ { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 },
+
+ { "matrix": [ 3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [ 3, 1], "label": "|", "x": 1.25, "y": 3 },
+ { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 },
+ { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 },
+ { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 },
+ { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 },
+ { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 },
+ { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 },
+ { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 },
+ { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 },
+ { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 },
+ { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 },
+ { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 },
+ { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 },
+ { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 },
+ { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 },
+ { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 }
+ ]
+ },
+
+ "LAYOUT_60_iso": {
+ "layout": [
+ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 },
+ { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 },
+ { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 },
+ { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 },
+ { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 },
+ { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 },
+ { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 },
+ { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 },
+ { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 },
+ { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 },
+ { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 },
+ { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 },
+ { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 },
+ { "matrix": [ 0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 },
+
+ { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 },
+ { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 },
+ { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 },
+ { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 },
+ { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 },
+ { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 },
+ { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 },
+ { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 },
+ { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 },
+ { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 },
+ { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 },
+ { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 },
+ { "matrix": [ 1, 13], "label": "Enter", "h": 2, "w": 1.25, "x": 13.75, "y": 1 },
+ { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 },
+ { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 },
+ { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 },
+ { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 },
+ { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 },
+ { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 },
+ { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 },
+ { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 },
+ { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 },
+ { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 },
+ { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 },
+ { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 },
+
+ { "matrix": [ 3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [ 3, 1], "label": "|", "x": 1.25, "y": 3 },
+ { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 },
+ { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 },
+ { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 },
+ { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 },
+ { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 },
+ { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 },
+ { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 },
+ { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 },
+ { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 },
+ { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 },
+ { "matrix": [ 3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 },
+
+ { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 },
+ { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 },
+ { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 },
+ { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 }
+ ]
+ },
+
+ "LAYOUT_60_ansi": {
+ "layout": [
+ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 },
+ { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 },
+ { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 },
+ { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 },
+ { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 },
+ { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 },
+ { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 },
+ { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 },
+ { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 },
+ { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 },
+ { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 },
+ { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 },
+ { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 },
+ { "matrix": [ 0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 },
+
+ { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 },
+ { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 },
+ { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 },
+ { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 },
+ { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 },
+ { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 },
+ { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 },
+ { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 },
+ { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 },
+ { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 },
+ { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 },
+ { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 },
+ { "matrix": [ 1, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 },
+ { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 },
+ { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 },
+ { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 },
+ { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 },
+ { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 },
+ { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 },
+ { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 },
+ { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 },
+ { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 },
+ { "matrix": [ 2, 11], "label": "'", "x": 11.75, "y": 2 },
+ { "matrix": [ 2, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 2 },
+
+ { "matrix": [ 3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3 },
+
+ { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 },
+ { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 },
+ { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 },
+ { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 },
+ { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 },
+ { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 },
+ { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 },
+ { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 },
+ { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 },
+ { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 },
+ { "matrix": [ 3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 },
+
+ { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 },
+ { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 },
+ { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 },
+ { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 }
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2461696475
--- /dev/null
+++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2021 Josh (@Anjheos)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_iso(
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT,
+ KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+ ),
+
+ [1] = LAYOUT_60_iso(
+ EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE,
+ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [2] = LAYOUT_60_iso(
+ _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MO(3)
+ ),
+
+ [3] = LAYOUT_60_iso(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..a25cd2fae9
--- /dev/null
+++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2021 Josh (@Anjheos)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_ansi(
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+ ),
+
+ [1] = LAYOUT_60_ansi(
+ EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE,
+ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [2] = LAYOUT_60_ansi(
+ _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MO(3)
+ ),
+
+ [3] = LAYOUT_60_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d710399a81
--- /dev/null
+++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2021 Josh (@Anjheos)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT,
+ KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL
+ ),
+
+ [1] = LAYOUT_all(
+ EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE,
+ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [2] = LAYOUT_all(
+ _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MO(3)
+ ),
+
+ [3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/prototypist/pt60/keymaps/via/rules.mk b/keyboards/prototypist/pt60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..16d33cd89f
--- /dev/null
+++ b/keyboards/prototypist/pt60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md
new file mode 100644
index 0000000000..a4f396bf4a
--- /dev/null
+++ b/keyboards/prototypist/pt60/readme.md
@@ -0,0 +1,35 @@
+# prototypist/pt60
+
+![prototypist/pt60](https://i.imgur.com/Iu3QwxRh.png)
+
+*Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos).
+Features various physical layouts available to fit multiple regional and bottom row layouts.
+Default layout is in ISO.*
+
+* Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos)
+* Hardware Supported: **PT-60J PCB and PT-60C PCB**
+* Hardware Availability: [Proto[Typist]](https://prototypist.net)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make prototypist/pt60:default
+ make prototypist/pt60:via
+ make prototypist/pt60:default_ansi
+
+
+Flashing example for this keyboard:
+
+ make prototypist/pt60:default:flash
+ make prototypist/pt60:via:flash
+ make prototypist/pt60:default_ansi: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 (usually the top left key or Escape) and plug in the keyboard.
+* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/prototypist/pt60/rules.mk b/keyboards/prototypist/pt60/rules.mk
new file mode 100644
index 0000000000..d469a47828
--- /dev/null
+++ b/keyboards/prototypist/pt60/rules.mk
@@ -0,0 +1,3 @@
+# This file intentionally left blank.
+
+
diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json
new file mode 100644
index 0000000000..8751845fc9
--- /dev/null
+++ b/keyboards/prototypist/pt80/info.json
@@ -0,0 +1,316 @@
+{
+ "manufacturer": "Proto[Typist]",
+ "keyboard_name": "PT-80",
+ "maintainer": "Anjheos",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B7", "B6", "B5", "B4", "B3", "B0", "A7", "B1", "B2", "B10", "A6", "A5", "A4", "A3", "C13", "A2", "C14"],
+ "rows": ["B14", "A8", "A9", "B13", "B11", "B12"]
+ },
+ "processor": "STM32F303",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0000",
+ "vid": "0x4A46"
+ },
+ "community_layouts": ["tkl_iso", "tkl_ansi"],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
+ { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 },
+ { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 },
+ { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 },
+ { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 },
+ { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 },
+ { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 },
+ { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 },
+ { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 },
+ { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 },
+ { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 },
+ { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 },
+ { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 },
+ { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 },
+ { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 },
+ { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 },
+ { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 },
+ { "matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25 },
+ { "matrix": [1, 1], "label": "!", "x": 1, "y": 1.25 },
+ { "matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25 },
+ { "matrix": [1, 3], "label": "\u00a3", "x": 3, "y": 1.25 },
+ { "matrix": [1, 4], "label": "$", "x": 4, "y": 1.25 },
+ { "matrix": [1, 5], "label": "%", "x": 5, "y": 1.25 },
+ { "matrix": [1, 6], "label": "^", "x": 6, "y": 1.25 },
+ { "matrix": [1, 7], "label": "&", "x": 7, "y": 1.25 },
+ { "matrix": [1, 8], "label": "*", "x": 8, "y": 1.25 },
+ { "matrix": [1, 9], "label": "(", "x": 9, "y": 1.25 },
+ { "matrix": [1, 10], "label": ")", "x": 10, "y": 1.25 },
+ { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 },
+ { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 },
+ { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 },
+ { "matrix": [3, 13], "label": "Del", "x": 14, "y": 1.25 },
+ { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 },
+ { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 },
+ { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 },
+ { "matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 },
+ { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 },
+ { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 },
+ { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 },
+ { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 },
+ { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 },
+ { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 },
+ { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 },
+ { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 },
+ { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 },
+ { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 },
+ { "matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25 },
+ { "matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25 },
+ { "matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 },
+ { "matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25 },
+ { "matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25 },
+ { "matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25 },
+ { "matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 },
+ { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 },
+ { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 },
+ { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 },
+ { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 },
+ { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 },
+ { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 },
+ { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 },
+ { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 },
+ { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 },
+ { "matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25 },
+ { "matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25 },
+ { "matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25 },
+ { "matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 },
+ { "matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25 },
+ { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 },
+ { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 },
+ { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 },
+ { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 },
+ { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 },
+ { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 },
+ { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 },
+ { "matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25 },
+ { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 },
+ { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 },
+ { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 },
+ { "matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25 },
+ { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 },
+ { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 },
+ { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 },
+ { "matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 },
+ { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
+ { "matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 },
+ { "matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25 },
+ { "matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25 },
+ { "matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25 },
+ { "matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25 },
+ { "matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25 },
+ { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 }
+ ]
+ },
+
+ "LAYOUT_tkl_iso": {
+ "layout": [
+ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
+ { "matrix": [0, 1], "label": "F1", "x": 2, "y": 0 },
+ { "matrix": [0, 2], "label": "F2", "x": 3, "y": 0 },
+ { "matrix": [0, 3], "label": "F3", "x": 4, "y": 0 },
+ { "matrix": [0, 4], "label": "F4", "x": 5, "y": 0 },
+ { "matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0 },
+ { "matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0 },
+ { "matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0 },
+ { "matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0 },
+ { "matrix": [0, 9], "label": "F9", "x": 11, "y": 0 },
+ { "matrix": [0, 10], "label": "F10", "x": 12, "y": 0 },
+ { "matrix": [0, 11], "label": "F11