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

6 files changed, 211 insertions, 0 deletions

diff --git a/keyboards/mazestudio/jocker/info.json b/keyboards/mazestudio/jocker/info.json
new file mode 100644
index 0000000000..5c5d4d6c08
--- /dev/null
+++ b/keyboards/mazestudio/jocker/info.json
@@ -0,0 +1,150 @@
+{
+    "manufacturer": "Maze Studio",
+    "keyboard_name": "Jocker 1800",
+    "maintainer": "mazestd",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "vid": "0x70F5",
+        "pid": "0x4A01",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "bootmagic":{
+        "matrix": [1, 0]
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B2", "B3"],
+        "rows": ["B1", "B0", "D1", "D0", "D5", "D3", "B7", "D2", "D4", "D6", "B4", "D7"]
+    },
+
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc", "matrix": [1,0], "x":0, "y":0},
+                {"label": "F1", "matrix": [0,0], "x":1.25, "y":0}, 
+                {"label": "F2", "matrix": [1,1], "x":2.25, "y":0}, 
+                {"label": "F3", "matrix": [0,1], "x":3.25, "y":0}, 
+                {"label": "F4", "matrix": [1,2], "x":4.25, "y":0}, 
+                {"label": "F5", "matrix": [0,2], "x":5.5, "y":0}, 
+                {"label": "F6", "matrix": [1,3], "x":6.5, "y":0}, 
+                {"label": "F7", "matrix": [0,3], "x":7.5, "y":0}, 
+                {"label": "F8", "matrix": [1,4], "x":8.5, "y":0}, 
+                {"label": "F9", "matrix": [1,5], "x":9.75, "y":0}, 
+                {"label": "F10", "matrix": [0,5], "x":10.75, "y":0}, 
+                {"label": "F11", "matrix": [1,6], "x":11.75, "y":0}, 
+                {"label": "F12", "matrix": [0,6], "x":12.75, "y":0}, 
+                {"label": "F13", "matrix": [1,7], "x":14, "y":0}, 
+                {"label": "Scroll Lock", "matrix": [0,7], "x":15.25, "y":0}, 
+                {"label": "Pause Break", "matrix": [1,8], "x":16.5, "y":0}, 
+                {"label": "Insert", "matrix": [0,8], "x":17.5, "y":0}, 
+                {"label": "Home", "matrix": [1,9], "x":18.5, "y":0}, 
+                {"label": "Print Screen", "matrix": [0,9], "x":19.5, "y":0},
+
+                {"label": "~", "matrix": [3,0], "x":0, "y":1.25}, 
+                {"label": "1", "matrix": [2,0], "x":1, "y":1.25}, 
+                {"label": "2", "matrix": [3,1], "x":2, "y":1.25}, 
+                {"label": "3", "matrix": [2,1], "x":3, "y":1.25}, 
+                {"label": "4", "matrix": [3,2], "x":4, "y":1.25}, 
+                {"label": "5", "matrix": [2,2], "x":5, "y":1.25}, 
+                {"label": "6", "matrix": [3,3], "x":6, "y":1.25}, 
+                {"label": "7", "matrix": [2,3], "x":7, "y":1.25}, 
+                {"label": "8", "matrix": [3,4], "x":8, "y":1.25}, 
+                {"label": "9", "matrix": [2,4], "x":9, "y":1.25}, 
+                {"label": "0", "matrix": [3,5], "x":10, "y":1.25}, 
+                {"label": "-", "matrix": [2,5], "x":11, "y":1.25}, 
+                {"label": "=", "matrix": [3,6], "x":12, "y":1.25}, 
+                {"label": "|", "matrix": [2,6], "x":13, "y":1.25}, 
+                {"label": "Delete", "matrix": [3,7], "x":14, "y":1.25}, 
+                {"label": "Page Up", "matrix": [2,7], "x":15.25, "y":1.25}, 
+                {"label": "Num Lock", "matrix": [3,8], "x":16.5, "y":1.25}, 
+                {"label": "/", "matrix": [2,8], "x":17.5, "y":1.25}, 
+                {"label": "*", "matrix": [3,9], "x":18.5, "y":1.25}, 
+                {"label": "-", "matrix": [2,9], "x":19.5, "y":1.25},
+
+                {"label": "Tab", "matrix": [5,0], "x":0, "y":2.25, "w":1.5}, 
+                {"label": "Q", "matrix": [4,0], "x":1.5, "y":2.25}, 
+                {"label": "W", "matrix": [5,1], "x":2.5, "y":2.25}, 
+                {"label": "E", "matrix": [4,1], "x":3.5, "y":2.25}, 
+                {"label": "R", "matrix": [5,2], "x":4.5, "y":2.25}, 
+                {"label": "T", "matrix": [4,2], "x":5.5, "y":2.25}, 
+                {"label": "Y", "matrix": [5,3], "x":6.5, "y":2.25}, 
+                {"label": "U", "matrix": [4,3], "x":7.5, "y":2.25}, 
+                {"label": "I", "matrix": [5,4], "x":8.5, "y":2.25}, 
+                {"label": "O", "matrix": [4,4], "x":9.5, "y":2.25}, 
+                {"label": "P", "matrix": [5,5], "x":10.5, "y":2.25}, 
+                {"label": "[", "matrix": [4,5], "x":11.5, "y":2.25}, 
+                {"label": "]", "matrix": [5,6], "x":12.5, "y":2.25}, 
+                {"label": "Backspace", "matrix": [5,7], "x":13.5, "y":2.25, "w":1.5}, 
+                {"label": "Page Down", "matrix": [4,7], "x":15.25, "y":2.25}, 
+                {"label": "Num 7", "matrix": [5,8], "x":16.5, "y":2.25}, 
+                {"label": "Num 8", "matrix": [4,8], "x":17.5, "y":2.25}, 
+                {"label": "Num 9", "matrix": [5,9], "x":18.5, "y":2.25}, 
+                {"label": "Num Plus", "matrix": [4,9], "x":19.5, "y":2.25, "h":2},
+
+                {"label": "Caps Lock", "matrix": [7,0], "x":0, "y":3.25, "w":1.75}, 
+                {"label": "A", "matrix": [6,0], "x":1.75, "y":3.25}, 
+                {"label": "S", "matrix": [7,1], "x":2.75, "y":3.25}, 
+                {"label": "D", "matrix": [6,1], "x":3.75, "y":3.25}, 
+                {"label": "F", "matrix": [7,2], "x":4.75, "y":3.25}, 
+                {"label": "G", "matrix": [6,2], "x":5.75, "y":3.25}, 
+                {"label": "H", "matrix": [7,3], "x":6.75, "y":3.25}, 
+                {"label": "J", "matrix": [6,3], "x":7.75, "y":3.25}, 
+                {"label": "K", "matrix": [7,4], "x":8.75, "y":3.25}, 
+                {"label": "L", "matrix": [6,4], "x":9.75, "y":3.25}, 
+                {"label": ";", "matrix": [7,5], "x":10.75, "y":3.25}, 
+                {"label": "'", "matrix": [6,5], "x":11.75, "y":3.25}, 
+                {"label": "Enter", "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
+                {"label": "Delete", "matrix": [6,7], "x":15.25, "y":3.25}, 
+                {"label": "Num 4", "matrix": [7,8], "x":16.5, "y":3.25}, 
+                {"label": "Num 5", "matrix": [6,8], "x":17.5, "y":3.25}, 
+                {"label": "Num 6", "matrix": [7,9], "x":18.5, "y":3.25}, 
+
+                {"label": "Left Shift", "matrix": [9,0], "x":0, "y":4.25, "w":2.25}, 
+                {"label": "Z", "matrix": [8,0], "x":2.25, "y":4.25}, 
+                {"label": "X", "matrix": [9,1], "x":3.25, "y":4.25}, 
+                {"label": "C", "matrix": [8,1], "x":4.25, "y":4.25}, 
+                {"label": "V", "matrix": [9,2], "x":5.25, "y":4.25}, 
+                {"label": "B", "matrix": [8,2], "x":6.25, "y":4.25}, 
+                {"label": "N", "matrix": [9,3], "x":7.25, "y":4.25}, 
+                {"label": "M", "matrix": [8,3], "x":8.25, "y":4.25}, 
+                {"label": ",", "matrix": [9,4], "x":9.25, "y":4.25}, 
+                {"label": ".", "matrix": [8,4], "x":10.25, "y":4.25}, 
+                {"label": "/", "matrix": [9,5], "x":11.25, "y":4.25}, 
+                {"label": "Right Shift", "matrix": [9,6], "x":12.25, "y":4.25, "w":1.75},
+                {"label": "Up", "matrix": [9,7], "x":14.25, "y":4.5}, 
+                {"label": "Num 1", "matrix": [9,8], "x":16.5, "y":4.25}, 
+                {"label": "Num 2", "matrix": [8,8], "x":17.5, "y":4.25}, 
+                {"label": "Num 3", "matrix": [9,9], "x":18.5, "y":4.25}, 
+                {"label": "Enter", "matrix": [8,9], "x":19.5, "y":4.25, "h":2}, 
+
+                {"label": "Left Ctrl", "matrix": [11,0], "x":0, "y":5.25, "w":1.25}, 
+                {"label": "Left Win", "matrix": [10,0], "x":1.25, "y":5.25, "w":1.25}, 
+                {"label": "Left Alt", "matrix": [11,1], "x":2.5, "y":5.25, "w":1.25}, 
+                {"label": "Space", "matrix": [10,2], "x":3.75, "y":5.25, "w":6.25}, 
+                {"label": "Right Alt", "matrix": [10,4], "x":10, "y":5.25, "w":1.5}, 
+                {"label": "Right Ctrl", "matrix": [10,5], "x":11.5, "y":5.25, "w":1.5}, 
+                {"label": "Left", "matrix": [10,6], "x":13.25, "y":5.5}, 
+                {"label": "Down", "matrix": [11,7], "x":14.25, "y":5.5}, 
+                {"label": "Right", "matrix": [10,7], "x":15.25, "y":5.5}, 
+                {"label": "Num 0", "matrix": [10,8], "x":16.5, "y":5.25, "w":2}, 
+                {"label": "Num Del", "matrix": [11,9], "x":18.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/mazestudio/jocker/keymaps/default/keymap.c b/keyboards/mazestudio/jocker/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b64c4a299f
--- /dev/null
+++ b/keyboards/mazestudio/jocker/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Maze Studio
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, 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_F13, KC_SCRL, KC_PAUS, KC_INS, KC_HOME, KC_PSCR,
+        KC_GRV, 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_BSLS, KC_DEL, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+        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_BSPC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, 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_DEL, KC_P4, KC_P5, KC_P6,
+        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_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+
+    )
+};
\ No newline at end of file
diff --git a/keyboards/mazestudio/jocker/keymaps/via/keymap.c b/keyboards/mazestudio/jocker/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b64c4a299f
--- /dev/null
+++ b/keyboards/mazestudio/jocker/keymaps/via/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Maze Studio
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC, 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_F13, KC_SCRL, KC_PAUS, KC_INS, KC_HOME, KC_PSCR,
+        KC_GRV, 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_BSLS, KC_DEL, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+        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_BSPC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_CAPS, 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_DEL, KC_P4, KC_P5, KC_P6,
+        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_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+
+    )
+};
\ No newline at end of file
diff --git a/keyboards/mazestudio/jocker/keymaps/via/rules.mk b/keyboards/mazestudio/jocker/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mazestudio/jocker/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mazestudio/jocker/readme.md b/keyboards/mazestudio/jocker/readme.md
new file mode 100644
index 0000000000..8dcc6390b0
--- /dev/null
+++ b/keyboards/mazestudio/jocker/readme.md
@@ -0,0 +1,27 @@
+# Jocker 1800
+
+![jocker1800]( https://i.imgur.com/aQEiE4Hh.jpg )
+
+PCB Replacement for Austin 1800
+
+* Keyboard Maintainer: [Maze Studio](https://github.com/mazestd)
+* Hardware Supported: Jocker PCB, Atmega32u4
+* Hardware Availability: Local Group Buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mazestd/jocker:default
+
+Flashing example for this keyboard:
+
+    make mazestd/jocker: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 (1,0) in the matrix or Escape Key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/mazestudio/jocker/rules.mk b/keyboards/mazestudio/jocker/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/mazestudio/jocker/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file