diff options
| author | Álvaro A. Volpato <alvaro.volpato@usp.br> | 2021-10-23 02:58:52 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 22:58:52 -0700 |
| commit | d71c962b61d638e38a449719401695bdc4fb6257 (patch) | |
| tree | a2c3c6b84f1ae153a223b7d709e3b833629d49cf /keyboards/evolv | |
| parent | 8ec1afd17ce1fdc9aa217c1e8ea2e5b5f0decf4b (diff) | |
| download | qmk_firmware-d71c962b61d638e38a449719401695bdc4fb6257.tar.gz qmk_firmware-d71c962b61d638e38a449719401695bdc4fb6257.zip | |
[Keyboard] Update encoder callback on Evolv75 (#14757)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards/evolv')
| -rw-r--r-- | keyboards/evolv/config.h | 2 | ||||
| -rw-r--r-- | keyboards/evolv/evolv.c | 12 | ||||
| -rwxr-xr-x | keyboards/evolv/keymaps/default/keymap.c | 2 | ||||
| -rwxr-xr-x | keyboards/evolv/keymaps/iso/keymap.c | 2 | ||||
| -rwxr-xr-x | keyboards/evolv/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/evolv/mcuconf.h | 4 | ||||
| -rw-r--r-- | keyboards/evolv/rules.mk | 6 |
7 files changed, 16 insertions, 14 deletions
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h index 2b91033c9..59223cd2c 100644 --- a/keyboards/evolv/config.h +++ b/keyboards/evolv/config.h | |||
| @@ -59,6 +59,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 59 | 59 | ||
| 60 | #define ENCODERS_PAD_A { B3 } | 60 | #define ENCODERS_PAD_A { B3 } |
| 61 | #define ENCODERS_PAD_B { A15 } | 61 | #define ENCODERS_PAD_B { A15 } |
| 62 | #define ENCODER_RESOLUTION 2 | ||
| 63 | #define TAPPING_TERM 200 | ||
| 62 | 64 | ||
| 63 | /* | 65 | /* |
| 64 | * Feature disable options | 66 | * Feature disable options |
diff --git a/keyboards/evolv/evolv.c b/keyboards/evolv/evolv.c index 90df449ee..3f2762894 100644 --- a/keyboards/evolv/evolv.c +++ b/keyboards/evolv/evolv.c | |||
| @@ -17,14 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include "evolv.h" | 18 | #include "evolv.h" |
| 19 | 19 | ||
| 20 | #ifndef MEDIA_KEY_DELAY | ||
| 21 | # define MEDIA_KEY_DELAY 100 | ||
| 22 | #endif | ||
| 23 | |||
| 20 | bool encoder_update_kb(uint8_t index, bool clockwise) { | 24 | bool encoder_update_kb(uint8_t index, bool clockwise) { |
| 21 | if (!encoder_update_user(index, clockwise)) return false; | 25 | if (!encoder_update_user(index, clockwise)) return false; |
| 22 | if (index == 0) { /* First encoder */ | 26 | tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, MEDIA_KEY_DELAY); |
| 23 | if (clockwise) { | ||
| 24 | tap_code(KC_VOLU); | ||
| 25 | } else { | ||
| 26 | tap_code(KC_VOLD); | ||
| 27 | } | ||
| 28 | } | ||
| 29 | return true; | 27 | return true; |
| 30 | } | 28 | } |
diff --git a/keyboards/evolv/keymaps/default/keymap.c b/keyboards/evolv/keymaps/default/keymap.c index 5e5e5e7ab..228662704 100755 --- a/keyboards/evolv/keymaps/default/keymap.c +++ b/keyboards/evolv/keymaps/default/keymap.c | |||
| @@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | #define MEDIA_KEY_DELAY 100 | ||
| 21 | |||
| 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 21 | [0] = LAYOUT_evolv_ansi( | 23 | [0] = LAYOUT_evolv_ansi( |
| 22 | KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_INS , | 24 | KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_INS , |
diff --git a/keyboards/evolv/keymaps/iso/keymap.c b/keyboards/evolv/keymaps/iso/keymap.c index 4efe8268d..391bcdf5b 100755 --- a/keyboards/evolv/keymaps/iso/keymap.c +++ b/keyboards/evolv/keymaps/iso/keymap.c | |||
| @@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | #define MEDIA_KEY_DELAY 100 | ||
| 21 | |||
| 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 21 | [0] = LAYOUT_evolv_iso( | 23 | [0] = LAYOUT_evolv_iso( |
| 22 | KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_INS , | 24 | KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_INS , |
diff --git a/keyboards/evolv/keymaps/via/keymap.c b/keyboards/evolv/keymaps/via/keymap.c index 4efe8268d..391bcdf5b 100755 --- a/keyboards/evolv/keymaps/via/keymap.c +++ b/keyboards/evolv/keymaps/via/keymap.c | |||
| @@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | #define MEDIA_KEY_DELAY 100 | ||
| 21 | |||
| 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 21 | [0] = LAYOUT_evolv_iso( | 23 | [0] = LAYOUT_evolv_iso( |
| 22 | KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_INS , | 24 | KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_INS , |
diff --git a/keyboards/evolv/mcuconf.h b/keyboards/evolv/mcuconf.h index 2836e4b01..84d14114f 100644 --- a/keyboards/evolv/mcuconf.h +++ b/keyboards/evolv/mcuconf.h | |||
| @@ -23,9 +23,5 @@ | |||
| 23 | 23 | ||
| 24 | #include_next <mcuconf.h> | 24 | #include_next <mcuconf.h> |
| 25 | 25 | ||
| 26 | #undef STM32_I2C_USE_DMA | ||
| 27 | #define STM32_I2C_USE_DMA FALSE | ||
| 28 | |||
| 29 | #undef STM32_SPI_USE_SPI2 | 26 | #undef STM32_SPI_USE_SPI2 |
| 30 | #define STM32_SPI_USE_SPI2 TRUE | 27 | #define STM32_SPI_USE_SPI2 TRUE |
| 31 | |||
diff --git a/keyboards/evolv/rules.mk b/keyboards/evolv/rules.mk index 380010c77..b0f7124c0 100644 --- a/keyboards/evolv/rules.mk +++ b/keyboards/evolv/rules.mk | |||
| @@ -7,11 +7,11 @@ BOOTLOADER = stm32-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = yes # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
| 14 | COMMAND_ENABLE = yes # Commands for debug and configuration | 14 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
