summaryrefslogtreecommitdiff
path: root/keyboards/bpiphany/sixshooter
diff options
context:
space:
mode:
authorInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
committerInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
commit6afdd9d74da250e47ac64d6690bd19d037045e99 (patch)
tree661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/bpiphany/sixshooter
parent93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff)
parent1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff)
downloadqmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz
qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/bpiphany/sixshooter')
-rw-r--r--keyboards/bpiphany/sixshooter/config.h8
-rw-r--r--keyboards/bpiphany/sixshooter/info.json6
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h
index 74acfac9b0..9c713d92dd 100644
--- a/keyboards/bpiphany/sixshooter/config.h
+++ b/keyboards/bpiphany/sixshooter/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6666
-#define DEVICE_VER 0x0001
-#define MANUFACTURER bpiphany
-#define PRODUCT sixshooter
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
@@ -18,7 +11,6 @@
{ F7, F6, F1 }, \
{ F5, F4, F0 } \
}
-#define UNUSED_PINS
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json
index f45419746a..016568067e 100644
--- a/keyboards/bpiphany/sixshooter/info.json
+++ b/keyboards/bpiphany/sixshooter/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "SixShooter",
+ "manufacturer": "bpiphany",
"maintainer": "qmk",
"url": "https://geekhack.org/index.php?topic=70033.0",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6666",
+ "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":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}]