aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle McCreery <mccreery.kyle@gmail.com>2021-06-18 14:48:41 -1000
committerGitHub <noreply@github.com>2021-06-18 17:48:41 -0700
commitfeaf972eb7f56a2f6dca98ed1a6b7c3c6bb9b667 (patch)
treea1b3bc70924e2aba33e28d920f1049ff5f94d0b2
parent6e132884b34817d569a8c74b09e4bbedbcd5bcea (diff)
downloadqmk_firmware-feaf972eb7f56a2f6dca98ed1a6b7c3c6bb9b667.tar.gz
qmk_firmware-feaf972eb7f56a2f6dca98ed1a6b7c3c6bb9b667.zip
[Keyboard] Murphpad Changes and Updates (#12995)
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat
-rw-r--r--keyboards/mechwild/murphpad/config.h4
-rw-r--r--keyboards/mechwild/murphpad/keymaps/default/keymap.c59
-rw-r--r--keyboards/mechwild/murphpad/keymaps/via/keymap.c81
-rw-r--r--keyboards/mechwild/murphpad/readme.md2
4 files changed, 80 insertions, 66 deletions
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index e107ad260..0887025ad 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -36,8 +36,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
36#define UNUSED_PINS 36#define UNUSED_PINS
37 37
38/* Encoder pins */ 38/* Encoder pins */
39#define ENCODERS_PAD_A { E6 } 39#define ENCODERS_PAD_A { E6, D2 }
40#define ENCODERS_PAD_B { B4 } 40#define ENCODERS_PAD_B { B4, D3 }
41 41
42/* Encoder resolution */ 42/* Encoder resolution */
43#define ENCODER_RESOLUTION 4 43#define ENCODER_RESOLUTION 4
diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
index 685cc9108..eace87cd6 100644
--- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
@@ -18,8 +18,8 @@
18// Defines names for use in layer keycodes and the keymap 18// Defines names for use in layer keycodes and the keymap
19 19
20enum layer_names { 20enum layer_names {
21 _BASE, 21 _BASE,
22 _FN1, 22 _FN1,
23 _FN2, 23 _FN2,
24 _FN3 24 _FN3
25}; 25};
@@ -28,46 +28,46 @@ enum layer_names {
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 /* Base */ 29 /* Base */
30 [_BASE] = LAYOUT( 30 [_BASE] = LAYOUT(
31 KC_F1, KC_F2, KC_F3, KC_F4, 31 KC_F1, KC_F2, KC_F3, KC_F4,
32 KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 32 KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
33 KC_P7, KC_P8, KC_P9, KC_PPLS, 33 KC_P7, KC_P8, KC_P9, KC_PPLS,
34 KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, 34 KC_MUTE, KC_P4, KC_P5, KC_P6, _______,
35 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, 35 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT,
36 KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, 36 KC_BSPC, KC_P0, _______, KC_PDOT, _______,
37 37
38 KC_F5, KC_F6, KC_F7 38 KC_F5, KC_F6, KC_F7
39 39
40 ), 40 ),
41 [_FN1] = LAYOUT( 41 [_FN1] = LAYOUT(
42 _______, _______, _______, _______, 42 _______, _______, _______, _______,
43 _______, _______, _______, _______, 43 _______, _______, _______, _______,
44 RGB_HUD, RGB_SPI, RGB_HUI, _______, 44 RGB_HUD, RGB_SPI, RGB_HUI, _______,
45 _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, 45 _______, RGB_RMOD, RGB_TOG, RGB_MOD, _______,
46 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, 46 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______,
47 _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, 47 _______, RGB_SAD, _______, RGB_SAI, _______,
48 48
49 _______, _______, _______ 49 _______, _______, _______
50 50
51 ), 51 ),
52 [_FN2] = LAYOUT( 52 [_FN2] = LAYOUT(
53 _______, _______, _______, _______, 53 _______, _______, _______, _______,
54 _______, _______, _______, _______, 54 _______, _______, _______, _______,
55 _______, _______, _______, _______, 55 _______, _______, _______, _______,
56 _______, _______, _______, _______, KC_NO,
57 _______, _______, _______, _______, _______, 56 _______, _______, _______, _______, _______,
58 _______, _______, _______, _______, KC_NO, 57 _______, _______, _______, _______, _______,
59 58 _______, _______, _______, _______, _______,
59
60 _______, _______, _______ 60 _______, _______, _______
61 61
62 ), 62 ),
63 [_FN3] = LAYOUT( 63 [_FN3] = LAYOUT(
64 _______, _______, _______, _______, 64 _______, _______, _______, _______,
65 _______, _______, _______, _______, 65 _______, _______, _______, _______,
66 _______, _______, _______, _______, 66 _______, _______, _______, _______,
67 _______, _______, _______, _______, KC_NO,
68 _______, _______, _______, _______, _______, 67 _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, KC_NO, 68 _______, _______, _______, _______, _______,
70 69 _______, _______, _______, _______, _______,
70
71 _______, _______, _______ 71 _______, _______, _______
72 72
73 ) 73 )
@@ -83,6 +83,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
83 tap_code(KC_VOLD); 83 tap_code(KC_VOLD);
84 } 84 }
85 break; 85 break;
86 case 1:
87 if (clockwise) {
88 tap_code(KC_BRIU);
89 } else {
90 tap_code(KC_BRID);
91 }
92 break;
86 } 93 }
87 return true; 94 return true;
88} 95}
diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
index bd74d2184..f7d381940 100644
--- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
@@ -17,8 +17,8 @@
17 17
18// Defines names for use in layer keycodes and the keymap 18// Defines names for use in layer keycodes and the keymap
19enum layer_names { 19enum layer_names {
20 _BASE, 20 _BASE,
21 _FN1, 21 _FN1,
22 _FN2, 22 _FN2,
23 _FN3 23 _FN3
24}; 24};
@@ -26,49 +26,49 @@ enum layer_names {
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 /* Base */ 27 /* Base */
28 [_BASE] = LAYOUT( 28 [_BASE] = LAYOUT(
29 KC_F1, KC_F2, KC_F3, KC_F4, 29 KC_F1, KC_F2, KC_F3, KC_F4,
30 KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, 30 KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
31 KC_P7, KC_P8, KC_P9, KC_PPLS, 31 KC_P7, KC_P8, KC_P9, KC_PPLS,
32 KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, 32 KC_MUTE, KC_P4, KC_P5, KC_P6, _______,
33 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, 33 MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT,
34 KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, 34 KC_BSPC, KC_P0, _______, KC_PDOT, _______,
35 35
36 _______, _______, _______ 36 KC_F5, KC_F6, KC_F7
37 37
38 ), 38 ),
39 [_FN1] = LAYOUT( 39 [_FN1] = LAYOUT(
40 _______, _______, _______, _______, 40 _______, _______, _______, _______,
41 _______, _______, _______, _______, 41 _______, _______, _______, _______,
42 RGB_HUD, RGB_SPI, RGB_HUI, _______, 42 RGB_HUD, RGB_SPI, RGB_HUI, _______,
43 _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, 43 _______, RGB_RMOD, RGB_TOG, RGB_MOD, _______,
44 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, 44 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______,
45 _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, 45 _______, RGB_SAD, _______, RGB_SAI, _______,
46 46
47 _______, _______, _______ 47 _______, _______, _______
48 48
49 ), 49 ),
50 [_FN2] = LAYOUT( 50 [_FN2] = LAYOUT(
51 _______, _______, _______, _______, 51 _______, _______, _______, _______,
52 _______, _______, _______, _______, 52 _______, _______, _______, _______,
53 _______, _______, _______, _______, 53 _______, _______, _______, _______,
54 _______, _______, _______, _______, KC_NO, 54 _______, _______, _______, _______, _______,
55 _______, _______, _______, _______, _______, 55 _______, _______, _______, _______, _______,
56 _______, _______, _______, _______, KC_NO, 56 _______, _______, _______, _______, _______,
57 57
58 _______, _______, _______ 58 _______, _______, _______
59 59
60 ), 60 ),
61 [_FN3] = LAYOUT( 61 [_FN3] = LAYOUT(
62 _______, _______, _______, _______, 62 _______, _______, _______, _______,
63 _______, _______, _______, _______, 63 _______, _______, _______, _______,
64 _______, _______, _______, _______, 64 _______, _______, _______, _______,
65 _______, _______, _______, _______, KC_NO, 65 _______, _______, _______, _______, _______,
66 _______, _______, _______, _______, _______, 66 _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, KC_NO, 67 _______, _______, _______, _______, _______,
68 68
69 _______, _______, _______ 69 _______, _______, _______
70 70
71 ) 71 )
72}; 72};
73 73
74#ifdef ENCODER_ENABLE 74#ifdef ENCODER_ENABLE
@@ -81,6 +81,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
81 tap_code(KC_VOLD); 81 tap_code(KC_VOLD);
82 } 82 }
83 break; 83 break;
84 case 1:
85 if (clockwise) {
86 tap_code(KC_BRIU);
87 } else {
88 tap_code(KC_BRID);
89 }
90 break;
84 } 91 }
85 return true; 92 return true;
86} 93}
diff --git a/keyboards/mechwild/murphpad/readme.md b/keyboards/mechwild/murphpad/readme.md
index 6318aeae1..3f46af48b 100644
--- a/keyboards/mechwild/murphpad/readme.md
+++ b/keyboards/mechwild/murphpad/readme.md
@@ -5,7 +5,7 @@
5A DIY numpad kit with macro row, two additional keys, OLED, RGB Underglow, and encoder. 5A DIY numpad kit with macro row, two additional keys, OLED, RGB Underglow, and encoder.
6 6
7* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery) 7* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
8* Hardware Supported: MurphPad v2.0 8* Hardware Supported: MurphPad v3.1
9* Hardware Availability: [MurphPad on MechWild](https://mechwild.com/product/murphpad/) 9* Hardware Availability: [MurphPad on MechWild](https://mechwild.com/product/murphpad/)
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 12:31:43 +0000