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

4 files changed, 197 insertions, 0 deletions

diff --git a/keyboards/handwired/scottokeebs/scotto108/info.json b/keyboards/handwired/scottokeebs/scotto108/info.json
new file mode 100644
index 0000000000..0781bb4cae
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/info.json
@@ -0,0 +1,138 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "Scotto108",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP29", "GP28", "GP27", "GP26", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1022",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
+                {"matrix": [0, 18], "x": 19, "y": 0},
+                {"matrix": [0, 19], "x": 20, "y": 0},
+                {"matrix": [0, 20], "x": 21, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18, "y": 1.5},
+                {"matrix": [1, 18], "x": 19, "y": 1.5},
+                {"matrix": [1, 19], "x": 20, "y": 1.5},
+                {"matrix": [1, 20], "x": 21, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6, "y": 2.5},
+                {"matrix": [2, 7], "x": 7, "y": 2.5},
+                {"matrix": [2, 8], "x": 8, "y": 2.5},
+                {"matrix": [2, 9], "x": 9, "y": 2.5},
+                {"matrix": [2, 10], "x": 10, "y": 2.5},
+                {"matrix": [2, 11], "x": 11, "y": 2.5},
+                {"matrix": [2, 12], "x": 12, "y": 2.5},
+                {"matrix": [2, 13], "x": 13, "y": 2.5},
+                {"matrix": [2, 14], "x": 14.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18, "y": 2.5},
+                {"matrix": [2, 18], "x": 19, "y": 2.5},
+                {"matrix": [2, 19], "x": 20, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+                {"matrix": [3, 4], "x": 4, "y": 3.5},
+                {"matrix": [3, 5], "x": 5, "y": 3.5},
+                {"matrix": [3, 6], "x": 6, "y": 3.5},
+                {"matrix": [3, 7], "x": 7, "y": 3.5},
+                {"matrix": [3, 8], "x": 8, "y": 3.5},
+                {"matrix": [3, 9], "x": 9, "y": 3.5},
+                {"matrix": [3, 10], "x": 10, "y": 3.5},
+                {"matrix": [3, 11], "x": 11, "y": 3.5},
+                {"matrix": [3, 13], "x": 12, "y": 3.5, "w": 2},
+                {"matrix": [3, 17], "x": 18, "y": 3.5},
+                {"matrix": [3, 18], "x": 19, "y": 3.5},
+                {"matrix": [3, 19], "x": 20, "y": 3.5},
+                {"matrix": [3, 20], "x": 21, "y": 2.5, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+                {"matrix": [4, 4], "x": 4, "y": 4.5},
+                {"matrix": [4, 5], "x": 5, "y": 4.5},
+                {"matrix": [4, 6], "x": 6, "y": 4.5},
+                {"matrix": [4, 7], "x": 7, "y": 4.5},
+                {"matrix": [4, 8], "x": 8, "y": 4.5},
+                {"matrix": [4, 9], "x": 9, "y": 4.5},
+                {"matrix": [4, 10], "x": 10, "y": 4.5},
+                {"matrix": [4, 12], "x": 11, "y": 4.5, "w": 3},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18, "y": 4.5},
+                {"matrix": [4, 18], "x": 19, "y": 4.5},
+                {"matrix": [4, 19], "x": 20, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2, "y": 5.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.5},
+                {"matrix": [5, 11], "x": 11, "y": 5.5},
+                {"matrix": [5, 12], "x": 12, "y": 5.5},
+                {"matrix": [5, 13], "x": 13, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18, "y": 5.5, "w": 2},
+                {"matrix": [5, 19], "x": 20, "y": 5.5},
+                {"matrix": [5, 20], "x": 21, "y": 4.5, "h": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto108/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scotto108/keymaps/default/keymap.c
new file mode 100644
index 0000000000..472318e1f5
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 Joe Scotto
+
+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(
+        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_PSCR, KC_SCRL, KC_PAUS,      KC_1,   KC_2,    KC_3,    KC_4,
+        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_EQUAL, KC_BSPC,     KC_INS,  KC_HOME, 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_BSLS,     KC_DEL,  KC_END,  KC_PGDN,      KC_P7,  KC_P8,   KC_P9,
+        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_P4,  KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMMA,  KC_DOT, KC_SLSH,                    KC_RSFT,              KC_UP,                 KC_P1,  KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                           KC_RALT, KC_RGUI, KC_APP,   KC_RCTL,     KC_LEFT, KC_DOWN, KC_RIGHT,     KC_P0,           KC_PDOT, KC_PENT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto108/readme.md b/keyboards/handwired/scottokeebs/scotto108/readme.md
new file mode 100644
index 0000000000..1875adbc30
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/readme.md
@@ -0,0 +1,29 @@
+# Scotto108
+
+![Scotto108](https://i.imgur.com/ss4BEujh.jpg)
+
+A 108-key full-sized ortholinear keyboard with a 7u spacebar and 4 macro keys above the numpad.
+
+*   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+*   Hardware Supported: Raspberry Pi Pico
+*   Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [AliExpress](https://aliexpress.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/scottokeebs/scotto108:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scotto108: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 (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 - 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/handwired/scottokeebs/scotto108/rules.mk b/keyboards/handwired/scottokeebs/scotto108/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank