From 97cdd40b9c74774575b5b0f92bfbdacb73b86ab3 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 14 May 2023 12:59:06 -0400 Subject: [PATCH 01/15] Add ScottoMacrodeck --- .../scottokeebs/scottomacrodeck/info.json | 50 +++++++++++++++++++ .../scottomacrodeck/keymaps/default/keymap.c | 27 ++++++++++ .../scottomacrodeck/keymaps/via/keymap.c | 42 ++++++++++++++++ .../scottomacrodeck/keymaps/via/rules.mk | 1 + .../scottokeebs/scottomacrodeck/readme.md | 25 ++++++++++ .../scottokeebs/scottomacrodeck/rules.mk | 1 + 6 files changed, 146 insertions(+) create mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/info.json create mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c create mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c create mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk create mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/readme.md create mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json new file mode 100644 index 000000000000..16c87b55a8a2 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json @@ -0,0 +1,50 @@ +{ + "manufacturer": "ScottoKeebs", + "keyboard_name": "ScottoMacrodeck", + "maintainer": "joe-scotto", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [ + ["D3", "D2", "D1", null], + ["D0", "D4", "C6", "D7"], + ["E6", "B4", "B5", "F4"] + ] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x534B" + }, + "layouts": { + "LAYOUT_ortho_3x4": { + "layout": [ + // Row 1 + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + + // Row 2 + { "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 }, + + // Row 3 + { "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 } + ] + } + } +} diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c new file mode 100644 index 000000000000..19700b11665e --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* +Copyright 2022 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 + +// Keymap +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_3x4( + KC_1, KC_2, KC_3, + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F + ) +}; diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c new file mode 100644 index 000000000000..36861ab09be2 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c @@ -0,0 +1,42 @@ +/* +Copyright 2022 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 + +// Keymap +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_3x4( + KC_1, KC_2, KC_3, + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F + ), + [1] = LAYOUT_ortho_3x4( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_ortho_3x4( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_ortho_3x4( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md new file mode 100644 index 000000000000..a0239c48dcb3 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md @@ -0,0 +1,25 @@ +# ScottoMacrodeck + +![ScottoMacrodeck](https://imgur.com/KVJuIVNh.jpeg) + +An 11 key VIA compatible macro pad. 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) + +# Compiling + +Make example for this keyboard (after setting up your build environment): + + make handwired/jscotto/scottomacrodeck:default + +Flashing example for this keyboard: + + make handwired/jscotto/scottomacrodeck:default + +# Bootloader + +Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left 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/scottomacrodeck/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk new file mode 100644 index 000000000000..4da205a168c7 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk @@ -0,0 +1 @@ +LTO_ENABLE = yes From 8825208b2bcab6e176f80cdb713cf62bdf5cbf62 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 14 May 2023 21:13:00 -0400 Subject: [PATCH 02/15] Update year and remove comment --- .../scottokeebs/scottomacrodeck/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c index 19700b11665e..1e8115d44c22 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2022 Joe Scotto +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 @@ -17,7 +17,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -// Keymap const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_3x4( KC_1, KC_2, KC_3, From 62b923ea72ff36ca99bba78f2d098e7d44711161 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sun, 14 May 2023 21:14:00 -0400 Subject: [PATCH 03/15] Update VIA --- .../scottomacrodeck/keymaps/via/keymap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c index 36861ab09be2..1e8115d44c22 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2022 Joe Scotto +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 @@ -17,26 +17,10 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -// Keymap const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_3x4( KC_1, KC_2, KC_3, KC_Q, KC_W, KC_E, KC_R, KC_A, KC_S, KC_D, KC_F - ), - [1] = LAYOUT_ortho_3x4( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = LAYOUT_ortho_3x4( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT_ortho_3x4( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; From 5c7f6e71e3627818ec69d4708eb8adec25a48230 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Wed, 17 May 2023 23:41:10 -0400 Subject: [PATCH 04/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk index 4da205a168c7..e69de29bb2d1 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk @@ -1 +0,0 @@ -LTO_ENABLE = yes From 7edd1974a98219e254e3724a245c9e34aca370b3 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Wed, 17 May 2023 23:41:14 -0400 Subject: [PATCH 05/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/scottokeebs/scottomacrodeck/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json index 16c87b55a8a2..dba25139531c 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json @@ -11,6 +11,9 @@ "mousekey": true, "nkro": true }, + "build" : { + "lto": true, + }, "matrix_pins": { "direct": [ ["D3", "D2", "D1", null], From 38fa117314655709ae64d0f5f339a1d70bede828 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Wed, 17 May 2023 23:41:19 -0400 Subject: [PATCH 06/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/scottokeebs/scottomacrodeck/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json index dba25139531c..c31afe8b2990 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json @@ -21,7 +21,6 @@ ["E6", "B4", "B5", "F4"] ] }, - "processor": "atmega32u4", "url": "", "usb": { "device_version": "1.0.0", From 2c46691dbb38b2eb8720a7757f46afa0073e34a1 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Wed, 17 May 2023 23:41:29 -0400 Subject: [PATCH 07/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/scottokeebs/scottomacrodeck/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json index c31afe8b2990..77c74571e5a4 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json @@ -2,7 +2,7 @@ "manufacturer": "ScottoKeebs", "keyboard_name": "ScottoMacrodeck", "maintainer": "joe-scotto", - "bootloader": "caterina", + "development_board": "promicro", "features": { "bootmagic": true, "command": false, From 2fd29cf76c83cc322e40471a907c80ec2f8b0d25 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Thu, 1 Jun 2023 10:49:50 -0400 Subject: [PATCH 08/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/readme.md Co-authored-by: Ryan --- keyboards/handwired/scottokeebs/scottomacrodeck/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md index a0239c48dcb3..b08365cfb08e 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md @@ -12,11 +12,11 @@ An 11 key VIA compatible macro pad. Case files available [here](https://github.c Make example for this keyboard (after setting up your build environment): - make handwired/jscotto/scottomacrodeck:default + make handwired/scottokeebs/scottomacrodeck:default Flashing example for this keyboard: - make handwired/jscotto/scottomacrodeck:default + make handwired/scottokeebs/scottomacrodeck:default # Bootloader From 479a8d710b0a1b1006e93e6e6f38e6839d3e55b7 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Thu, 1 Jun 2023 10:58:24 -0400 Subject: [PATCH 09/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/readme.md Co-authored-by: Ryan --- keyboards/handwired/scottokeebs/scottomacrodeck/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md index b08365cfb08e..fe1f964b4ccb 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md @@ -4,9 +4,9 @@ An 11 key VIA compatible macro pad. 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) +* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) +* Hardware Supported: ATmega32U4 +* Hardware Availability: [Amazon](https://amazon.com) # Compiling From ae589f115ec65f0b15d8faca233d9821d140a0eb Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Fri, 2 Jun 2023 13:29:58 -0400 Subject: [PATCH 10/15] Update readme.md and add URL, USB, and to info.json --- .../handwired/scottokeebs/scottomacrodeck/info.json | 6 +++--- .../handwired/scottokeebs/scottomacrodeck/readme.md | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json index 77c74571e5a4..ab93ca0b0072 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json @@ -21,11 +21,11 @@ ["E6", "B4", "B5", "F4"] ] }, - "url": "", + "url": "https://scottokeebs.com", "usb": { "device_version": "1.0.0", - "pid": "0x0001", - "vid": "0x534B" + "pid": "0x0015", + "vid": "0xFEED" }, "layouts": { "LAYOUT_ortho_3x4": { diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md index fe1f964b4ccb..1b62df1eb5aa 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md @@ -2,7 +2,7 @@ ![ScottoMacrodeck](https://imgur.com/KVJuIVNh.jpeg) -An 11 key VIA compatible macro pad. Case files available [here](https://github.com/joe-scotto/scottokeebs). +An 11-key macropad designed specifically for someone who games with a single thumb, however, it can be used as a traditional macropad. Case files available [here](https://github.com/joe-scotto/scottokeebs). * Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto) * Hardware Supported: ATmega32U4 @@ -16,10 +16,12 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - make handwired/scottokeebs/scottomacrodeck:default + make handwired/scottokeebs/scottomacrodeck:default:flash -# Bootloader +## Bootloader -Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter bootloader mode. +Enter the bootloader in 3 ways: -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). +* **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 0e6f806254e9fe402531e356426cf39daf3c53b0 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Fri, 2 Jun 2023 13:41:42 -0400 Subject: [PATCH 11/15] Update readme.md --- keyboards/handwired/scottokeebs/scottomacrodeck/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md index 1b62df1eb5aa..4fc82f42c8bd 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md @@ -18,6 +18,8 @@ Flashing example for this keyboard: make handwired/scottokeebs/scottomacrodeck: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: From 0aef814226f19a410c3620946f7441bb8c6cf8ef Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Mon, 14 Aug 2023 08:00:59 -0400 Subject: [PATCH 12/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/scottokeebs/scottomacrodeck/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json index ab93ca0b0072..f238564c7fb3 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json @@ -28,7 +28,7 @@ "vid": "0xFEED" }, "layouts": { - "LAYOUT_ortho_3x4": { + "LAYOUT": { "layout": [ // Row 1 { "matrix": [0, 0], "x": 0, "y": 0 }, From 55f4dd783ce5e12de212ec13096ae7e1524faffb Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Mon, 14 Aug 2023 08:01:08 -0400 Subject: [PATCH 13/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- .../scottokeebs/scottomacrodeck/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c index 1e8115d44c22..c8becfca5809 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/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_ortho_3x4( + [0] = LAYOUT( KC_1, KC_2, KC_3, KC_Q, KC_W, KC_E, KC_R, KC_A, KC_S, KC_D, KC_F From 84bedeb9dd2f1ca98ebd21f309c3fa96a5ebb2c2 Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Mon, 14 Aug 2023 08:01:12 -0400 Subject: [PATCH 14/15] Update keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- .../handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c index 1e8115d44c22..c8becfca5809 100644 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c +++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/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_ortho_3x4( + [0] = LAYOUT( KC_1, KC_2, KC_3, KC_Q, KC_W, KC_E, KC_R, KC_A, KC_S, KC_D, KC_F From 7f4ae5e66ce1e3b4e9d4865cc01145953ee9c1fa Mon Sep 17 00:00:00 2001 From: Joe Scotto Date: Sat, 9 Sep 2023 20:18:52 -0400 Subject: [PATCH 15/15] Remove via keymap --- .../scottomacrodeck/keymaps/via/keymap.c | 26 ------------------- .../scottomacrodeck/keymaps/via/rules.mk | 1 - 2 files changed, 27 deletions(-) delete mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c deleted file mode 100644 index c8becfca5809..000000000000 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -/* -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( - KC_1, KC_2, KC_3, - KC_Q, KC_W, KC_E, KC_R, - KC_A, KC_S, KC_D, KC_F - ) -}; diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes