diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-02 00:03:00 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-02 00:03:00 +0000 |
| commit | e6dc14ae4113400b663c4d544ff97be30bcd4d82 (patch) | |
| tree | 36402eebfce696934f39cadbc6489f08fe7fbc7a /keyboards/lily58 | |
| parent | e3ee87ee3181eb71c0347c5d0a32309936d0fb3d (diff) | |
| parent | 7222969964a41a295910844ef93372e368439a09 (diff) | |
| download | qmk_firmware-e6dc14ae4113400b663c4d544ff97be30bcd4d82.tar.gz qmk_firmware-e6dc14ae4113400b663c4d544ff97be30bcd4d82.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/lily58')
| -rw-r--r-- | keyboards/lily58/glow_enc/config.h | 7 | ||||
| -rw-r--r-- | keyboards/lily58/glow_enc/info.json | 8 | ||||
| -rw-r--r-- | keyboards/lily58/light/config.h | 7 | ||||
| -rw-r--r-- | keyboards/lily58/light/info.json | 8 | ||||
| -rw-r--r-- | keyboards/lily58/rev1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/lily58/rev1/info.json | 6 |
6 files changed, 20 insertions, 23 deletions
diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h index 5e51acea25..67005f06b0 100644 --- a/keyboards/lily58/glow_enc/config.h +++ b/keyboards/lily58/glow_enc/config.h @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFC51 -#define PRODUCT_ID 0x0059 -#define DEVICE_VER 0x0100 -#define MANUFACTURER ORVISEVANS+ -#define PRODUCT Lily58GlowEnc - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index 503cdaae12..8e8b72434b 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Lily58", + "keyboard_name": "Lily58GlowEnc", + "manufacturer": "ORVISEVANS+", "url": "https://keycapsss.com", "maintainer": "BenRoe", + "usb": { + "vid": "0xFC51", + "pid": "0x0059", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h index 1893dde8eb..32c9445152 100644 --- a/keyboards/lily58/light/config.h +++ b/keyboards/lily58/light/config.h @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7983 -#define PRODUCT_ID 0x4C4C // "LL" -#define DEVICE_VER 0x0100 -#define MANUFACTURER Keycapsss -#define PRODUCT Lily58L - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index 503cdaae12..a0f931a6d9 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Lily58", + "keyboard_name": "Lily58L", + "manufacturer": "Keycapsss", "url": "https://keycapsss.com", "maintainer": "BenRoe", + "usb": { + "vid": "0x7983", + "pid": "0x4C4C", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h index 6bfc7ffa75..8205899f5e 100644 --- a/keyboards/lily58/rev1/config.h +++ b/keyboards/lily58/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB2D -#define DEVICE_VER 0x0100 -#define MANUFACTURER liliums -#define PRODUCT Lily58 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index ed4deb0098..10370c6d16 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Lily58", + "manufacturer": "liliums", "url": "", "maintainer": "liliums", + "usb": { + "vid": "0x04D8", + "pid": "0xEB2D", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ |