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/acheron/shark | |
| parent | b44c3f92ae312f279f1b8e88ddc1d1336786f4d7 (diff) | |
| parent | 30796913913c0f6dc0cce317ad8249de2b602294 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/acheron/shark')
| -rw-r--r-- | keyboards/acheron/shark/alpha/config.h | 7 | ||||
| -rw-r--r-- | keyboards/acheron/shark/alpha/info.json | 4 | ||||
| -rw-r--r-- | keyboards/acheron/shark/beta/config.h | 7 | ||||
| -rw-r--r-- | keyboards/acheron/shark/beta/info.json | 7 | ||||
| -rw-r--r-- | keyboards/acheron/shark/info.json | 6 |
5 files changed, 17 insertions, 14 deletions
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index e98bae4510..50e14aa258 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/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 0xAC11 -#define PRODUCT_ID 0x5368 -#define DEVICE_VER 0x0001 -#define MANUFACTURER AcheronProject -#define PRODUCT SharkPCB - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 21f4807eeb..435ea843aa 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -2,6 +2,10 @@ "keyboard_name": "SharkPCB", "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html", "maintainer": "Gondolindrim", + "usb": { + "pid": "0x5368", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index b50762b8af..77e98b329c 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/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 0xAC11 -#define PRODUCT_ID 0x5369 // For Shark+1 -#define DEVICE_VER 0x0002 -#define MANUFACTURER AcheronProject -#define PRODUCT SharkPCB rev. Beta - #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json new file mode 100644 index 0000000000..5d0c6557e7 --- /dev/null +++ b/keyboards/acheron/shark/beta/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "SharkPCB rev. Beta", + "usb": { + "pid": "0x5369", + "device_version": "0.0.2" + } +} diff --git a/keyboards/acheron/shark/info.json b/keyboards/acheron/shark/info.json new file mode 100644 index 0000000000..6d22c842fb --- /dev/null +++ b/keyboards/acheron/shark/info.json @@ -0,0 +1,6 @@ +{ + "manufacturer": "AcheronProject", + "usb": { + "vid": "0xAC11" + } +} |