summaryrefslogtreecommitdiff
path: root/keyboards/25keys
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/25keys
parentb44c3f92ae312f279f1b8e88ddc1d1336786f4d7 (diff)
parent30796913913c0f6dc0cce317ad8249de2b602294 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/25keys')
-rw-r--r--keyboards/25keys/aleth42/info.json7
-rw-r--r--keyboards/25keys/aleth42/rev0/config.h7
-rw-r--r--keyboards/25keys/aleth42/rev0/info.json5
-rw-r--r--keyboards/25keys/aleth42/rev1/config.h7
-rw-r--r--keyboards/25keys/aleth42/rev1/info.json5
-rw-r--r--keyboards/25keys/zinc/info.json11
-rw-r--r--keyboards/25keys/zinc/rev1/config.h7
-rw-r--r--keyboards/25keys/zinc/rev1/info.json9
-rw-r--r--keyboards/25keys/zinc/reva/config.h7
-rw-r--r--keyboards/25keys/zinc/reva/info.json9
10 files changed, 26 insertions, 48 deletions
diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json
index 5a8b564685..7a71d2b367 100644
--- a/keyboards/25keys/aleth42/info.json
+++ b/keyboards/25keys/aleth42/info.json
@@ -1,7 +1,12 @@
{
- "keyboard_name": "aleth42",
+ "keyboard_name": "ALETH42",
+ "manufacturer": "25KEYS",
"url": "http://www.sho-k.co.uk/tech/aleth42",
"maintainer": "monksoffunk",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEAC8"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index 21071f8ca8..c177990e99 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/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 0x04D8
-#define PRODUCT_ID 0xEAC8
-#define DEVICE_VER 0x0000
-#define MANUFACTURER 25KEYS
-#define PRODUCT ALETH42
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
new file mode 100644
index 0000000000..5baab67dba
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev0/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.0"
+ }
+}
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index 0cf444bee4..14b5588ab4 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/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 0x04D8
-#define PRODUCT_ID 0xEAC8
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 25KEYS
-#define PRODUCT ALETH42
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
new file mode 100644
index 0000000000..90ac25f360
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev1/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
index 8064e94e2f..3d9c898841 100644
--- a/keyboards/25keys/zinc/info.json
+++ b/keyboards/25keys/zinc/info.json
@@ -1,8 +1,13 @@
{
- "keyboard_name": "Zinc",
- "url": "https://github.com/monksoffunk/",
+ "manufacturer": "25KEYS",
+ "url": "https://github.com/monksoffunk/zinc",
"maintainer": "monksoffunk",
- "layouts": {
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA3B",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
}
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 43af843a0b..1b2ae25cd8 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/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 0x04D8
-#define PRODUCT_ID 0xEA3B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 25KEYS
-#define PRODUCT zinc rev.1
-
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index 1ed5f9130a..5233dcb04e 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -1,10 +1,3 @@
{
- "keyboard_name": "Zinc rev.1",
- "url": "https://github.com/monksoffunk/zinc",
- "maintainer": "monksoffunk",
- "layouts": {
- "LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
- }
- }
+ "keyboard_name": "Zinc rev.1"
}
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 428c704d19..f740f4d011 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/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 0x04D8
-#define PRODUCT_ID 0xEA3B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 25KEYS
-#define PRODUCT zinc rev.A
-
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index de1d2933ec..79c4795bb3 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -1,10 +1,3 @@
{
- "keyboard_name": "Zinc rev.A",
- "url": "https://github.com/monksoffunk/zinc",
- "maintainer": "monksoffunk",
- "layouts": {
- "LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
- }
- }
+ "keyboard_name": "Zinc rev.A"
}