summaryrefslogtreecommitdiff
path: root/keyboards/aplyard
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-14 00:47:42 +0000
committerQMK Bot <hello@qmk.fm>2022-08-14 00:47:42 +0000
commit50ff52639f9dcaae3153348ca4f363645c2331b2 (patch)
treebf11c955715de9329fca8e6c5b6522701dbb30b5 /keyboards/aplyard
parentb44c3f92ae312f279f1b8e88ddc1d1336786f4d7 (diff)
parent30796913913c0f6dc0cce317ad8249de2b602294 (diff)
downloadqmk_firmware-50ff52639f9dcaae3153348ca4f363645c2331b2.tar.gz
qmk_firmware-50ff52639f9dcaae3153348ca4f363645c2331b2.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/aplyard')
-rw-r--r--keyboards/aplyard/aplx6/info.json4
-rw-r--r--keyboards/aplyard/aplx6/rev1/config.h7
-rw-r--r--keyboards/aplyard/aplx6/rev1/info.json6
-rw-r--r--keyboards/aplyard/aplx6/rev2/config.h7
-rw-r--r--keyboards/aplyard/aplx6/rev2/info.json6
5 files changed, 16 insertions, 14 deletions
diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json
index 2df8d9fb3a..0bd317c1a4 100644
--- a/keyboards/aplyard/aplx6/info.json
+++ b/keyboards/aplyard/aplx6/info.json
@@ -1,7 +1,11 @@
{
"keyboard_name": "Aplx6",
+ "manufacturer": "Aplyard",
"url": "",
"maintainer": "Aplyard",
+ "usb": {
+ "vid": "0xE0E0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h
index 94e9717efa..6aadc3efb2 100644
--- a/keyboards/aplyard/aplx6/rev1/config.h
+++ b/keyboards/aplyard/aplx6/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 0xE0E0
-#define PRODUCT_ID 0x0030
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Aplyard
-#define PRODUCT Aplx6
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json
new file mode 100644
index 0000000000..3eb12dda15
--- /dev/null
+++ b/keyboards/aplyard/aplx6/rev1/info.json
@@ -0,0 +1,6 @@
+{
+ "usb": {
+ "pid": "0x0030",
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h
index a190083da5..922ab5f44a 100644
--- a/keyboards/aplyard/aplx6/rev2/config.h
+++ b/keyboards/aplyard/aplx6/rev2/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 0xE0E0
-#define PRODUCT_ID 0x0040
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Aplyard
-#define PRODUCT Aplx6
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json
new file mode 100644
index 0000000000..06fc50187a
--- /dev/null
+++ b/keyboards/aplyard/aplx6/rev2/info.json
@@ -0,0 +1,6 @@
+{
+ "usb": {
+ "pid": "0x0040",
+ "device_version": "0.0.2"
+ }
+}