summaryrefslogtreecommitdiffstats
path: root/keyboards/macro3
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/macro3
parentfa207545a9759c50b9f230eb608d86a9085801d4 (diff)
parentf46379f308783994b8178f95adc686f4b4c3ebd8 (diff)
merge upstream master
Diffstat (limited to 'keyboards/macro3')
-rw-r--r--keyboards/macro3/config.h8
-rw-r--r--keyboards/macro3/info.json6
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h
index 7e7b371960..bfd60418a7 100644
--- a/keyboards/macro3/config.h
+++ b/keyboards/macro3/config.h
@@ -6,13 +6,6 @@
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC88B
-#define PRODUCT_ID 0x3388
-#define DEVICE_VER 0x0003
-#define MANUFACTURER DPB
-#define PRODUCT Macro3
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4
@@ -26,7 +19,6 @@
#define ENCODERS_PAD_A { D2, F7 }
#define ENCODERS_PAD_B { D3, F6 }
-#define UNUSED_PINS
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json
index a29313c2b3..f3ebdb8acd 100644
--- a/keyboards/macro3/info.json
+++ b/keyboards/macro3/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Macro3",
+ "manufacturer": "DPB",
"url": "https://github.com/davidphilipbarr/Macropads/tree/main/macro3",
"maintainer": "@davidphilipbarr",
+ "usb": {
+ "vid": "0xC88B",
+ "pid": "0x3388",
+ "device_version": "0.0.3"
+ },
"layouts": {
"LAYOUT": {
"layout": [