summaryrefslogtreecommitdiff
path: root/keyboards/acheron
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/acheron
parentb44c3f92ae312f279f1b8e88ddc1d1336786f4d7 (diff)
parent30796913913c0f6dc0cce317ad8249de2b602294 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/acheron')
-rw-r--r--keyboards/acheron/apollo/87h/delta/config.h7
-rw-r--r--keyboards/acheron/apollo/87h/delta/info.json7
-rw-r--r--keyboards/acheron/apollo/87h/gamma/config.h7
-rw-r--r--keyboards/acheron/apollo/87h/gamma/info.json7
-rw-r--r--keyboards/acheron/apollo/87h/info.json5
-rw-r--r--keyboards/acheron/apollo/87htsc/config.h7
-rw-r--r--keyboards/acheron/apollo/87htsc/info.json8
-rw-r--r--keyboards/acheron/apollo/88htsc/config.h7
-rw-r--r--keyboards/acheron/apollo/88htsc/info.json8
-rw-r--r--keyboards/acheron/athena/alpha/config.h7
-rw-r--r--keyboards/acheron/athena/alpha/info.json7
-rw-r--r--keyboards/acheron/athena/beta/config.h7
-rw-r--r--keyboards/acheron/athena/beta/info.json7
-rw-r--r--keyboards/acheron/athena/info.json5
-rw-r--r--keyboards/acheron/elongate/beta/config.h7
-rw-r--r--keyboards/acheron/elongate/beta/info.json6
-rwxr-xr-xkeyboards/acheron/elongate/delta/config.h7
-rw-r--r--keyboards/acheron/elongate/delta/info.json6
-rw-r--r--keyboards/acheron/shark/alpha/config.h7
-rw-r--r--keyboards/acheron/shark/alpha/info.json4
-rw-r--r--keyboards/acheron/shark/beta/config.h7
-rw-r--r--keyboards/acheron/shark/beta/info.json7
-rw-r--r--keyboards/acheron/shark/info.json6
23 files changed, 79 insertions, 74 deletions
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 04a440835f..1365b81774 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/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 0x4150 // AP for AcheronProject
-#define PRODUCT_ID 0x8775 // For 87H + 3 (revision Delta)
-#define DEVICE_VER 0x0004 // Revision Delta
-#define MANUFACTURER AcheronProject
-#define PRODUCT Apollo87H
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
new file mode 100644
index 0000000000..8f501970a5
--- /dev/null
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "Apollo87H",
+ "usb": {
+ "pid": "0x8775",
+ "device_version": "0.0.4"
+ }
+}
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index a28e498dcc..451071f869 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/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 0x4150 // AP for AcheronProject
-#define PRODUCT_ID 0x8774 // For 87H + 2 (revision Gamma)
-#define DEVICE_VER 0x0003 // Revision Gamma
-#define MANUFACTURER AcheronProject
-#define PRODUCT Apollo87H rev. Gamma
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
new file mode 100644
index 0000000000..6a7a382eaa
--- /dev/null
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "Apollo87H rev. Gamma",
+ "usb": {
+ "pid": "0x8774",
+ "device_version": "0.0.3"
+ }
+}
diff --git a/keyboards/acheron/apollo/87h/info.json b/keyboards/acheron/apollo/87h/info.json
index e5d2c0d40d..7dbd896a18 100644
--- a/keyboards/acheron/apollo/87h/info.json
+++ b/keyboards/acheron/apollo/87h/info.json
@@ -1,7 +1,10 @@
{
- "keyboard_name": "AcheronProject Apollo87H",
+ "manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x4150"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 9bf3840d76..0cb3d38128 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/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 0x4150 // AP for AcheronProject
-#define PRODUCT_ID 0x8776 // For 87H + 4
-#define DEVICE_VER 0x0001 // Revision Alpha
-#define MANUFACTURER AcheronProject
-#define PRODUCT Apollo87H-T-SC
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index bfa2229431..b2a9cf1643 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "AcheronProject Apollo87H-T-SC",
+ "keyboard_name": "Apollo87H-T-SC",
+ "manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x4150",
+ "pid": "0x8776",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi_tsangan": {
"layout": [
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 24574a9658..7df9fc3e6b 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/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 0x4150 // AP for AcheronProject
-#define PRODUCT_ID 0x8873 // For 87H
-#define DEVICE_VER 0x0001 // Revision Alpha
-#define MANUFACTURER AcheronProject
-#define PRODUCT Apollo88H-T-SC
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index c848132b5c..4d695faf70 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "AcheronProject Apollo88H-T-SC",
+ "keyboard_name": "Apollo88H-T-SC",
+ "manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x4150",
+ "pid": "0x8873",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_f13_ansi_tsangan": {
"layout": [
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index 3e0316377d..fca0450cef 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/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 0x6584 // AT fot Athena
-#define DEVICE_VER 0x0001
-#define MANUFACTURER AcheronProject
-#define PRODUCT Athena
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
new file mode 100644
index 0000000000..03640fd01d
--- /dev/null
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "Athena",
+ "usb": {
+ "pid": "0x6584",
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 559f501f95..e9f653e3c7 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/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 0x6585 // AT+1 for Athena rev. Beta
-#define DEVICE_VER 0x0002 // Rev. Beta
-#define MANUFACTURER AcheronProject
-#define PRODUCT Athena rev Beta
-
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
new file mode 100644
index 0000000000..7db7665fe2
--- /dev/null
+++ b/keyboards/acheron/athena/beta/info.json
@@ -0,0 +1,7 @@
+{
+ "keyboard_name": "Athena rev Beta",
+ "usb": {
+ "pid": "0x6585",
+ "device_version": "0.0.2"
+ }
+}
diff --git a/keyboards/acheron/athena/info.json b/keyboards/acheron/athena/info.json
index 2b8c4f02f3..34853a12f6 100644
--- a/keyboards/acheron/athena/info.json
+++ b/keyboards/acheron/athena/info.json
@@ -1,7 +1,10 @@
{
- "keyboard_name": "AcheronProject Athena",
+ "manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0xAC11"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index d03d886a55..042da65f8e 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/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 0x4150 //AP for AcheronProject
-#define PRODUCT_ID 0x454C // EL for Elongate
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Acheron Project
-#define PRODUCT Elongate
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 13
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index bfb9db9b3a..7eb1de3c17 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Elongate",
+ "manufacturer": "Acheron Project",
"url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x4150",
+ "pid": "0x454C",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 957a6e39cd..8ebc6300d7 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/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 0x4150 //AP for AcheronProject
-#define PRODUCT_ID 0x454D // EL+1 for Elongate revision Delta
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Acheron Project
-#define PRODUCT Elongate
-
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index d96805a66a..54e58deb92 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Elongate",
+ "manufacturer": "Acheron Project",
"url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
"maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x4150",
+ "pid": "0x454D",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
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"
+ }
+}