diff options
author | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
---|---|---|
committer | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
commit | fe13cedf8c09fa34d5cec4e4c624738095176625 (patch) | |
tree | 818436626d49c7f22f325632b2053edba10d4358 /keyboards/ymdk/sp64 | |
parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) |
merge upstream master
Diffstat (limited to 'keyboards/ymdk/sp64')
-rw-r--r-- | keyboards/ymdk/sp64/config.h | 6 | ||||
-rw-r--r-- | keyboards/ymdk/sp64/info.json | 8 | ||||
-rw-r--r-- | keyboards/ymdk/sp64/keymaps/daed/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/ymdk/sp64/keymaps/walston/keymap.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h index f7b34575af..61772c6d04 100644 --- a/keyboards/ymdk/sp64/config.h +++ b/keyboards/ymdk/sp64/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x594D -#define PRODUCT_ID 0x5364 -#define DEVICE_VER 0x0200 -#define MANUFACTURER YMDK -#define PRODUCT SP64 - #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index 3804b8b99a..a59c46d2f2 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "YMDK_SP64", + "keyboard_name": "SP64", + "manufacturer": "YMDK", "url": "", "maintainer": "walston", + "usb": { + "vid": "0x594D", + "pid": "0x5364", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ymdk/sp64/keymaps/daed/keymap.c b/keyboards/ymdk/sp64/keymaps/daed/keymap.c index 7174c108b3..8512ef799f 100644 --- a/keyboards/ymdk/sp64/keymaps/daed/keymap.c +++ b/keyboards/ymdk/sp64/keymaps/daed/keymap.c @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MODE] = LAYOUT( KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - RGB_TOG, RGB_RMOD, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, + RGB_TOG, RGB_RMOD, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, RGB_SPD, RGB_VAD, RGB_SPI, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_GAMER), TO(_BASE), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/ymdk/sp64/keymaps/walston/keymap.c b/keyboards/ymdk/sp64/keymaps/walston/keymap.c index ada3073fb9..248cf5f445 100644 --- a/keyboards/ymdk/sp64/keymaps/walston/keymap.c +++ b/keyboards/ymdk/sp64/keymaps/walston/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └------┴-----┴------┴-------------┴-----┘ └---------------┴-------┴------┴-----┴-----┴-----┘ */ [BASE] = LAYOUT( - MT(RESET, KC_GRAVE), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, + MT(QK_BOOT, KC_GRAVE), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_BSLS, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, OSL(_MEDIA), |