Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into xap
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Sep 21, 2024
2 parents 5d51eab + bda3300 commit c8465b4
Show file tree
Hide file tree
Showing 4 changed files with 195 additions and 0 deletions.
107 changes: 107 additions & 0 deletions keyboards/scottokeebs/scotto69/keyboard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"manufacturer": "ScottoKeebs",
"keyboard_name": "Scotto69 (PCB Edition)",
"maintainer": "joe-scotto",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B15", "pin_b": "B14"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["A7", "A8", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "A3", "A4", "A5", "A6"],
"rows": ["B11", "B10", "B2", "B1", "B0"]
},
"processor": "STM32F072",
"url": "https://scottokeebs.com",
"usb": {
"device_version": "1.0.0",
"pid": "0x0030",
"vid": "0x534B"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0.5},
{"matrix": [0, 2], "x": 3, "y": 0.5},
{"matrix": [0, 3], "x": 4, "y": 0.5},
{"matrix": [0, 4], "x": 5, "y": 0.5},
{"matrix": [0, 5], "x": 6, "y": 0.5},
{"matrix": [0, 6], "x": 7, "y": 0.5},
{"matrix": [0, 7], "x": 8, "y": 0.5},
{"matrix": [0, 8], "x": 9, "y": 0.5},
{"matrix": [0, 9], "x": 10, "y": 0.5},
{"matrix": [0, 10], "x": 11, "y": 0.5},
{"matrix": [0, 11], "x": 12, "y": 0.5},
{"matrix": [0, 12], "x": 13, "y": 0.5},
{"matrix": [0, 13], "x": 15, "y": 0},
{"matrix": [0, 14], "x": 16, "y": 0},
{"matrix": [0, 15], "x": 17, "y": 0},
{"matrix": [0, 16], "x": 18, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 2, "y": 1.5},
{"matrix": [1, 2], "x": 3, "y": 1.5},
{"matrix": [1, 3], "x": 4, "y": 1.5},
{"matrix": [1, 4], "x": 5, "y": 1.5},
{"matrix": [1, 5], "x": 6, "y": 1.5},
{"matrix": [1, 6], "x": 7, "y": 1.5},
{"matrix": [1, 7], "x": 8, "y": 1.5},
{"matrix": [1, 8], "x": 9, "y": 1.5},
{"matrix": [1, 9], "x": 10, "y": 1.5},
{"matrix": [1, 10], "x": 11, "y": 1.5},
{"matrix": [1, 11], "x": 12, "y": 1.5},
{"matrix": [1, 12], "x": 13, "y": 1.5},
{"matrix": [1, 13], "x": 15, "y": 1},
{"matrix": [1, 14], "x": 16, "y": 1},
{"matrix": [1, 15], "x": 17, "y": 1},
{"matrix": [1, 16], "x": 18, "y": 1, "h": 2},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 2, "y": 2.5},
{"matrix": [2, 2], "x": 3, "y": 2.5},
{"matrix": [2, 3], "x": 4, "y": 2.5},
{"matrix": [2, 4], "x": 5, "y": 2.5},
{"matrix": [2, 5], "x": 6, "y": 2.5},
{"matrix": [2, 6], "x": 7, "y": 2.5},
{"matrix": [2, 7], "x": 8, "y": 2.5},
{"matrix": [2, 8], "x": 9, "y": 2.5},
{"matrix": [2, 9], "x": 10, "y": 2.5},
{"matrix": [2, 10], "x": 11, "y": 2.5},
{"matrix": [2, 11], "x": 12, "y": 2.5},
{"matrix": [2, 12], "x": 13, "y": 2.5},
{"matrix": [2, 13], "x": 15, "y": 2},
{"matrix": [2, 14], "x": 16, "y": 2},
{"matrix": [2, 15], "x": 17, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 2, "y": 3.5},
{"matrix": [3, 2], "x": 3, "y": 3.5},
{"matrix": [3, 3], "x": 4, "y": 3.5},
{"matrix": [3, 4], "x": 5, "y": 3.5},
{"matrix": [3, 5], "x": 6, "y": 3.5},
{"matrix": [3, 6], "x": 7, "y": 3.5, "w": 2},
{"matrix": [3, 8], "x": 9, "y": 3.5},
{"matrix": [3, 9], "x": 10, "y": 3.53},
{"matrix": [3, 10], "x": 11, "y": 3.53},
{"matrix": [3, 11], "x": 12, "y": 3.5},
{"matrix": [3, 12], "x": 13, "y": 3.5},
{"matrix": [3, 13], "x": 15, "y": 3},
{"matrix": [3, 14], "x": 16, "y": 3},
{"matrix": [3, 15], "x": 17, "y": 3},
{"matrix": [3, 16], "x": 18, "y": 3, "h": 2},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 13], "x": 15, "y": 4, "w": 2},
{"matrix": [4, 15], "x": 17, "y": 4}
]
}
}
}
58 changes: 58 additions & 0 deletions keyboards/scottokeebs/scotto69/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
Copyright 2024 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

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(_______, _______) },
[2] = { ENCODER_CCW_CW(_______, _______) },
[3] = { ENCODER_CCW_CW(_______, _______) }
};
#endif

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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_LNUM, KC_SLSH, KC_ASTR, KC_MINS,
KC_2, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC, KC_QUOT, KC_7, KC_8, KC_9, KC_PLUS,
KC_MUTE, KC_LSFT, LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_RSFT, KC_4, KC_5, KC_6,
KC_4, KC_ESC, KC_NO, KC_NO, KC_LCTL, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_NO, KC_NO, KC_NO, KC_1, KC_2, KC_3, KC_ENT,
KC_5, KC_0, KC_DOT
),
[1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), 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
),
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), 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
),
[3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, 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
)
};
1 change: 1 addition & 0 deletions keyboards/scottokeebs/scotto69/keymaps/default/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
29 changes: 29 additions & 0 deletions keyboards/scottokeebs/scotto69/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Scotto69 (PCB Edition)

![Scotto69 (PCB Edition)](https://i.imgur.com/WNtAzcG.jpeg)

The Scotto69 (PCB Edition) is a standard 4x12 ortholinear keyboard with a numpad on the right and 5 macro keys on the left with an optional encoder.

* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
* Hardware Supported: STM32F072CBT6
* Hardware Availability: [ScottoKeebs](https://scottokeebs.com)

# Compiling

Make example for this keyboard (after setting up your build environment):

make handwired/scottokeebs/scotto69:default

Flashing example for this keyboard:

make handwired/scottokeebs/scotto69: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

0 comments on commit c8465b4

Please sign in to comment.