summaryrefslogtreecommitdiff
path: root/keyboards/biacco42
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-07-25 10:15:47 -0700
committerDrashna Jael're <drashna@live.com>2022-07-25 10:15:47 -0700
commit99c48f1361116a749f97e039e468068948bf6bed (patch)
tree031ac477f844e43ed403e6596f076495df292d48 /keyboards/biacco42
parent7d2260ab75e1394930ba50463b1389aed06d0725 (diff)
parent1df6322f1076280dcc5214ba84c2c367e9d91e55 (diff)
downloadqmk_firmware-99c48f1361116a749f97e039e468068948bf6bed.tar.gz
qmk_firmware-99c48f1361116a749f97e039e468068948bf6bed.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/biacco42')
-rw-r--r--keyboards/biacco42/meishi/config.h7
-rw-r--r--keyboards/biacco42/meishi/info.json6
-rw-r--r--keyboards/biacco42/meishi2/config.h7
-rw-r--r--keyboards/biacco42/meishi2/info.json6
4 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
index ff6c22dc56..3420c30035 100644
--- a/keyboards/biacco42/meishi/config.h
+++ b/keyboards/biacco42/meishi/config.h
@@ -19,13 +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 0xBC42
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Biacco42
-#define PRODUCT meishi
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 4
diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json
index 8241541c72..cc7bb4f713 100644
--- a/keyboards/biacco42/meishi/info.json
+++ b/keyboards/biacco42/meishi/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Meishi",
+ "manufacturer": "Biacco42",
"url": "",
"maintainer": "Biacco42",
+ "usb": {
+ "vid": "0xBC42",
+ "pid": "0x0002",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index 57a4e226a3..723aae73ff 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/config.h
@@ -19,13 +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 0xBC42
-#define PRODUCT_ID 0x0003
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Biacco42
-#define PRODUCT meishi2
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 2
diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json
index 8e277716ea..e63b586b69 100644
--- a/keyboards/biacco42/meishi2/info.json
+++ b/keyboards/biacco42/meishi2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "meishi2",
+ "manufacturer": "Biacco42",
"url": "",
"maintainer": "biacco42",
+ "usb": {
+ "vid": "0xBC42",
+ "pid": "0x0003",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [