diff options
| author | QMK Bot <hello@qmk.fm> | 2022-07-27 21:44:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-07-27 21:44:42 +0000 |
| commit | 7bb73306d640a7453462f76c9d22459b5356a9da (patch) | |
| tree | 5b0acb1a7efbe5155ea732af3cc95bb307f1fe3d /keyboards/flx | |
| parent | 5055c9a74b0b88cb164f600963df40351ce4d5f7 (diff) | |
| parent | 23f365b6014634bf9f67ed3515853bf8c4372615 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/flx')
| -rw-r--r-- | keyboards/flx/lodestone/config.h | 7 | ||||
| -rw-r--r-- | keyboards/flx/lodestone/info.json | 8 | ||||
| -rw-r--r-- | keyboards/flx/virgo/config.h | 7 | ||||
| -rw-r--r-- | keyboards/flx/virgo/info.json | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/flx/lodestone/config.h b/keyboards/flx/lodestone/config.h index d4238c8eb8..844e769a6c 100644 --- a/keyboards/flx/lodestone/config.h +++ b/keyboards/flx/lodestone/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4658 //FX -#define PRODUCT_ID 0x4C53 //LS -#define DEVICE_VER 0x0001 -#define MANUFACTURER FLX -#define PRODUCT Lodestone - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/info.json index 8053aa36d4..e68241722f 100644 --- a/keyboards/flx/lodestone/info.json +++ b/keyboards/flx/lodestone/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "lodestone", + "keyboard_name": "Lodestone", + "manufacturer": "FLX", "url": "https://prototypist.net/", "maintainer": "Flexerm", + "usb": { + "vid": "0x4658", + "pid": "0x4C53", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h index 8ceb1e4ed1..facc392358 100644 --- a/keyboards/flx/virgo/config.h +++ b/keyboards/flx/virgo/config.h @@ -19,13 +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 0x4658 //FX -#define PRODUCT_ID 0x5647 //VG -#define DEVICE_VER 0x0001 -#define MANUFACTURER FLX -#define PRODUCT Virgo - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json index 5184e4fb15..6ae793eefb 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "FLX Virgo", + "keyboard_name": "Virgo", + "manufacturer": "FLX", "url": "", "maintainer": "mechmerlin", + "usb": { + "vid": "0x4658", + "pid": "0x5647", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |