From 0a94c2951fa3f4f7ca928c0cb5119ec5d7000132 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:12:20 -0700 Subject: [PATCH] [Keyboard] matchstickworks/southpad - Move files to rev1, add rev2 (#21574) Co-authored-by: Duncan Sutherland Co-authored-by: Drashna Jaelre Co-authored-by: Ryan --- data/mappings/keyboard_aliases.hjson | 3 + keyboards/matchstickworks/southpad/info.json | 48 +--------------- .../matchstickworks/southpad/rev1/info.json | 55 +++++++++++++++++++ .../{ => rev1}/keymaps/default/keymap.c | 4 +- .../southpad/{ => rev1}/readme.md | 6 +- .../matchstickworks/southpad/rev1/rules.mk | 0 .../matchstickworks/southpad/rev2/info.json | 55 +++++++++++++++++++ .../southpad/rev2/keymaps/default/keymap.c | 25 +++++++++ .../southpad/rev2/keymaps/via/keymap.c | 26 +++++++++ .../southpad/rev2/keymaps/via/rules.mk | 1 + .../matchstickworks/southpad/rev2/readme.md | 23 ++++++++ .../matchstickworks/southpad/rev2/rules.mk | 0 keyboards/matchstickworks/southpad/rules.mk | 12 ---- 13 files changed, 194 insertions(+), 64 deletions(-) create mode 100644 keyboards/matchstickworks/southpad/rev1/info.json rename keyboards/matchstickworks/southpad/{ => rev1}/keymaps/default/keymap.c (95%) rename keyboards/matchstickworks/southpad/{ => rev1}/readme.md (76%) create mode 100644 keyboards/matchstickworks/southpad/rev1/rules.mk create mode 100644 keyboards/matchstickworks/southpad/rev2/info.json create mode 100644 keyboards/matchstickworks/southpad/rev2/keymaps/default/keymap.c create mode 100644 keyboards/matchstickworks/southpad/rev2/keymaps/via/keymap.c create mode 100644 keyboards/matchstickworks/southpad/rev2/keymaps/via/rules.mk create mode 100644 keyboards/matchstickworks/southpad/rev2/readme.md create mode 100644 keyboards/matchstickworks/southpad/rev2/rules.mk delete mode 100644 keyboards/matchstickworks/southpad/rules.mk diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 2e79431965..038d4d588e 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -407,6 +407,9 @@ "maartenwut/wonderland": { "target": "evyd13/wonderland" }, + "matchstickworks/southpad": { + "target": "matchstickworks/southpad/rev2/" + }, "matrix/m12og": { "target": "matrix/m12og/rev1" }, diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json index 887c0484cb..dcf34cac3c 100644 --- a/keyboards/matchstickworks/southpad/info.json +++ b/keyboards/matchstickworks/southpad/info.json @@ -1,50 +1,4 @@ { - "keyboard_name": "SouthPad", "manufacturer": "MatchstickWorks", - "url": "", "maintainer": "MatchstickWorks", - "usb": { - "vid": "0xFEED", - "pid": "0x6060", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["B0", "B1", "B2", "B4"], - "rows": ["B3", "B5", "B6", "B7", "C7", "C6"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u2", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_numpad_6x4_southpaw": { - "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": [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, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 0], "x": 0, "y": 2, "h": 2}, - - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - {"matrix": [4, 3], "x": 3, "y": 4}, - {"matrix": [4, 0], "x": 0, "y": 4, "h": 2}, - - {"matrix": [5, 1], "x": 1, "y": 5}, - {"matrix": [5, 3], "x": 2, "y": 5, "w": 2} - ] - } - } -} +} \ No newline at end of file diff --git a/keyboards/matchstickworks/southpad/rev1/info.json b/keyboards/matchstickworks/southpad/rev1/info.json new file mode 100644 index 0000000000..15db9823b1 --- /dev/null +++ b/keyboards/matchstickworks/southpad/rev1/info.json @@ -0,0 +1,55 @@ +{ + "keyboard_name": "SouthPad", + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B4"], + "rows": ["B3", "B5", "B6", "B7", "C7", "C6"] + }, + "layouts": { + "LAYOUT": { + "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": [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, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4, "h": 2}, + + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 3], "x": 2, "y": 5, "w": 2} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/matchstickworks/southpad/keymaps/default/keymap.c b/keyboards/matchstickworks/southpad/rev1/keymaps/default/keymap.c similarity index 95% rename from keyboards/matchstickworks/southpad/keymaps/default/keymap.c rename to keyboards/matchstickworks/southpad/rev1/keymaps/default/keymap.c index 6d0f1252d4..7d5d5cf2b3 100644 --- a/keyboards/matchstickworks/southpad/keymaps/default/keymap.c +++ b/keyboards/matchstickworks/southpad/rev1/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad_6x4_southpaw( /* Base */ + [0] = LAYOUT( /* Base */ KC_BSPC, KC_EQL, KC_LPRN, KC_RPRN, KC_PMNS, KC_PAST, KC_PSLS, KC_NUM, KC_P9, KC_P8, KC_P7, @@ -24,4 +24,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P3, KC_P2, KC_P1, KC_PENT, KC_PDOT, KC_P0 ), -}; +}; \ No newline at end of file diff --git a/keyboards/matchstickworks/southpad/readme.md b/keyboards/matchstickworks/southpad/rev1/readme.md similarity index 76% rename from keyboards/matchstickworks/southpad/readme.md rename to keyboards/matchstickworks/southpad/rev1/readme.md index 8c8007c2e7..20b5a58085 100644 --- a/keyboards/matchstickworks/southpad/readme.md +++ b/keyboards/matchstickworks/southpad/rev1/readme.md @@ -9,8 +9,8 @@ Default layout is such: ![SouthPad Layout](https://i.imgur.com/jc7T2jl.jpg) * Keyboard Maintainer: [Logan Butler](https://github.com/MatchstickWorks) -* Hardware Supported: SouthPad PCB -* Hardware Availability: Either via [my Etsy Store](https://www.etsy.com/shop/MatchstickWorksShop) or by messaging directly +* Hardware Supported: SouthPad v1 PCB +* Hardware Availability: Either via [my storefront](https://matchstick.works), [my Etsy Store](https://www.etsy.com/shop/MatchstickWorksShop), or by messaging directly Getting the board into bootloader mode: @@ -18,6 +18,6 @@ In order to flash the firmware to this board, simply press the Reset button on t Make example for this keyboard (after setting up your build environment): - make matchstickworks/southpad:default + make matchstickworks/southpad/rev1:default 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/matchstickworks/southpad/rev1/rules.mk b/keyboards/matchstickworks/southpad/rev1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/matchstickworks/southpad/rev2/info.json b/keyboards/matchstickworks/southpad/rev2/info.json new file mode 100644 index 0000000000..717b56ef63 --- /dev/null +++ b/keyboards/matchstickworks/southpad/rev2/info.json @@ -0,0 +1,55 @@ +{ + "keyboard_name": "SouthPad v2", + "processor": "RP2040", + "bootloader": "rp2040", + "usb": { + "vid": "0x4D57", + "pid": "0x0002", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["GP13", "GP29", "GP28", "GP20", "GP19", "GP18"], + "cols": ["GP2", "GP4", "GP11", "GP12"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Bksp", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "=", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "(", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": ")", "matrix": [0, 3], "x": 3, "y": 0 }, + + { "label": "-", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "*", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "/", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "Num Lock", "matrix": [1, 3], "x": 3, "y": 1 }, + + { "label": "+", "matrix": [2, 0], "x": 0, "y": 2, "h": 2 }, + { "label": "9", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "8", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "7", "matrix": [2, 3], "x": 3, "y": 2 }, + + { "label": "6", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "5", "matrix": [3, 2], "x": 2, "y": 3 }, + { "label": "4", "matrix": [3, 3], "x": 3, "y": 3 }, + + { "label": "Enter", "matrix": [4, 0], "x": 0, "y": 4, "h": 2 }, + { "label": "3", "matrix": [4, 1], "x": 1, "y": 4 }, + { "label": "2", "matrix": [4, 2], "x": 2, "y": 4 }, + { "label": "1", "matrix": [4, 3], "x": 3, "y": 4 }, + + { "label": ".", "matrix": [5, 1], "x": 1, "y": 5 }, + { "label": "0", "matrix": [5, 3], "x": 2, "y": 5, "w": 2 } + ] + } + } +} diff --git a/keyboards/matchstickworks/southpad/rev2/keymaps/default/keymap.c b/keyboards/matchstickworks/southpad/rev2/keymaps/default/keymap.c new file mode 100644 index 0000000000..2dd332fdf5 --- /dev/null +++ b/keyboards/matchstickworks/southpad/rev2/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +/* Copyright 2023 Logan Butler*/ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_BSPC, KC_EQL, LSFT(KC_9),LSFT(KC_0), + KC_PMNS, KC_PAST, KC_PSLS, TG(1), + KC_PPLS, KC_P9, KC_P8, KC_P7, + KC_P6, KC_P5, KC_P4, + KC_PENT, KC_P3, KC_P2, KC_P1, + KC_PDOT, KC_P0 + ), + + [1] = LAYOUT( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, KC_PGUP, KC_UP, KC_HOME, + KC_LEFT, _______, KC_RGHT, + _______, KC_PGDN, KC_DOWN, KC_END, + KC_DEL, KC_INS + ), +}; \ No newline at end of file diff --git a/keyboards/matchstickworks/southpad/rev2/keymaps/via/keymap.c b/keyboards/matchstickworks/southpad/rev2/keymaps/via/keymap.c new file mode 100644 index 0000000000..eabe8dd5d5 --- /dev/null +++ b/keyboards/matchstickworks/southpad/rev2/keymaps/via/keymap.c @@ -0,0 +1,26 @@ +/* Copyright 2023 Logan Butler*/ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_BSPC, KC_EQL, LSFT(KC_9),LSFT(KC_0), + KC_PMNS, KC_PAST, KC_PSLS, TG(1), + KC_PPLS, KC_P9, KC_P8, KC_P7, + KC_P6, KC_P5, KC_P4, + KC_PENT, KC_P3, KC_P2, KC_P1, + KC_PDOT, KC_P0 + ), + + [1] = LAYOUT( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, KC_PGUP, KC_UP, KC_HOME, + KC_LEFT, _______, KC_RGHT, + _______, KC_PGDN, KC_DOWN, KC_END, + KC_DEL, KC_INS + ), + +}; \ No newline at end of file diff --git a/keyboards/matchstickworks/southpad/rev2/keymaps/via/rules.mk b/keyboards/matchstickworks/southpad/rev2/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/matchstickworks/southpad/rev2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/matchstickworks/southpad/rev2/readme.md b/keyboards/matchstickworks/southpad/rev2/readme.md new file mode 100644 index 0000000000..b249265f29 --- /dev/null +++ b/keyboards/matchstickworks/southpad/rev2/readme.md @@ -0,0 +1,23 @@ +# SouthPad + +![Southpad](https://i.imgur.com/oXi69cuh.png) + +This is a left-handed, mirrored numberpad with USB-C connection and Kailh hotswap sockets, built on the RP2040 MCU. + +Default layout is such: + +![SouthPad Layout](https://i.imgur.com/Zwxpa7ah.png) + +* Keyboard Maintainer: [Logan Butler](https://github.com/MatchstickWorks) +* Hardware Supported: SouthPad v2 PCB +* Hardware Availability: Either via [my storefront](https://matchstick.works), [my Etsy Store](https://www.etsy.com/shop/MatchstickWorksShop), or by messaging directly + +Getting the board into bootloader mode: + +In order to flash the firmware to this board, simply press both the RESET and BOOT buttons on the back of the PCB. You will hear a reconnect sound on your computer and a file explorer window should open where you can drag and drop the compiled UF2 into. + +Make example for this keyboard (after setting up your build environment): + + make matchstickworks/southpad/rev2:default + +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/matchstickworks/southpad/rev2/rules.mk b/keyboards/matchstickworks/southpad/rev2/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/matchstickworks/southpad/rules.mk b/keyboards/matchstickworks/southpad/rules.mk deleted file mode 100644 index 59c896dbff..0000000000 --- a/keyboards/matchstickworks/southpad/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output