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/3w6 | |
| 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/3w6')
| -rw-r--r-- | keyboards/3w6/info.json | 5 | ||||
| -rw-r--r-- | keyboards/3w6/rev1/config.h | 8 | ||||
| -rw-r--r-- | keyboards/3w6/rev1/info.json | 5 | ||||
| -rw-r--r-- | keyboards/3w6/rev2/config.h | 8 | ||||
| -rw-r--r-- | keyboards/3w6/rev2/info.json | 5 |
5 files changed, 15 insertions, 16 deletions
diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json index ab463bc60c..d76688bfc1 100644 --- a/keyboards/3w6/info.json +++ b/keyboards/3w6/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "3w6", + "manufacturer": "weteor", "url": "https://github.com/weteor/3W6/", "maintainer": "weteor", + "usb": { + "vid": "0xFEED", + "pid": "0x4658" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/3w6/rev1/config.h b/keyboards/3w6/rev1/config.h index 2ec430b4e2..c9b8f8b58e 100644 --- a/keyboards/3w6/rev1/config.h +++ b/keyboards/3w6/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4658 -#define DEVICE_VER 0x0001 -#define MANUFACTURER weteor -#define PRODUCT 3w6 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/3w6/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/3w6/rev2/config.h b/keyboards/3w6/rev2/config.h index df68436ff1..c9b8f8b58e 100644 --- a/keyboards/3w6/rev2/config.h +++ b/keyboards/3w6/rev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4658 -#define DEVICE_VER 0x0002 -#define MANUFACTURER weteor -#define PRODUCT 3w6 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/3w6/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} |