summaryrefslogtreecommitdiffstats
path: root/keyboards/handwired/6macro
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-30 07:32:18 +0000
committerQMK Bot <hello@qmk.fm>2022-07-30 07:32:18 +0000
commit06fe4b16d2cb82f4965f3986ba91b71f9a3f6189 (patch)
tree563d0a8a0b750c3acd63026b02c75083b131c1f9 /keyboards/handwired/6macro
parentef94f93fe29628a3613bfcf0f308d4ffad154386 (diff)
parent2d778d2ff28ed10c43c79783e6c519f00dee1429 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/handwired/6macro')
-rw-r--r--keyboards/handwired/6macro/config.h7
-rw-r--r--keyboards/handwired/6macro/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index cfa15ee15b..7fe3be6556 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/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 0xFEED
-#define PRODUCT_ID 0x0037
-#define DEVICE_VER 0x0001
-#define MANUFACTURER joaofbmaia
-#define PRODUCT 6macro
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index eac751e3a8..2fd8e24a5b 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "6macro",
+ "manufacturer": "joaofbmaia",
"url": "",
"maintainer": "joaofbmaia",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0037",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]