summaryrefslogtreecommitdiff
path: root/keyboards/ergoslab
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2022-08-15 17:54:07 +1000
committerfauxpark <fauxpark@gmail.com>2022-08-15 17:54:07 +1000
commitc202602938e1b065e6bac394771b310fea2a3edb (patch)
tree444978b63e48d68f004b1c0730929bfbcfb221e8 /keyboards/ergoslab
parent8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff)
parent51d5aad25b92a34bc051849616fcd93e3ae407fc (diff)
downloadqmk_firmware-c202602938e1b065e6bac394771b310fea2a3edb.tar.gz
qmk_firmware-c202602938e1b065e6bac394771b310fea2a3edb.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/ergoslab')
-rw-r--r--keyboards/ergoslab/rev1/config.h7
-rw-r--r--keyboards/ergoslab/rev1/info.json (renamed from keyboards/ergoslab/info.json)8
2 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index b754a7810c..7bb092834b 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x5148
-#define DEVICE_VER 0x0100
-#define MANUFACTURER tomsaleeba
-#define PRODUCT Ergoslab Keyboard
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/rev1/info.json
index e37a3b7cbf..38530960a5 100644
--- a/keyboards/ergoslab/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "ergoslab",
+ "keyboard_name": "Ergoslab Keyboard",
+ "manufacturer": "tomsaleeba",
"url": "https://github.com/tomsaleeba/ergoslab",
"maintainer": "tomsaleeba",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x5148",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_ergoslab": {
"layout": [