diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-14 00:47:42 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-14 00:47:42 +0000 |
commit | 50ff52639f9dcaae3153348ca4f363645c2331b2 (patch) | |
tree | bf11c955715de9329fca8e6c5b6522701dbb30b5 /keyboards/25keys/aleth42 | |
parent | b44c3f92ae312f279f1b8e88ddc1d1336786f4d7 (diff) | |
parent | 30796913913c0f6dc0cce317ad8249de2b602294 (diff) | |
download | qmk_firmware-50ff52639f9dcaae3153348ca4f363645c2331b2.tar.gz qmk_firmware-50ff52639f9dcaae3153348ca4f363645c2331b2.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/25keys/aleth42')
-rw-r--r-- | keyboards/25keys/aleth42/info.json | 7 | ||||
-rw-r--r-- | keyboards/25keys/aleth42/rev0/config.h | 7 | ||||
-rw-r--r-- | keyboards/25keys/aleth42/rev0/info.json | 5 | ||||
-rw-r--r-- | keyboards/25keys/aleth42/rev1/config.h | 7 | ||||
-rw-r--r-- | keyboards/25keys/aleth42/rev1/info.json | 5 |
5 files changed, 16 insertions, 15 deletions
diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json index 5a8b564685..7a71d2b367 100644 --- a/keyboards/25keys/aleth42/info.json +++ b/keyboards/25keys/aleth42/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "aleth42", + "keyboard_name": "ALETH42", + "manufacturer": "25KEYS", "url": "http://www.sho-k.co.uk/tech/aleth42", "maintainer": "monksoffunk", + "usb": { + "vid": "0x04D8", + "pid": "0xEAC8" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index 21071f8ca8..c177990e99 100644 --- a/keyboards/25keys/aleth42/rev0/config.h +++ b/keyboards/25keys/aleth42/rev0/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 0x04D8 -#define PRODUCT_ID 0xEAC8 -#define DEVICE_VER 0x0000 -#define MANUFACTURER 25KEYS -#define PRODUCT ALETH42 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json new file mode 100644 index 0000000000..5baab67dba --- /dev/null +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.0" + } +} diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index 0cf444bee4..14b5588ab4 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/rev1/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 0x04D8 -#define PRODUCT_ID 0xEAC8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER 25KEYS -#define PRODUCT ALETH42 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} |