diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-15 17:54:07 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-15 17:54:07 +1000 |
| commit | c202602938e1b065e6bac394771b310fea2a3edb (patch) | |
| tree | 444978b63e48d68f004b1c0730929bfbcfb221e8 /keyboards/edi | |
| parent | 8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff) | |
| parent | 51d5aad25b92a34bc051849616fcd93e3ae407fc (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/edi')
| -rw-r--r-- | keyboards/edi/hardlight/mk1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk1/info.json | 9 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk2/config.h | 7 | ||||
| -rw-r--r-- | keyboards/edi/hardlight/mk2/info.json | 9 |
4 files changed, 18 insertions, 14 deletions
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h index 321946b46c..fbcab5e8e5 100644 --- a/keyboards/edi/hardlight/mk1/config.h +++ b/keyboards/edi/hardlight/mk1/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 0xF7E0 -#define PRODUCT_ID 0x2401 -#define DEVICE_VER 0x0000 -#define MANUFACTURER Everywhere Defense Industries -#define PRODUCT Hard Light - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json new file mode 100644 index 0000000000..f0ff1b915f --- /dev/null +++ b/keyboards/edi/hardlight/mk1/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Hard Light", + "manufacturer": "Everywhere Defense Industries", + "usb": { + "vid": "0xF7E0", + "pid": "0x2401", + "device_version": "0.0.1" + } +} diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 8580aabec5..2cf9ab9af9 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xF7E0 -#define PRODUCT_ID 0x2408 -#define DEVICE_VER 0x0007 -#define MANUFACTURER Everywhere Defense Industries -#define PRODUCT Hard Light Mk 2 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json new file mode 100644 index 0000000000..25e9b06d49 --- /dev/null +++ b/keyboards/edi/hardlight/mk2/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Hard Light Mk 2", + "manufacturer": "Everywhere Defense Industries", + "usb": { + "vid": "0xF7E0", + "pid": "0x2408", + "device_version": "0.0.7" + } +} |