summaryrefslogtreecommitdiff
path: root/keyboards/amjkeyboard
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-07-26 10:52:18 +1000
committerGitHub <noreply@github.com>2022-07-26 01:52:18 +0100
commit674422eb13a4f5c9c8238629e42f4fc1d7641ede (patch)
treea6bd07b6866ea0bb189c05e2bf63cbfa20dc5bc5 /keyboards/amjkeyboard
parenta939293aca697cb263f4972dbb1521d273fbf499 (diff)
Move keyboard USB IDs and strings to data driven: A (#17781)
Diffstat (limited to 'keyboards/amjkeyboard')
-rwxr-xr-xkeyboards/amjkeyboard/amj40/config.h7
-rw-r--r--keyboards/amjkeyboard/amj40/info.json6
-rw-r--r--keyboards/amjkeyboard/amj60/config.h7
-rw-r--r--keyboards/amjkeyboard/amj60/info.json6
-rw-r--r--keyboards/amjkeyboard/amj66/config.h7
-rw-r--r--keyboards/amjkeyboard/amj66/info.json6
-rw-r--r--keyboards/amjkeyboard/amj84/config.h7
-rw-r--r--keyboards/amjkeyboard/amj84/info.json8
-rw-r--r--keyboards/amjkeyboard/amj96/config.h7
-rw-r--r--keyboards/amjkeyboard/amj96/info.json6
-rw-r--r--keyboards/amjkeyboard/amjpad/config.h7
-rw-r--r--keyboards/amjkeyboard/amjpad/info.json8
12 files changed, 38 insertions, 44 deletions
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 2f472eac01..168d16eaee 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/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 0x00D8 //A+M+J
-#define PRODUCT_ID 0x6072
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Han Chen
-#define PRODUCT AMJ40
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index 575fd1b034..cb7c274f10 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "AMJ40",
+ "manufacturer": "Han Chen",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x00D8",
+ "pid": "0x6072",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 4e894a45fc..a3764d00d2 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/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 0x00D8 //A+M+J
-#define PRODUCT_ID 0x6066
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Han Chen
-#define PRODUCT AMJ60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index 2c1781738e..3b106beb18 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "AMJ60",
+ "manufacturer": "Han Chen",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x00D8",
+ "pid": "0x6066",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index cc84524b0b..240cb312c9 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/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 0x00D8 //A+M+J
-#define PRODUCT_ID 0xBD66
-#define DEVICE_VER 0x0001
-#define MANUFACTURER AMJKeyboard
-#define PRODUCT AMJ66
-
/* Key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json
index 27a6ecdb94..2b55e1e3c3 100644
--- a/keyboards/amjkeyboard/amj66/info.json
+++ b/keyboards/amjkeyboard/amj66/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "AMJ66",
+ "manufacturer": "AMJKeyboard",
"url": "",
"maintainer": "FSund, qmk",
+ "usb": {
+ "vid": "0x00D8",
+ "pid": "0xBD66",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 569c06dac2..99f59983ea 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -5,13 +5,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x00D8 //A+M+J
-#define PRODUCT_ID 0x6068
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Han Chen
-#define PRODUCT AMJ84
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
index 484823fcca..3d56530686 100644
--- a/keyboards/amjkeyboard/amj84/info.json
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "AMJ84",
- "maintainer": "peepeetee",
+ "manufacturer": "Han Chen",
"url": "",
+ "maintainer": "peepeetee",
+ "usb": {
+ "vid": "0x00D8",
+ "pid": "0x6068",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 67b3699047..4b94236ec9 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/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 0x00D8 //A+M+J
-#define PRODUCT_ID 0x6074
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Han Chen
-#define PRODUCT AMJ96
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 16
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index b2aac215c0..329232293e 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "AMJ96",
+ "manufacturer": "Han Chen",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x00D8",
+ "pid": "0x6074",
+ "device_version": "0.0.2"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index fe621b7bf3..0a885b7a36 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/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 0x00D8 //A+M+J
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0003
-#define MANUFACTURER AMJ
-#define PRODUCT PAD
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 4
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 76147716d2..456b90e049 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "AMJ Pad",
+ "keyboard_name": "PAD",
+ "manufacturer": "AMJ",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x00D8",
+ "pid": "0x6060",
+ "device_version": "0.0.3"
+ },
"layouts": {
"LAYOUT_numpad_6x4": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":2}]