summaryrefslogtreecommitdiff
path: root/keyboards/cozykeys
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-08-14 01:54:23 -0700
committerDrashna Jael're <drashna@live.com>2022-08-14 01:54:23 -0700
commitac31e429741a640b0d03d2ebd76554b7fe9247e0 (patch)
tree8d21aa6f2b7e0c3ee75b37e4f2edb1ae010db525 /keyboards/cozykeys
parente948fa6f6e184a3c9a317a7aa680e33e7629b0d4 (diff)
parent4195eb8fe1de39855b622ee282950c10fdbf0988 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cozykeys')
-rw-r--r--keyboards/cozykeys/bloomer/config.h6
-rw-r--r--keyboards/cozykeys/bloomer/info.json10
-rw-r--r--keyboards/cozykeys/bloomer/v2/config.h3
-rw-r--r--keyboards/cozykeys/bloomer/v2/info.json6
-rw-r--r--keyboards/cozykeys/bloomer/v3/config.h3
-rw-r--r--keyboards/cozykeys/bloomer/v3/info.json6
-rw-r--r--keyboards/cozykeys/speedo/v2/config.h7
-rw-r--r--keyboards/cozykeys/speedo/v2/info.json6
-rw-r--r--keyboards/cozykeys/speedo/v3/config.h7
-rw-r--r--keyboards/cozykeys/speedo/v3/info.json6
10 files changed, 28 insertions, 32 deletions
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
index 0f285b4d0e..461f289918 100644
--- a/keyboards/cozykeys/bloomer/config.h
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -18,12 +18,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 0x1191
-#define MANUFACTURER CozyKeys
-#define PRODUCT Bloomer
-
// Key matrix size
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json
new file mode 100644
index 0000000000..ed0bb78867
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/info.json
@@ -0,0 +1,10 @@
+{
+ "keyboard_name": "Bloomer",
+ "manufacturer": "CozyKeys",
+ "url": "https://github.com/cozykeys/bloomer",
+ "maintainer": "pcewing",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1191"
+ }
+}
diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h
index 4cbe7025db..8eb3ab52c9 100644
--- a/keyboards/cozykeys/bloomer/v2/config.h
+++ b/keyboards/cozykeys/bloomer/v2/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-// USB Device descriptor parameter
-#define DEVICE_VER 0x0002
-
// Keyboard Matrix Assignments
#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json
index 7e268a4640..9cd8e532cf 100644
--- a/keyboards/cozykeys/bloomer/v2/info.json
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -1,7 +1,7 @@
{
- "keyboard_name": "Bloomer",
- "url": "https://github.com/cozykeys/bloomer",
- "maintainer": "pcewing",
+ "usb": {
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h
index 222afaf7dc..8eb3ab52c9 100644
--- a/keyboards/cozykeys/bloomer/v3/config.h
+++ b/keyboards/cozykeys/bloomer/v3/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-// USB Device descriptor parameter
-#define DEVICE_VER 0x0003
-
// Keyboard Matrix Assignments
#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json
index 47d74269d2..6b782663d8 100644
--- a/keyboards/cozykeys/bloomer/v3/info.json
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -1,7 +1,7 @@
{
- "keyboard_name": "Bloomer",
- "url": "https://github.com/cozykeys/bloomer",
- "maintainer": "pcewing",
+ "usb": {
+ "device_version": "0.0.3"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h
index 52ef4bed87..e5e7597f72 100644
--- a/keyboards/cozykeys/speedo/v2/config.h
+++ b/keyboards/cozykeys/speedo/v2/config.h
@@ -18,13 +18,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 0x1192
-#define DEVICE_VER 0x0002
-#define MANUFACTURER CozyKeys
-#define PRODUCT Speedo
-
// Key matrix size
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json
index 775511dda1..8de425ede1 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Speedo",
+ "manufacturer": "CozyKeys",
"url": "https://github.com/cozykeys/speedo",
"maintainer": "pcewing",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1192",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 39aa73adc8..8590a45efc 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -18,13 +18,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 0x1192
-#define DEVICE_VER 0x0003
-#define MANUFACTURER CozyKeys
-#define PRODUCT Speedo
-
// Key matrix size
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 8f2e2674bf..49a5b94f06 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Speedo",
+ "manufacturer": "CozyKeys",
"url": "https://github.com/cozykeys/speedo",
"maintainer": "pcewing",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1192",
+ "device_version": "0.0.3"
+ },
"layouts": {
"LAYOUT": {
"layout": [