summaryrefslogtreecommitdiff
path: root/keyboards/cozykeys
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-14 12:16:16 +1000
committerGitHub <noreply@github.com>2022-08-14 12:16:16 +1000
commit3a7dbc89817950709717d6dcec18a6eccbcc2d28 (patch)
treebf9ad6461f2e0029c41ca4528689423e3b10e95d /keyboards/cozykeys
parent28b05d15ffb1e724addde3b8929ecb21284a8195 (diff)
downloadqmk_firmware-3a7dbc89817950709717d6dcec18a6eccbcc2d28.tar.gz
qmk_firmware-3a7dbc89817950709717d6dcec18a6eccbcc2d28.zip
Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945)
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 49fac4d254..431cba46cd 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 4bb291be56..431cba46cd 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 1ab81ed7d1..32b8906e58 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 9928e91f98..de6a7592b1 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": [