summaryrefslogtreecommitdiff
path: root/keyboards/delikeeb
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2022-08-15 17:54:07 +1000
committerfauxpark <fauxpark@gmail.com>2022-08-15 17:54:07 +1000
commitc202602938e1b065e6bac394771b310fea2a3edb (patch)
tree444978b63e48d68f004b1c0730929bfbcfb221e8 /keyboards/delikeeb
parent8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff)
parent51d5aad25b92a34bc051849616fcd93e3ae407fc (diff)
downloadqmk_firmware-c202602938e1b065e6bac394771b310fea2a3edb.tar.gz
qmk_firmware-c202602938e1b065e6bac394771b310fea2a3edb.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/delikeeb')
-rw-r--r--keyboards/delikeeb/vanana/config.h4
-rw-r--r--keyboards/delikeeb/vanana/info.json6
-rw-r--r--keyboards/delikeeb/vanana/rev1/config.h4
-rw-r--r--keyboards/delikeeb/vanana/rev1/info.json6
-rw-r--r--keyboards/delikeeb/vanana/rev2/config.h4
-rw-r--r--keyboards/delikeeb/vanana/rev2/info.json6
-rw-r--r--keyboards/delikeeb/waaffle/config.h4
-rw-r--r--keyboards/delikeeb/waaffle/rev3/config.h4
-rw-r--r--keyboards/delikeeb/waaffle/rev3/info.json8
9 files changed, 24 insertions, 22 deletions
diff --git a/keyboards/delikeeb/vanana/config.h b/keyboards/delikeeb/vanana/config.h
index 3a5a888945..7879dc1b1a 100644
--- a/keyboards/delikeeb/vanana/config.h
+++ b/keyboards/delikeeb/vanana/config.h
@@ -18,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
-
-#define VENDOR_ID 0x9906
-#define PRODUCT_ID 0x0013
-#define MANUFACTURER dELIKEEb
diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json
index 78c11fbee2..b8a5f78cf8 100644
--- a/keyboards/delikeeb/vanana/info.json
+++ b/keyboards/delikeeb/vanana/info.json
@@ -1,7 +1,11 @@
{
- "keyboard_name": "vanana",
+ "manufacturer": "dELIKEEb",
"url": "",
"maintainer": "noclew",
+ "usb": {
+ "vid": "0x9906",
+ "pid": "0x0013"
+ },
"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":7, "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":7, "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}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 8a054927b9..8ddb222440 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0001
-#define PRODUCT Vanana rev1
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
new file mode 100644
index 0000000000..992960c5a2
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Vanana rev1",
+ "usb": {
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index e6f95fa9d4..d6d04d47d1 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0002
-#define PRODUCT Vanana rev2
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 10
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
new file mode 100644
index 0000000000..c7206e9d97
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Vanana rev2",
+ "usb": {
+ "device_version": "0.0.2"
+ }
+}
diff --git a/keyboards/delikeeb/waaffle/config.h b/keyboards/delikeeb/waaffle/config.h
index 1b02e32c6d..7879dc1b1a 100644
--- a/keyboards/delikeeb/waaffle/config.h
+++ b/keyboards/delikeeb/waaffle/config.h
@@ -18,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
-
-#define VENDOR_ID 0x9906
-#define PRODUCT_ID 0x0012
-#define MANUFACTURER dELIKEEb
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 6b8604e289..d9ffc232dd 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0003
-#define PRODUCT Waaffle_rev3
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 10
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index f855f89732..709ceb1844 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "waaffle",
+ "keyboard_name": "Waaffle rev3",
+ "manufacturer": "dELIKEEb",
"url": "",
"maintainer": "noclew",
+ "usb": {
+ "vid": "0x9906",
+ "pid": "0x0012",
+ "device_version": "0.0.3"
+ },
"layouts": {
"LAYOUT_ortho_5x16": {
"layout":