summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/j80/config.h6
-rw-r--r--keyboards/j80/info.json6
-rw-r--r--keyboards/jacky_studio/bear_65/config.h7
-rw-r--r--keyboards/jacky_studio/bear_65/info.json6
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev1/config.h7
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev1/info.json8
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev2/config.h7
-rw-r--r--keyboards/jacky_studio/s7_elephant/rev2/info.json6
-rw-r--r--keyboards/jadookb/jkb2/config.h6
-rw-r--r--keyboards/jadookb/jkb2/info.json8
-rw-r--r--keyboards/jae/j01/config.h7
-rw-r--r--keyboards/jae/j01/info.json8
-rw-r--r--keyboards/jagdpietr/drakon/config.h7
-rw-r--r--keyboards/jagdpietr/drakon/info.json6
-rw-r--r--keyboards/jc65/v32a/config.h6
-rw-r--r--keyboards/jc65/v32a/info.json8
-rw-r--r--keyboards/jc65/v32u4/config.h7
-rw-r--r--keyboards/jc65/v32u4/info.json8
-rw-r--r--keyboards/jd40/config.h7
-rw-r--r--keyboards/jd40/info.json6
-rw-r--r--keyboards/jd45/config.h7
-rw-r--r--keyboards/jd45/info.json8
-rw-r--r--keyboards/jels/jels60/config.h7
-rw-r--r--keyboards/jels/jels60/info.json6
-rw-r--r--keyboards/jels/jels88/config.h7
-rw-r--r--keyboards/jels/jels88/info.json6
-rw-r--r--keyboards/jiran/config.h7
-rw-r--r--keyboards/jiran/info.json8
-rw-r--r--keyboards/jkdlab/binary_monkey/config.h6
-rw-r--r--keyboards/jkdlab/binary_monkey/info.json6
-rw-r--r--keyboards/jm60/config.h7
-rw-r--r--keyboards/jm60/info.json6
-rw-r--r--keyboards/jolofsor/denial75/config.h7
-rw-r--r--keyboards/jolofsor/denial75/info.json6
-rw-r--r--keyboards/jones/v03/config.h7
-rw-r--r--keyboards/jones/v03/info.json6
-rw-r--r--keyboards/jones/v03_1/config.h7
-rw-r--r--keyboards/jones/v03_1/info.json6
-rw-r--r--keyboards/jones/v1/config.h7
-rw-r--r--keyboards/jones/v1/info.json6
-rw-r--r--keyboards/just60/.noci0
41 files changed, 127 insertions, 143 deletions
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
index 3aaeb26dad..1ad00356fe 100644
--- a/keyboards/j80/config.h
+++ b/keyboards/j80/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0x20A0
-#define PRODUCT_ID 0x422D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JER
-#define PRODUCT J80
-
#define MATRIX_ROWS 7
#define MATRIX_COLS 14
diff --git a/keyboards/j80/info.json b/keyboards/j80/info.json
index 6c14139bd7..bbb86f66f7 100644
--- a/keyboards/j80/info.json
+++ b/keyboards/j80/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "J80",
+ "manufacturer": "JER",
"url": "",
"maintainer": "oeywil",
+ "usb": {
+ "vid": "0x20A0",
+ "pid": "0x422D",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index e68ed4a928..92a6a5b60a 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA13B // Jacky's vendor ID, arbitrarily selected by MudkipMao
-#define PRODUCT_ID 0x000A
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Jacky
-#define PRODUCT Jacky Bear 65 Ergo
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/jacky_studio/bear_65/info.json b/keyboards/jacky_studio/bear_65/info.json
index 5f7f059696..151fd6fa5f 100644
--- a/keyboards/jacky_studio/bear_65/info.json
+++ b/keyboards/jacky_studio/bear_65/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Bear 65",
+ "manufacturer": "Jacky",
"url": "https://qmk.fm/keyboards",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xA13B",
+ "pid": "0x000A",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":11.25, "y":0}, {"label":"*", "x":12.25, "y":0}, {"label":"(", "x":13.25, "y":0}, {"label":")", "x":14.25, "y":0}, {"label":"_", "x":15.25, "y":0}, {"label":"+", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"~", "x":18.25, "y":0}, {"label":"Del", "x":19.75, "y":0}, {"label":"PgUp", "x":0.25, "y":1}, {"label":"Tab", "x":1.75, "y":1, "w":1.5}, {"label":"Q", "x":3.25, "y":1}, {"label":"W", "x":4.25, "y":1}, {"label":"E", "x":5.25, "y":1}, {"label":"R", "x":6.25, "y":1}, {"label":"T", "x":7.25, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"{", "x":15.75, "y":1}, {"label":"}", "x":16.75, "y":1}, {"label":"Backspace", "x":17.75, "y":1, "w":1.5}, {"label":"PgDn", "x":0, "y":2}, {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75}, {"label":"A", "x":3.5, "y":2}, {"label":"S", "x":4.5, "y":2}, {"label":"D", "x":5.5, "y":2}, {"label":"F", "x":6.5, "y":2}, {"label":"G", "x":7.5, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"\"", "x":16, "y":2}, {"label":"Enter", "x":17, "y":2, "w":2.25}, {"label":"Shift", "x":1.75, "y":3, "w":2.25}, {"label":"Z", "x":4, "y":3}, {"label":"X", "x":5, "y":3}, {"label":"C", "x":6, "y":3}, {"label":"V", "x":7, "y":3}, {"label":"B", "x":8, "y":3}, {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3}, {"label":"M", "x":12.5, "y":3}, {"label":"<", "x":13.5, "y":3}, {"label":">", "x":14.5, "y":3}, {"label":"?", "x":15.5, "y":3}, {"label":"Shift", "x":16.5, "y":3, "w":1.75}, {"label":"Up", "x":18.25, "y":3}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"label":"Win", "x":8.25, "y":4}, {"x":10.5, "y":4, "w":2.75}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}]
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index 76c4c7d406..96f8d57ede 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jacky
-#define PRODUCT S7 Elephant
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index b47f326456..b1621eecd7 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "S7 Elephant",
+ "keyboard_name": "S7 Elephant Rev1",
+ "manufacturer": "Jacky",
"url": "https://geekhack.org/index.php?topic=96434.0",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xA13B",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 246479dd37..41a8c77f9d 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID 0x0008 // 8 for S7++
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Jacky
-#define PRODUCT Jacky S7 Elephant Rev 2
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index e3be4afe38..c9f45edca9 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "S7 Elephant Rev2",
+ "manufacturer": "Jacky",
"url": "https://geekhack.org/index.php?topic=103148.0",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xA13B",
+ "pid": "0x0008",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h
index ac5808f236..21ec68ad9b 100644
--- a/keyboards/jadookb/jkb2/config.h
+++ b/keyboards/jadookb/jkb2/config.h
@@ -16,12 +16,6 @@
#pragma once
#include "config_common.h"
-#define VENDOR_ID 0x4A4B // "JK"
-#define PRODUCT_ID 0x3225 // "2%"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JadooKB
-#define PRODUCT JKB2
-
#define MATRIX_ROWS 1
#define MATRIX_COLS 2
diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json
index ed818d6412..ef27783c7a 100644
--- a/keyboards/jadookb/jkb2/info.json
+++ b/keyboards/jadookb/jkb2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jkb2",
+ "keyboard_name": "JKB2",
+ "manufacturer": "JadooKB",
"url": "https://jadookb.com/",
"maintainer": "Wizard-GG",
+ "usb": {
+ "vid": "0x4A4B",
+ "pid": "0x3225",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }]
diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h
index 552f6930cb..1804dfeb4e 100644
--- a/keyboards/jae/j01/config.h
+++ b/keyboards/jae/j01/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 0x4705
-#define PRODUCT_ID 0x0143
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Evyd13
-#define PRODUCT J-01
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 17
diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json
index 03c18c46d1..94363e3aa5 100644
--- a/keyboards/jae/j01/info.json
+++ b/keyboards/jae/j01/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "J01",
+ "keyboard_name": "J-01",
+ "manufacturer": "Evyd13",
"url": "",
"maintainer": "MechMerlin",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x0143",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "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":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.75, "y":3.25}, {"x":18, "y":3}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"x":12.5, "y":4, "w":1.5}, {"x":14, "y":4, "w":1.5}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25}, {"x":17.75, "y":4.25}]
diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h
index 611b107137..e6c205e61c 100644
--- a/keyboards/jagdpietr/drakon/config.h
+++ b/keyboards/jagdpietr/drakon/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 0xFEED
-#define PRODUCT_ID 0x7776
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jagdpietr
-#define PRODUCT drakon
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 14
diff --git a/keyboards/jagdpietr/drakon/info.json b/keyboards/jagdpietr/drakon/info.json
index 8208fa22bb..48945eaf3e 100644
--- a/keyboards/jagdpietr/drakon/info.json
+++ b/keyboards/jagdpietr/drakon/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "drakon",
+ "manufacturer": "jagdpietr",
"url": "",
"maintainer": "jagdpietr",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x7776",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"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":6, "y":0}, {"x":7, "y":0}, {"x":8, "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":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":17.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":16.25, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.25}, {"x":13.75, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.25}]
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index b4cef251b5..01b73b34db 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0x1234
-#define PRODUCT_ID 0x5679
-#define DEVICE_VER 0x0200
-#define MANUFACTURER RAMA
-#define PRODUCT JC65 BMC
-
/* matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 15
diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index 9c22289d8f..a6130b77c6 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jc65",
+ "keyboard_name": "JC65 BMC",
+ "manufacturer": "RAMA",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1234",
+ "pid": "0x5679",
+ "device_version": "2.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index 108e4126be..f4b4963236 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/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 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0002
-#define MANUFACTURER dou
-#define PRODUCT KEYCLACK65-V1
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json
index 84d832eede..83e248fc30 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jc65",
+ "keyboard_name": "JC65",
+ "manufacturer": "dou",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index dd6984f108..3645e86984 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/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 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER geekhack
-#define PRODUCT jd40v2
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json
index 6cfdcdc3ee..b94e9076f7 100644
--- a/keyboards/jd40/info.json
+++ b/keyboards/jd40/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "jd40",
+ "manufacturer": "geekhack",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h
index 3deea19740..ec4628fccb 100644
--- a/keyboards/jd45/config.h
+++ b/keyboards/jd45/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 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER geekhack
-#define PRODUCT JD45
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 13
diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json
index 99059b0960..3fa16119f6 100644
--- a/keyboards/jd45/info.json
+++ b/keyboards/jd45/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jd45",
+ "keyboard_name": "JD45",
+ "manufacturer": "geekhack",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
index 6805018dd7..ab9c51335b 100644
--- a/keyboards/jels/jels60/config.h
+++ b/keyboards/jels/jels60/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor paramater */
-#define VENDOR_ID 0x006A //Jels (J)
-#define PRODUCT_ID 0x0060 //Jels 60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jels
-#define PRODUCT jels60
-
/* Define Matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index b958bb6905..d8c6590ccb 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jels60",
+ "manufacturer": "Jels",
"url": "",
"maintainer": "Jels",
+ "usb": {
+ "vid": "0x006A",
+ "pid": "0x0060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index 3018e15c86..54c2fecc5c 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor paramater */
-#define VENDOR_ID 0x006a // Jels (J)
-#define PRODUCT_ID 0x0088 // Jels 88
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Jels
-#define PRODUCT Jels88
-
/* Define Matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index 827e911494..dc4887cbb7 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jels88",
+ "manufacturer": "Jels",
"url": "",
"maintainer": "Jels",
+ "usb": {
+ "vid": "0x006A",
+ "pid": "0x0088",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
index da100292e2..0579f44a77 100644
--- a/keyboards/jiran/config.h
+++ b/keyboards/jiran/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 0x1209
-#define PRODUCT_ID 0x3735
-#define DEVICE_VER 0x0300
-#define MANUFACTURER Ladniy
-#define PRODUCT Jiran
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 8dd6a43fe8..93b8ad11ce 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "jiran",
+ "keyboard_name": "Jiran",
+ "manufacturer": "Ladniy",
"url": "t.me/s/ladniys",
"maintainer": "Ladniy",
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x3735",
+ "device_version": "3.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h
index ba8bfcd8d1..1c12761600 100644
--- a/keyboards/jkdlab/binary_monkey/config.h
+++ b/keyboards/jkdlab/binary_monkey/config.h
@@ -20,12 +20,6 @@
#include "config_common.h"
-#define VENDOR_ID 0x4934
-#define PRODUCT_ID 0x0101
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JKDLAB.
-#define PRODUCT Binary_Monkey
-
#define MATRIX_ROWS 1
#define MATRIX_COLS 3
#define MATRIX_ROW_PINS { D0 }
diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json
index 9d563c0b12..24671d285d 100644
--- a/keyboards/jkdlab/binary_monkey/info.json
+++ b/keyboards/jkdlab/binary_monkey/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Binary_Monkey",
+ "manufacturer": "JKDLAB.",
"url": "https://gumroad.com/jkdlab",
"maintainer": "JKDLAB.",
+ "usb": {
+ "vid": "0x4934",
+ "pid": "0x0101",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h
index 113c6b4dfb..d3b5ec7243 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/jm60/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 0xFEED
-#define PRODUCT_ID 0x6464
-#define DEVICE_VER 0x0001
-#define MANUFACTURER JMWS
-#define PRODUCT JM60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/jm60/info.json b/keyboards/jm60/info.json
index cdb0da4671..5ad1053aa9 100644
--- a/keyboards/jm60/info.json
+++ b/keyboards/jm60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "JM60",
+ "manufacturer": "JMWS",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6464",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index 702fee324f..a5d8b9fe59 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -17,13 +17,6 @@
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4A48
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER jsor-hpoli
-#define PRODUCT denial75
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index 71c9651a8a..0224187eff 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "denial75",
+ "manufacturer": "jsor-hpoli",
"url": "",
"maintainer": "jolofsor",
+ "usb": {
+ "vid": "0x4A48",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_denial75_ansi": {
"layout": [
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index 706c1d05e9..9123005ac4 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/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 0xB9DD
-#define PRODUCT_ID 0x175A
-#define DEVICE_VER 0x0030
-#define MANUFACTURER jpskenn
-#define PRODUCT Jones
-
/* key matrix size */
// Same size for Jones' custom Round-Robin matrix.
#define MATRIX_ROWS 11
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
index c3d0477afc..c2884886b6 100644
--- a/keyboards/jones/v03/info.json
+++ b/keyboards/jones/v03/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jones",
+ "manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x175A",
+ "device_version": "0.3.0"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 33dd0994a5..e73bb22850 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/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 0xB9DD
-#define PRODUCT_ID 0x175A
-#define DEVICE_VER 0x0031
-#define MANUFACTURER jpskenn
-#define PRODUCT Jones
-
/* key matrix size */
// Same size for Jones' custom Round-Robin matrix.
#define MATRIX_ROWS 11
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
index c3d0477afc..365178b9d5 100644
--- a/keyboards/jones/v03_1/info.json
+++ b/keyboards/jones/v03_1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jones",
+ "manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x175A",
+ "device_version": "0.3.1"
+ },
"layouts": {
"LAYOUT_ansi": {
"layout": [
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 16610eef4a..0d4ab90a60 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/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 0xB9DD
-#define PRODUCT_ID 0x175A
-#define DEVICE_VER 0x0100
-#define MANUFACTURER jpskenn
-#define PRODUCT Jones
-
/* key matrix size */
// Same number for Round-Robin matrix.
#define MATRIX_ROWS 10
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index 6aba4fd74b..e323445fc9 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Jones",
+ "manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x175A",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/just60/.noci b/keyboards/just60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/just60/.noci
+++ /dev/null