summaryrefslogtreecommitdiff
path: root/keyboards/bear_face
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/bear_face
parente948fa6f6e184a3c9a317a7aa680e33e7629b0d4 (diff)
parent4195eb8fe1de39855b622ee282950c10fdbf0988 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bear_face')
-rw-r--r--keyboards/bear_face/config.h6
-rw-r--r--keyboards/bear_face/info.json10
-rw-r--r--keyboards/bear_face/v1/config.h19
-rw-r--r--keyboards/bear_face/v1/info.json6
-rw-r--r--keyboards/bear_face/v2/config.h19
-rw-r--r--keyboards/bear_face/v2/info.json6
6 files changed, 16 insertions, 50 deletions
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
index c11f27db10..589ea350c1 100644
--- a/keyboards/bear_face/config.h
+++ b/keyboards/bear_face/config.h
@@ -19,12 +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 0x09f5
-#define MANUFACTURER chemicalwill
-#define PRODUCT bear_face
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json
new file mode 100644
index 0000000000..e2589d91af
--- /dev/null
+++ b/keyboards/bear_face/info.json
@@ -0,0 +1,10 @@
+{
+ "keyboard_name": "bear_face",
+ "manufacturer": "chemicalwill",
+ "url": "https://github.com/chemicalwill/bear_face_pcb",
+ "maintainer": "chemicalwill",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x09F5"
+ }
+}
diff --git a/keyboards/bear_face/v1/config.h b/keyboards/bear_face/v1/config.h
deleted file mode 100644
index cf1de932c1..0000000000
--- a/keyboards/bear_face/v1/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0100
diff --git a/keyboards/bear_face/v1/info.json b/keyboards/bear_face/v1/info.json
index 0435c5c229..8d3f685e91 100644
--- a/keyboards/bear_face/v1/info.json
+++ b/keyboards/bear_face/v1/info.json
@@ -1,7 +1,7 @@
{
- "keyboard_name": "bear_face",
- "url": "https://github.com/chemicalwill/bear_face_pcb",
- "maintainer": "chemicalwill",
+ "usb": {
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_83_ansi": {
"layout": [
diff --git a/keyboards/bear_face/v2/config.h b/keyboards/bear_face/v2/config.h
deleted file mode 100644
index 6a7c8c6fb0..0000000000
--- a/keyboards/bear_face/v2/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0200
diff --git a/keyboards/bear_face/v2/info.json b/keyboards/bear_face/v2/info.json
index 6d12f04d42..978ee59e49 100644
--- a/keyboards/bear_face/v2/info.json
+++ b/keyboards/bear_face/v2/info.json
@@ -1,7 +1,7 @@
{
- "keyboard_name": "bear_face",
- "url": "https://github.com/chemicalwill/bear_face_pcb",
- "maintainer": "chemicalwill",
+ "usb": {
+ "device_version": "2.0.0"
+ },
"layouts": {
"LAYOUT_83_ansi": {
"layout": [