summaryrefslogtreecommitdiff
path: root/keyboards/majistic
diff options
context:
space:
mode:
authorInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
committerInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
commit6afdd9d74da250e47ac64d6690bd19d037045e99 (patch)
tree661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/majistic
parent93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff)
parent1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff)
downloadqmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz
qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/majistic')
-rw-r--r--keyboards/majistic/config.h7
-rw-r--r--keyboards/majistic/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/majistic/config.h b/keyboards/majistic/config.h
index 6e823ae3d6..6c015fde36 100644
--- a/keyboards/majistic/config.h
+++ b/keyboards/majistic/config.h
@@ -20,13 +20,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 0x6E55
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yossiyossy
-#define PRODUCT maJIStic
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json
index 8d8005c7f4..19b60ad2ee 100644
--- a/keyboards/majistic/info.json
+++ b/keyboards/majistic/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "maJIStic",
+ "manufacturer": "yossiyossy",
"url": "https://github.com/yossiyossy/maJIStic",
"maintainer": "yossiyossy",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6E55",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [