summaryrefslogtreecommitdiffstats
path: root/keyboards/ungodly/launch_pad
diff options
context:
space:
mode:
authorlokher <lokher@gmail.com>2022-09-13 11:13:00 +0800
committerlokher <lokher@gmail.com>2022-09-13 11:13:00 +0800
commitfe13cedf8c09fa34d5cec4e4c624738095176625 (patch)
tree818436626d49c7f22f325632b2053edba10d4358 /keyboards/ungodly/launch_pad
parentfa207545a9759c50b9f230eb608d86a9085801d4 (diff)
parentf46379f308783994b8178f95adc686f4b4c3ebd8 (diff)
merge upstream master
Diffstat (limited to 'keyboards/ungodly/launch_pad')
-rw-r--r--keyboards/ungodly/launch_pad/config.h7
-rw-r--r--keyboards/ungodly/launch_pad/info.json6
-rw-r--r--keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c2
3 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index cf639a4f28..d641bab9cd 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -17,13 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5544 // "UD" = Ungodly Design
-#define PRODUCT_ID 0x4C50 // "LP" = Launch Pad
-#define DEVICE_VER 0x9999
-#define MANUFACTURER Ungodly Design
-#define PRODUCT Launch Pad
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 4
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index 767fef5e44..bc562186f4 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Launch Pad",
+ "manufacturer": "Ungodly Design",
"url": "https://ungodly.design/products/launch-pad",
"maintainer": "Ungodly Design",
+ "usb": {
+ "vid": "0x5544",
+ "pid": "0x4C50",
+ "device_version": "99.9.9"
+ },
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
index 63f142d913..23d3c5edc7 100644
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
+++ b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_HUD, RGB_HUI, XXXXXXX, RGB_M_P,
RGB_SAD, RGB_SAI, XXXXXXX, RGB_MOD,
RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX,
- RESET, RESET, XXXXXXX, XXXXXXX
+ QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX
),
};