summaryrefslogtreecommitdiff
path: root/keyboards/wolf/ts60
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-06 05:50:30 +0000
committerQMK Bot <hello@qmk.fm>2022-08-06 05:50:30 +0000
commitec5186f0f9e2d1910331785f1410be5892058ee4 (patch)
tree3647aa4ca4bc826ec24fa1baf4e4a9e7cd79ccf5 /keyboards/wolf/ts60
parent7bbc1b21dd97d0d1577b5ed288adc48475512497 (diff)
parent10ad2389442c00c32714f6e9a6766e9e7bdec2c2 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/wolf/ts60')
-rw-r--r--keyboards/wolf/ts60/config.h7
-rw-r--r--keyboards/wolf/ts60/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index 4e15ab4cd5..6a4ee8e82e 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/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 0x5453 // TS - ToastyStoemp
-#define PRODUCT_ID 0x0050 // TS60
-#define DEVICE_VER 0x0001 // Version 1
-#define MANUFACTURER ToastyStoemp
-#define PRODUCT TS60
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index d7d3bfe497..d8de822a71 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "TS60",
+ "manufacturer": "ToastyStoemp",
"url": "https://www.vwolf.be/",
"maintainer": "ToastyStoemp",
+ "usb": {
+ "vid": "0x5453",
+ "pid": "0x0050",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]