Merge remote-tracking branch 'origin/master' into develop

2 files changed, 16 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/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
new file mode 100644
index 0000000000..0037719e12
--- /dev/null
+++ b/keyboards/abstract/ellipse/rev1/info.json
@@ -0,0 +1,16 @@
+{
+    "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}]
+        }
+    }
+}