aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechwild/murphpad
diff options
context:
space:
mode:
authorXelus22 <17491233+Xelus22@users.noreply.github.com>2021-08-24 16:28:26 +1000
committerGitHub <noreply@github.com>2021-08-24 16:28:26 +1000
commit4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch)
tree24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /keyboards/mechwild/murphpad
parent6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff)
downloadqmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.tar.gz
qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.zip
[Core] Refactor OLED to allow easy addition of other types (#13454)
* add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
Diffstat (limited to 'keyboards/mechwild/murphpad')
-rw-r--r--keyboards/mechwild/murphpad/keymaps/default/keymap.c6
-rw-r--r--keyboards/mechwild/murphpad/keymaps/via/keymap.c12
-rw-r--r--keyboards/mechwild/murphpad/rules.mk3
3 files changed, 11 insertions, 10 deletions
diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
index eace87cd6..a30bf6bfa 100644
--- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
56 _______, _______, _______, _______, _______, 56 _______, _______, _______, _______, _______,
57 _______, _______, _______, _______, _______, 57 _______, _______, _______, _______, _______,
58 _______, _______, _______, _______, _______, 58 _______, _______, _______, _______, _______,
59 59
60 _______, _______, _______ 60 _______, _______, _______
61 61
62 ), 62 ),
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 _______, _______, _______, _______, _______, 67 _______, _______, _______, _______, _______,
68 _______, _______, _______, _______, _______, 68 _______, _______, _______, _______, _______,
69 _______, _______, _______, _______, _______, 69 _______, _______, _______, _______, _______,
70 70
71 _______, _______, _______ 71 _______, _______, _______
72 72
73 ) 73 )
@@ -95,7 +95,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
95} 95}
96#endif 96#endif
97 97
98#ifdef OLED_DRIVER_ENABLE 98#ifdef OLED_ENABLE
99 oled_rotation_t oled_init_user(oled_rotation_t rotation) { 99 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
100 return OLED_ROTATION_270; // flips the display 270 degrees 100 return OLED_ROTATION_270; // flips the display 270 degrees
101 } 101 }
diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
index f7d381940..17e4699a9 100644
--- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c
+++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c
@@ -32,18 +32,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 KC_MUTE, KC_P4, KC_P5, KC_P6, _______, 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_PDOT, _______, 34 KC_BSPC, KC_P0, _______, KC_PDOT, _______,
35 35
36 KC_F5, KC_F6, KC_F7 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, _______, 43 _______, RGB_RMOD, RGB_TOG, RGB_MOD, _______,
44 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, 44 _______, RGB_VAD, RGB_SPD, RGB_VAI, _______,
45 _______, RGB_SAD, _______, RGB_SAI, _______, 45 _______, RGB_SAD, _______, RGB_SAI, _______,
46 46
47 _______, _______, _______ 47 _______, _______, _______
48 48
49 ), 49 ),
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
54 _______, _______, _______, _______, _______, 54 _______, _______, _______, _______, _______,
55 _______, _______, _______, _______, _______, 55 _______, _______, _______, _______, _______,
56 _______, _______, _______, _______, _______, 56 _______, _______, _______, _______, _______,
57 57
58 _______, _______, _______ 58 _______, _______, _______
59 59
60 ), 60 ),
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
65 _______, _______, _______, _______, _______, 65 _______, _______, _______, _______, _______,
66 _______, _______, _______, _______, _______, 66 _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, _______, 67 _______, _______, _______, _______, _______,
68 68
69 _______, _______, _______ 69 _______, _______, _______
70 70
71 ) 71 )
@@ -93,7 +93,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
93} 93}
94#endif 94#endif
95 95
96#ifdef OLED_DRIVER_ENABLE 96#ifdef OLED_ENABLE
97 oled_rotation_t oled_init_user(oled_rotation_t rotation) { 97 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
98 return OLED_ROTATION_270; // flips the display 270 degrees 98 return OLED_ROTATION_270; // flips the display 270 degrees
99 } 99 }
diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk
index 2e7b5e102..e8d3ea7aa 100644
--- a/keyboards/mechwild/murphpad/rules.mk
+++ b/keyboards/mechwild/murphpad/rules.mk
@@ -21,4 +21,5 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23ENCODER_ENABLE = yes # Enable encoder 23ENCODER_ENABLE = yes # Enable encoder
24OLED_DRIVER_ENABLE = yes # Enable OLED Screen 24OLED_ENABLE = yes
25OLED_DRIVER = SSD1306 # Enable OLED Screen