From fb19e140481ecc360737420850d2d84c67a3d047 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Aug 2022 18:52:13 +1000 Subject: Move keyboard USB IDs and strings to data driven: Y (#17926) --- keyboards/ymdk/yd60mq/config.h | 6 ------ keyboards/ymdk/yd60mq/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/ymdk/yd60mq') diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index 0cff43c888..df82e6e375 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -2,12 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x594D // "YM" -#define PRODUCT_ID 0x604D // 60 "M" -#define MANUFACTURER YMDK -#define PRODUCT YD60MQ - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index 98db8ac3f6..f349d3dca2 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "YD60MQ", + "manufacturer": "YMDK", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x594D", + "pid": "0x604D" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/ymdk/yd60mq/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/ymdk/yd60mq') diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index df82e6e375..3aa5415bd2 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -9,7 +9,6 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.1 From b0eda7701a372e820264c6a78afa1f8c410845f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 22 Aug 2022 08:08:50 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 3 (#18111) --- keyboards/ymdk/yd60mq/12led/config.h | 2 -- keyboards/ymdk/yd60mq/12led/info.json | 5 +++++ keyboards/ymdk/yd60mq/16led/config.h | 2 -- keyboards/ymdk/yd60mq/16led/info.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 keyboards/ymdk/yd60mq/12led/info.json create mode 100644 keyboards/ymdk/yd60mq/16led/info.json (limited to 'keyboards/ymdk/yd60mq') diff --git a/keyboards/ymdk/yd60mq/12led/config.h b/keyboards/ymdk/yd60mq/12led/config.h index dde57aafec..edea795f78 100644 --- a/keyboards/ymdk/yd60mq/12led/config.h +++ b/keyboards/ymdk/yd60mq/12led/config.h @@ -1,5 +1,3 @@ #pragma once -#define DEVICE_VER 0x0001 - #define RGBLED_NUM 12 diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/ymdk/yd60mq/12led/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/ymdk/yd60mq/16led/config.h b/keyboards/ymdk/yd60mq/16led/config.h index 11ce3aeb27..00d3fcfc8c 100644 --- a/keyboards/ymdk/yd60mq/16led/config.h +++ b/keyboards/ymdk/yd60mq/16led/config.h @@ -1,5 +1,3 @@ #pragma once -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 16 diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/ymdk/yd60mq/16led/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} -- cgit v1.2.1 From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 21 Aug 2022 23:55:30 +0100 Subject: RESET -> QK_BOOT user keymaps (#17940) --- keyboards/ymdk/yd60mq/keymaps/64key/keymap.c | 2 +- keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/ymdk/yd60mq') diff --git a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c index 3c27f14d11..effa594af2 100644 --- a/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c +++ b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_GRV, _______, BL_TOGG, BL_DEC, BL_INC, BL_BRTG, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, MO(2), _______, KC_PGUP, _______, diff --git a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c index d9c2765659..ede3573384 100644 --- a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c +++ b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, RESET, + KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, QK_BOOT, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) -- cgit v1.2.1