summaryrefslogtreecommitdiffstats
path: root/keyboards/makrosu
diff options
context:
space:
mode:
authorlokher <lokher@gmail.com>2022-09-13 11:13:00 +0800
committerlokher <lokher@gmail.com>2022-09-13 11:13:00 +0800
commitfe13cedf8c09fa34d5cec4e4c624738095176625 (patch)
tree818436626d49c7f22f325632b2053edba10d4358 /keyboards/makrosu
parentfa207545a9759c50b9f230eb608d86a9085801d4 (diff)
parentf46379f308783994b8178f95adc686f4b4c3ebd8 (diff)
merge upstream master
Diffstat (limited to 'keyboards/makrosu')
-rw-r--r--keyboards/makrosu/config.h8
-rw-r--r--keyboards/makrosu/info.json6
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index b587477f8a..f441a16f7a 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xAB69
-#define PRODUCT_ID 0x8585
-#define DEVICE_VER 0x0001
-#define MANUFACTURER valdydesu_
-#define PRODUCT makrosu
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 6
@@ -32,7 +25,6 @@
/* key matrix pins */
#define MATRIX_ROW_PINS { B6 }
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}
-#define UNUSED_PINS
#define ENCODERS_PAD_A { E6 }
#define ENCODERS_PAD_B { D1 }
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
index 84aca4a14c..30b17ebad3 100644
--- a/keyboards/makrosu/info.json
+++ b/keyboards/makrosu/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "MakrOSU",
+ "manufacturer": "Valdydesu_",
"url": "",
"maintainer": "Valdydesu_",
+ "usb": {
+ "vid": "0xAB69",
+ "pid": "0x8585",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [