From a639dc2cf509ec9228a55b77620dc332f3f6f3c2 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 28 May 2023 18:42:41 -0400 Subject: [PATCH 1/9] Add ScottoMouse --- .../scottokeebs/scottomouse/info.json | 39 +++++++++++++++++++ .../scottomouse/keymaps/default/keymap.c | 24 ++++++++++++ .../scottomouse/keymaps/scotto/config.h | 31 +++++++++++++++ .../scottomouse/keymaps/scotto/keymap.c | 33 ++++++++++++++++ .../scottomouse/keymaps/scotto/rules.mk | 1 + .../scottokeebs/scottomouse/readme.md | 25 ++++++++++++ .../scottokeebs/scottomouse/rules.mk | 1 + 7 files changed, 154 insertions(+) create mode 100644 keyboards/handwired/scottokeebs/scottomouse/info.json create mode 100644 keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c create mode 100644 keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h create mode 100644 keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c create mode 100644 keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk create mode 100644 keyboards/handwired/scottokeebs/scottomouse/readme.md create mode 100644 keyboards/handwired/scottokeebs/scottomouse/rules.mk diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/info.json new file mode 100644 index 000000000000..fdd87c2e188d --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/info.json @@ -0,0 +1,39 @@ +{ + "manufacturer": "ScottoKeebs", + "keyboard_name": "ScottoMouse", + "maintainer": "joe-scotto", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"] + ] + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0002", + "vid": "0x534B" + }, + "layouts": { + "LAYOUT_1x6": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "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 } + ] + } + } +} diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c new file mode 100644 index 000000000000..9d1d87012f43 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +/* +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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1x6( + KC_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP, KC_MS_DOWN, KC_MS_RIGHT + ) +}; \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h new file mode 100644 index 000000000000..6c6565880ae6 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h @@ -0,0 +1,31 @@ +/* +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 . +*/ + +#pragma once + +// Mouse key speed and acceleration. +#undef MOUSEKEY_DELAY +#define MOUSEKEY_DELAY 0 +#undef MOUSEKEY_INTERVAL +#define MOUSEKEY_INTERVAL 16 +#undef MOUSEKEY_WHEEL_DELAY +#define MOUSEKEY_WHEEL_DELAY 0 +#undef MOUSEKEY_MAX_SPEED +#define MOUSEKEY_MAX_SPEED 6 +#undef MOUSEKEY_TIME_TO_MAX +#define MOUSEKEY_TIME_TO_MAX 64 + diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c new file mode 100644 index 000000000000..324daea798ec --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c @@ -0,0 +1,33 @@ +/* +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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM scroll_down[] = {KC_MS_BTN1, KC_MS_BTN2, KC_MS_DOWN, COMBO_END}; +const uint16_t PROGMEM scroll_up[] = {KC_MS_BTN1, KC_MS_BTN2, KC_MS_UP, COMBO_END}; +const uint16_t PROGMEM middle_click[] = {KC_MS_BTN1, KC_MS_BTN2, COMBO_END}; +combo_t key_combos[] = { + COMBO(scroll_down, KC_MS_WH_DOWN), + COMBO(scroll_up, KC_MS_WH_UP), + COMBO(middle_click, KC_MS_BTN3) +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1x6( + KC_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP, KC_MS_DOWN, KC_MS_RIGHT + ) +}; \ No newline at end of file diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk new file mode 100644 index 000000000000..ab1e438182a3 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk @@ -0,0 +1 @@ +COMBO_ENABLE = yes diff --git a/keyboards/handwired/scottokeebs/scottomouse/readme.md b/keyboards/handwired/scottokeebs/scottomouse/readme.md new file mode 100644 index 000000000000..9e1b4fae90da --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/readme.md @@ -0,0 +1,25 @@ +# ScottoMouse + + + +A 6 key mouse using [QMK mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md), case files available [here](https://github.com/joe-scotto/scottokeebs.git). + +- Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) +- Hardware Supported: Raspberry Pi Pico +- Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [Ali](https://amazon.com) + +# Compiling + +Make example for this keyboard (after setting up your build environment): + + make handwired/scottokeebs/scottomouse:default + +Flashing example for this keyboard: + + make handwired/scottokeebs/scottomouse:default:flash + +# Bootloader + +Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the left most key (0, 0) when plugging the board in to enter bootloader mode. + +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). diff --git a/keyboards/handwired/scottokeebs/scottomouse/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/rules.mk new file mode 100644 index 000000000000..8178c6e5e5ef --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/rules.mk @@ -0,0 +1 @@ +BOOTLOADER = rp2040 From a401e902f760709140b7791afd89ff7907a3e2d7 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 28 May 2023 18:48:32 -0400 Subject: [PATCH 2/9] Update readme and config --- .../scottokeebs/scottomouse/keymaps/scotto/config.h | 5 ----- keyboards/handwired/scottokeebs/scottomouse/readme.md | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h index 6c6565880ae6..4b0d2cd2fb00 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h @@ -18,14 +18,9 @@ along with this program. If not, see . #pragma once // Mouse key speed and acceleration. -#undef MOUSEKEY_DELAY #define MOUSEKEY_DELAY 0 -#undef MOUSEKEY_INTERVAL #define MOUSEKEY_INTERVAL 16 -#undef MOUSEKEY_WHEEL_DELAY #define MOUSEKEY_WHEEL_DELAY 0 -#undef MOUSEKEY_MAX_SPEED #define MOUSEKEY_MAX_SPEED 6 -#undef MOUSEKEY_TIME_TO_MAX #define MOUSEKEY_TIME_TO_MAX 64 diff --git a/keyboards/handwired/scottokeebs/scottomouse/readme.md b/keyboards/handwired/scottokeebs/scottomouse/readme.md index 9e1b4fae90da..c4cd13629a95 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/readme.md +++ b/keyboards/handwired/scottokeebs/scottomouse/readme.md @@ -1,6 +1,6 @@ # ScottoMouse - +![ScottoMouse](https://i.imgur.com/yjnhyXWh.jpeg) A 6 key mouse using [QMK mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md), case files available [here](https://github.com/joe-scotto/scottokeebs.git). From 84a8157d3ddec45e7019a7ad50f0e83a3eced0d4 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 28 May 2023 18:55:30 -0400 Subject: [PATCH 3/9] Update keyboards/handwired/scottokeebs/scottomouse/rules.mk Co-authored-by: Joel Challis --- keyboards/handwired/scottokeebs/scottomouse/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/rules.mk index 8178c6e5e5ef..6e7633bfe015 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/rules.mk +++ b/keyboards/handwired/scottokeebs/scottomouse/rules.mk @@ -1 +1 @@ -BOOTLOADER = rp2040 +# This file intentionally left blank From a1333e0b487c513c47f6138d5c90c8328b927f4d Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 28 May 2023 21:54:13 -0400 Subject: [PATCH 4/9] Update keyboards/handwired/scottokeebs/scottomouse/info.json Co-authored-by: Ryan --- .../handwired/scottokeebs/scottomouse/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/info.json index fdd87c2e188d..06b8c261437d 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/info.json +++ b/keyboards/handwired/scottokeebs/scottomouse/info.json @@ -27,12 +27,12 @@ "layouts": { "LAYOUT_1x6": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "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, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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} ] } } From ef985de2b536bf712b308c6776d341208f2cc6dd Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Fri, 2 Jun 2023 01:14:32 -0400 Subject: [PATCH 5/9] Update keyboards/handwired/scottokeebs/scottomouse/readme.md Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> --- keyboards/handwired/scottokeebs/scottomouse/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/readme.md b/keyboards/handwired/scottokeebs/scottomouse/readme.md index c4cd13629a95..b9ee2b64c766 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/readme.md +++ b/keyboards/handwired/scottokeebs/scottomouse/readme.md @@ -4,9 +4,9 @@ A 6 key mouse using [QMK mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md), case files available [here](https://github.com/joe-scotto/scottokeebs.git). -- Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) -- Hardware Supported: Raspberry Pi Pico -- Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [Ali](https://amazon.com) +* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) +* Hardware Supported: Raspberry Pi Pico +* Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [Ali](https://amazon.com) # Compiling From f1505a7512966705e2be0b64e81eb96b7cfbeded Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Fri, 2 Jun 2023 13:35:56 -0400 Subject: [PATCH 6/9] Update readme.md and add URL, USB, and to info.json --- .../handwired/scottokeebs/scottomouse/info.json | 6 +++--- .../handwired/scottokeebs/scottomouse/readme.md | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/info.json index 06b8c261437d..c324c1a2e0c8 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/info.json +++ b/keyboards/handwired/scottokeebs/scottomouse/info.json @@ -18,11 +18,11 @@ ] }, "processor": "RP2040", - "url": "", + "url": "https://scottokeebs.com", "usb": { "device_version": "1.0.0", - "pid": "0x0002", - "vid": "0x534B" + "pid": "0x0018", + "vid": "0xFEED" }, "layouts": { "LAYOUT_1x6": { diff --git a/keyboards/handwired/scottokeebs/scottomouse/readme.md b/keyboards/handwired/scottokeebs/scottomouse/readme.md index b9ee2b64c766..4102f633107d 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/readme.md +++ b/keyboards/handwired/scottokeebs/scottomouse/readme.md @@ -2,7 +2,7 @@ ![ScottoMouse](https://i.imgur.com/yjnhyXWh.jpeg) -A 6 key mouse using [QMK mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md), case files available [here](https://github.com/joe-scotto/scottokeebs.git). +A 6-key macropad that utilizes [QMK mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md) to emulate a mouse, case files available [here](https://github.com/joe-scotto/scottokeebs.git). * Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) * Hardware Supported: Raspberry Pi Pico @@ -18,8 +18,12 @@ Flashing example for this keyboard: make handwired/scottokeebs/scottomouse:default:flash -# Bootloader +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). -Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the left most key (0, 0) when plugging the board in to enter bootloader mode. +## Bootloader -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). +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 From 1091e42d41a0b9ebc27a8f7f015e5c3596db576c Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Mon, 14 Aug 2023 07:59:50 -0400 Subject: [PATCH 7/9] Update keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c Co-authored-by: Ryan --- .../handwired/scottokeebs/scottomouse/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c index 9d1d87012f43..6cc4d9014446 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_1x6( + [0] = LAYOUT( KC_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP, KC_MS_DOWN, KC_MS_RIGHT ) }; \ No newline at end of file From 22ed95275b69a5a681f513b091e78e5f48083eaf Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Mon, 14 Aug 2023 08:00:00 -0400 Subject: [PATCH 8/9] Update keyboards/handwired/scottokeebs/scottomouse/info.json Co-authored-by: Ryan --- keyboards/handwired/scottokeebs/scottomouse/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/info.json index c324c1a2e0c8..36f92f48e268 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/info.json +++ b/keyboards/handwired/scottokeebs/scottomouse/info.json @@ -25,7 +25,7 @@ "vid": "0xFEED" }, "layouts": { - "LAYOUT_1x6": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From 2aaf649f136afb925401a278550680f001c7c230 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Mon, 14 Aug 2023 08:04:12 -0400 Subject: [PATCH 9/9] Update keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c Co-authored-by: Ryan --- .../handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c index 324daea798ec..d17ed1f28aab 100644 --- a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c @@ -27,7 +27,7 @@ combo_t key_combos[] = { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_1x6( + [0] = LAYOUT( KC_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP, KC_MS_DOWN, KC_MS_RIGHT ) }; \ No newline at end of file