Skip to content

Commit

Permalink
[Keyboard] matchstickworks/southpad - Move files to rev1, add rev2 (q…
Browse files Browse the repository at this point in the history
…mk#21574)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
  • Loading branch information
4 people authored and zgagnon committed Dec 15, 2023
1 parent c5a6103 commit 7c0a4a3
Show file tree
Hide file tree
Showing 13 changed files with 194 additions and 64 deletions.
3 changes: 3 additions & 0 deletions data/mappings/keyboard_aliases.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,9 @@
"maartenwut/wonderland": {
"target": "evyd13/wonderland"
},
"matchstickworks/southpad": {
"target": "matchstickworks/southpad/rev2/"
},
"matrix/m12og": {
"target": "matrix/m12og/rev1"
},
Expand Down
48 changes: 1 addition & 47 deletions keyboards/matchstickworks/southpad/info.json
Original file line number Diff line number Diff line change
@@ -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}
]
}
}
}
}
55 changes: 55 additions & 0 deletions keyboards/matchstickworks/southpad/rev1/info.json
Original file line number Diff line number Diff line change
@@ -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}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#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,
KC_PPLS, KC_P6, KC_P5, KC_P4,
KC_P3, KC_P2, KC_P1,
KC_PENT, KC_PDOT, KC_P0
),
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ 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:

In order to flash the firmware to this board, simply press the Reset button on the back of the PCB. You should head a USB disconnect and reconnect sound shortly following.

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).
Empty file.
55 changes: 55 additions & 0 deletions keyboards/matchstickworks/southpad/rev2/info.json
Original file line number Diff line number Diff line change
@@ -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 }
]
}
}
}
25 changes: 25 additions & 0 deletions keyboards/matchstickworks/southpad/rev2/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -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
),
};
26 changes: 26 additions & 0 deletions keyboards/matchstickworks/southpad/rev2/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -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
),

};
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
23 changes: 23 additions & 0 deletions keyboards/matchstickworks/southpad/rev2/readme.md
Original file line number Diff line number Diff line change
@@ -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).
Empty file.
12 changes: 0 additions & 12 deletions keyboards/matchstickworks/southpad/rules.mk

This file was deleted.

0 comments on commit 7c0a4a3

Please sign in to comment.