summaryrefslogtreecommitdiff
path: root/keyboards/gboards/ergotaco
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-27 19:19:51 +0000
committerQMK Bot <hello@qmk.fm>2022-07-27 19:19:51 +0000
commited5351d75e767cdbe53c0d21d589e29b3a3ba4ad (patch)
tree556dd4e9f3f73062ff8e8a2f821355cec784002b /keyboards/gboards/ergotaco
parent602fde61e22501c839ec55da54974edad6457e68 (diff)
parent4a0eb733acf2efb66473046f174ad695f746ab24 (diff)
downloadqmk_firmware-ed5351d75e767cdbe53c0d21d589e29b3a3ba4ad.tar.gz
qmk_firmware-ed5351d75e767cdbe53c0d21d589e29b3a3ba4ad.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/gboards/ergotaco')
-rw-r--r--keyboards/gboards/ergotaco/config.h7
-rw-r--r--keyboards/gboards/ergotaco/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index d415e77dc6..21d14144d9 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VERBOSE
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1337
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT ErgoTaco
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index e7794e6ee3..bd1863288e 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "ErgoTaco",
+ "manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
"maintainer": "germ",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1337",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [