diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-03 07:16:28 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-03 07:16:28 +0000 |
commit | d4f9eb5225feb7f2aad01d252b33401e3a80b870 (patch) | |
tree | f3b1f76a8d715e7c4f63d18f9fc3ae65141eb1fb /keyboards/majistic | |
parent | bce4fb45748bacc8cb21cb61687d9bfd9faa4494 (diff) | |
parent | 3da6575e2480d46399be01c21270c57420e0f16d (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/majistic')
-rw-r--r-- | keyboards/majistic/config.h | 7 | ||||
-rw-r--r-- | keyboards/majistic/info.json | 6 |
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": [ |