diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
| commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
| tree | 1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/maple_computing/launchpad | |
| parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
| parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) | |
| download | qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/maple_computing/launchpad')
| -rw-r--r-- | keyboards/maple_computing/launchpad/config.h | 6 | ||||
| -rw-r--r-- | keyboards/maple_computing/launchpad/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/maple_computing/launchpad/rev1/info.json | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index 901c63c93b..92d597508a 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1337 -#define PRODUCT_ID 0x6007 -#define MANUFACTURER Maple Computing -#define PRODUCT Launch Pad - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 2 diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index baceaa43f7..427e04618c 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "../config.h" -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { C6, B1, B3, D7 } #define MATRIX_COL_PINS { D2, F7 } diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index c8ba35c966..4931670cb4 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Launch Pad rev1", + "keyboard_name": "Launch Pad", + "manufacturer": "Maple Computing", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x1337", + "pid": "0x6007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |