diff options
Diffstat (limited to 'keyboards/mechwild')
| -rwxr-xr-x | keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/mechwild/murphpad/keymaps/default/keymap.c | 18 | ||||
| -rw-r--r-- | keyboards/mechwild/murphpad/keymaps/via/keymap.c | 28 |
3 files changed, 25 insertions, 24 deletions
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c index fbbe2660ca..f5dddcfac8 100755 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef ENCODER_ENABLE // Encoder Functionality uint8_t selected_layer = 0; - void encoder_update_user(uint8_t index, bool clockwise) { + bool encoder_update_user(uint8_t index, bool clockwise) { #ifdef OLED_DRIVER_ENABLE oled_clear(); oled_render(); @@ -81,6 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { } } } + return true; } #endif diff --git a/keyboards/mechwild/murphpad/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c index da9b28f296..685cc9108d 100644 --- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c @@ -34,18 +34,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, - + KC_F5, KC_F6, KC_F7 ), [_FN1] = LAYOUT( - _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SPI, RGB_HUI, _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, - + _______, _______, _______ ), @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ ), @@ -67,14 +67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ ) }; #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { switch (index) { case 0: if (clockwise) { @@ -84,7 +84,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } break; } - + return true; } #endif @@ -109,7 +109,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } void oled_task_user(void) { - render_logo(); + render_logo(); oled_set_cursor(0,6); oled_write_ln_P(PSTR("Layer"), false); @@ -137,4 +137,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); } -#endif
\ No newline at end of file +#endif diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c index 630b47f8cb..bd74d2184f 100644 --- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c @@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, - + _______, _______, _______ - + ), [_FN1] = LAYOUT( _______, _______, _______, _______, @@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, - + _______, _______, _______ - + ), [_FN2] = LAYOUT( _______, _______, _______, _______, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ - - ), + + ), [_FN3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, @@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, - + _______, _______, _______ - - ) + + ) }; #ifdef ENCODER_ENABLE -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { switch (index) { case 0: if (clockwise) { @@ -82,7 +82,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } break; } - + return true; } #endif @@ -107,7 +107,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } void oled_task_user(void) { - render_logo(); + render_logo(); oled_set_cursor(0,6); oled_write_ln_P(PSTR("Layer"), false); @@ -135,4 +135,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); } -#endif
\ No newline at end of file +#endif |