summaryrefslogtreecommitdiff
path: root/keyboards/abstract
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-14 00:47:42 +0000
committerQMK Bot <hello@qmk.fm>2022-08-14 00:47:42 +0000
commit50ff52639f9dcaae3153348ca4f363645c2331b2 (patch)
treebf11c955715de9329fca8e6c5b6522701dbb30b5 /keyboards/abstract
parentb44c3f92ae312f279f1b8e88ddc1d1336786f4d7 (diff)
parent30796913913c0f6dc0cce317ad8249de2b602294 (diff)
downloadqmk_firmware-50ff52639f9dcaae3153348ca4f363645c2331b2.tar.gz
qmk_firmware-50ff52639f9dcaae3153348ca4f363645c2331b2.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/abstract')
-rw-r--r--keyboards/abstract/ellipse/rev1/config.h7
-rw-r--r--keyboards/abstract/ellipse/rev1/info.json (renamed from keyboards/abstract/ellipse/info.json)6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index 1febf490e7..2025739210 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/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 0xFEED
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER AbstractKB
-#define PRODUCT EllipseRev1
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/abstract/ellipse/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 3348b38477..0037719e12 100644
--- a/keyboards/abstract/ellipse/info.json
+++ b/keyboards/abstract/ellipse/rev1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Ellipse",
+ "manufacturer": "AbstractKB",
"url": "https://abstractkb.tk/product/ellipse-rev1",
"maintainer": "AbstractKB",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]