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/mechwild/murphpad | |
| parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
| parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) | |
merge upstream master
Diffstat (limited to 'keyboards/mechwild/murphpad')
| -rw-r--r-- | keyboards/mechwild/murphpad/config.h | 8 | ||||
| -rw-r--r-- | keyboards/mechwild/murphpad/info.json | 8 | ||||
| -rw-r--r-- | keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c | 10 |
3 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h index 3995546e8e..b52810b424 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/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 0x6D77 // mw = "MechWild" -#define PRODUCT_ID 0x1705 -#define DEVICE_VER 0x0301 -#define MANUFACTURER MechWild -#define PRODUCT MurphPad - /* Key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 5 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Key matrix pins */ #define MATRIX_ROW_PINS { F5, B2, B3, B1, F7, F6 } #define MATRIX_COL_PINS { B5, D7, C6, D4, B6 } -#define UNUSED_PINS /* Encoder pins */ #define ENCODERS_PAD_A { E6, D2 } diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index 42e01d2ca4..ae4f24f9fa 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MechWild MurphPad", + "keyboard_name": "MurphPad", + "manufacturer": "MechWild", "url": "mechwild.com", "maintainer": "Kyle McCreery", + "usb": { + "vid": "0x6D77", + "pid": "0x1705", + "device_version": "3.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c index d7c03bd228..b0288c5d7a 100644 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), [_FN2] = LAYOUT_landscape( - _______, _______, RESET, + _______, _______, QK_BOOT, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TT(_FN3), TT(_FN4), TT(_RGB) ), [_FN1] = LAYOUT( - _______, _______, _______, RESET, + _______, _______, _______, QK_BOOT, KC_CALC, _______, _______, _______, _______, _______, _______, _______, ENCFUNC, KC_TAB, _______, _______, _______, @@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MPRV, _______, _______, _______, KC_MNXT, - RESET, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -175,7 +175,7 @@ static const keycodedescType PROGMEM keyselection[] = { {"Break", KC_PAUS}, {"C-A-D", KC_CAD}, // Ctrl-Alt-Del {"AltF4", KC_AF4}, - {"RESET", RESET}, // firmware flash mode + {"QK_BOOT", QK_BOOT}, // firmware flash mode }; #define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0]) @@ -200,7 +200,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case ENCFUNC: if (record->event.pressed) { - selectedkey_rec.keycode == RESET ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle RESET code + selectedkey_rec.keycode == QK_BOOT ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle QK_BOOT code } else { // when keycode is released } |