summaryrefslogtreecommitdiff
path: root/keyboards/cherrybstudio
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-07-26 09:04:09 +1000
committerGitHub <noreply@github.com>2022-07-26 00:04:09 +0100
commita939293aca697cb263f4972dbb1521d273fbf499 (patch)
treec582d4bf0a5937618d0f5cc12c6f70068bab56a5 /keyboards/cherrybstudio
parentb6ac0ecf824bccfdc4114a0a15fc2c95b0ccd14d (diff)
Move keyboard USB IDs and strings to data driven: C (#17789)
Diffstat (limited to 'keyboards/cherrybstudio')
-rw-r--r--keyboards/cherrybstudio/cb1800/config.h7
-rw-r--r--keyboards/cherrybstudio/cb1800/info.json8
-rw-r--r--keyboards/cherrybstudio/cb87/config.h7
-rw-r--r--keyboards/cherrybstudio/cb87/info.json6
-rw-r--r--keyboards/cherrybstudio/cb87rgb/config.h7
-rw-r--r--keyboards/cherrybstudio/cb87rgb/info.json8
-rw-r--r--keyboards/cherrybstudio/cb87v2/config.h7
-rw-r--r--keyboards/cherrybstudio/cb87v2/info.json8
8 files changed, 27 insertions, 31 deletions
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index a9932fe735..c6266e4459 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4342 // CB
-#define PRODUCT_ID 0x1818
-#define DEVICE_VER 0x0001
-#define MANUFACTURER CherryB.Studio
-#define PRODUCT CB1800
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 11
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index ea54e1e6c5..1caf876a61 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "cb1800",
+ "keyboard_name": "CB1800",
+ "manufacturer": "CherryB.Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
+ "usb": {
+ "vid": "0x4342",
+ "pid": "0x1818",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 41c7f3f25b..1f497cee03 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4342 // CB
-#define PRODUCT_ID 0x8787
-#define DEVICE_VER 0x0001
-#define MANUFACTURER CherryB Studio
-#define PRODUCT CB87
-
/* key matrix size */
#define MATRIX_ROWS 9
#define MATRIX_COLS 10
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index dc6d017b33..1e7051c281 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "CB87",
+ "manufacturer": "CherryB Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
+ "usb": {
+ "vid": "0x4342",
+ "pid": "0x8787",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index ccf7aceee9..030f1e6047 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4342 // CB
-#define PRODUCT_ID 0x8785
-#define DEVICE_VER 0x0001
-#define MANUFACTURER CherryB.Studio
-#define PRODUCT CB87RGB
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index e183066bd5..36b43f5742 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "cb87v2",
+ "keyboard_name": "CB87RGB",
+ "manufacturer": "CherryB.Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
+ "usb": {
+ "vid": "0x4342",
+ "pid": "0x8785",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 782262ebfb..e3f7b9bb9e 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4342 // CB
-#define PRODUCT_ID 0x8788
-#define DEVICE_VER 0x0001
-#define MANUFACTURER CherryB.Studio
-#define PRODUCT CB87v2
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 8b79d0623b..6cb3f5fbe3 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "cb87v2",
+ "keyboard_name": "CB87v2",
+ "manufacturer": "CherryB.Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
+ "usb": {
+ "vid": "0x4342",
+ "pid": "0x8788",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [