From 7188777227f69b9c65fc45fe4419302e759b3042 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sat, 20 Jan 2024 15:00:49 -0500 Subject: [PATCH 1/2] Add ScottoDeck --- .../scottokeebs/scottodeck/info.json | 52 +++++++++++++++++++ .../scottodeck/keymaps/default/keymap.c | 34 ++++++++++++ .../scottokeebs/scottodeck/readme.md | 27 ++++++++++ .../handwired/scottokeebs/scottodeck/rules.mk | 1 + 4 files changed, 114 insertions(+) create mode 100644 keyboards/handwired/scottokeebs/scottodeck/info.json create mode 100644 keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c create mode 100644 keyboards/handwired/scottokeebs/scottodeck/readme.md create mode 100644 keyboards/handwired/scottokeebs/scottodeck/rules.mk diff --git a/keyboards/handwired/scottokeebs/scottodeck/info.json b/keyboards/handwired/scottokeebs/scottodeck/info.json new file mode 100644 index 000000000000..0607918cae39 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottodeck/info.json @@ -0,0 +1,52 @@ +{ + "manufacturer": "ScottoKeebs", + "keyboard_name": "ScottoDeck", + "maintainer": "joe-scotto", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "GP2", "pin_b": "GP3"}, + {"pin_a": "GP27", "pin_b": "GP28"} + ] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + ["GP9", null, null, "GP21"], + ["GP7", "GP8", "GP20", "GP23"], + ["GP5", "GP6", "GP26", "GP22"] + ] + }, + "processor": "RP2040", + "url": "https://scottokeebs.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x0024", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c new file mode 100644 index 000000000000..46ffe9969585 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* +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 . +*/ + +#include QMK_KEYBOARD_H + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(HYPR(KC_RIGHT), HYPR(KC_LEFT)), ENCODER_CCW_CW(HYPR(KC_UP), HYPR(KC_DOWN)) } + // Encoder 1 Encoder 2 +}; +#endif + +// Keymap +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + HYPR(KC_9), HYPR(KC_0), + HYPR(KC_5), HYPR(KC_6), HYPR(KC_7), HYPR(KC_8), + HYPR(KC_1), HYPR(KC_2), HYPR(KC_3), HYPR(KC_4) + ) +}; diff --git a/keyboards/handwired/scottokeebs/scottodeck/readme.md b/keyboards/handwired/scottokeebs/scottodeck/readme.md new file mode 100644 index 000000000000..86224acb3c97 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottodeck/readme.md @@ -0,0 +1,27 @@ +# ScottoDeck + +![ScottoDeck](https://i.imgur.com/xUl70qqh.jpeg) + +An 8-key macropad with two EC11 encoders designed for live streaming. Case files available [here](https://github.com/joe-scotto/scottokeebs). + +* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) +* Hardware Supported: ATmega32U4 +* Hardware Availability: [Amazon](https://amazon.com) + +Make example for this keyboard (after setting up your build environment): + + make handwired/scottokeebs/scottodeck:default + +Flashing example for this keyboard: + + make handwired/scottokeebs/scottodeck: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 \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottodeck/rules.mk b/keyboards/handwired/scottokeebs/scottodeck/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottodeck/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 7119f1be5e8f4a15146340ce37b637b73105519b Mon Sep 17 00:00:00 2001 From: Joe Scotto <8194147+joe-scotto@users.noreply.github.com> Date: Sat, 20 Jan 2024 16:04:18 -0500 Subject: [PATCH 2/2] Update keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../handwired/scottokeebs/scottodeck/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c index 46ffe9969585..181c1e309df7 100644 --- a/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c +++ b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(HYPR(KC_RIGHT), HYPR(KC_LEFT)), ENCODER_CCW_CW(HYPR(KC_UP), HYPR(KC_DOWN)) } // Encoder 1 Encoder 2 };