summaryrefslogtreecommitdiff
path: root/keyboards/fjlabs/tf60v2
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-27 21:44:42 +0000
committerQMK Bot <hello@qmk.fm>2022-07-27 21:44:42 +0000
commit7bb73306d640a7453462f76c9d22459b5356a9da (patch)
tree5b0acb1a7efbe5155ea732af3cc95bb307f1fe3d /keyboards/fjlabs/tf60v2
parent5055c9a74b0b88cb164f600963df40351ce4d5f7 (diff)
parent23f365b6014634bf9f67ed3515853bf8c4372615 (diff)
downloadqmk_firmware-7bb73306d640a7453462f76c9d22459b5356a9da.tar.gz
qmk_firmware-7bb73306d640a7453462f76c9d22459b5356a9da.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/fjlabs/tf60v2')
-rw-r--r--keyboards/fjlabs/tf60v2/config.h7
-rw-r--r--keyboards/fjlabs/tf60v2/info.json8
2 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 0c1a069464..54a787103f 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/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 0x7074 // FJLabs
-#define PRODUCT_ID 0x1005 // tf60v2
-#define DEVICE_VER 0x0001 // Version 1
-#define MANUFACTURER FJLabs
-#define PRODUCT TF60v2
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index c2d6c02872..989f18a001 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "TF60 RGB V2",
+ "keyboard_name": "TF60 V2",
+ "manufacturer": "FJLabs",
"url": "https://www.fjlaboratories.com/",
"maintainer": "FJLabs",
+ "usb": {
+ "vid": "0x7074",
+ "pid": "0x1005",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi_arrow": {
"layout": [