diff options
Diffstat (limited to 'keyboards/custommk/evo70')
| -rw-r--r-- | keyboards/custommk/evo70/info.json | 4 | ||||
| -rw-r--r-- | keyboards/custommk/evo70/keymaps/via/keymap.c | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index 1ea89ad92a..ee032bd5ee 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -30,7 +30,6 @@ }, "rgblight": { "led_count": 48, - "pin": "B2", "hue_steps": 4, "saturation_steps": 8, "brightness_steps": 4, @@ -47,6 +46,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c index 74f68590cf..ba0d231118 100644 --- a/keyboards/custommk/evo70/keymaps/via/keymap.c +++ b/keyboards/custommk/evo70/keymaps/via/keymap.c @@ -57,12 +57,14 @@ void set_custom_encoder_mode_user(bool custom_mode) { keyevent_t encoder_ccw = { .key = (keypos_t){.row = 4, .col = 7}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder_cw = { .key = (keypos_t){.row = 4, .col = 10}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; @@ -70,12 +72,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) { if (custom_encoder_mode) { if (clockwise) { encoder_cw.pressed = true; - encoder_cw.time = (timer_read() | 1); + encoder_cw.time = timer_read(); action_exec(encoder_cw); } else { encoder_ccw.pressed = true; - encoder_ccw.time = (timer_read() | 1); + encoder_ccw.time = timer_read(); action_exec(encoder_ccw); } return false; @@ -86,13 +88,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) { void matrix_scan_user(void) { if (IS_PRESSED(encoder_ccw)) { encoder_ccw.pressed = false; - encoder_ccw.time = (timer_read() | 1); + encoder_ccw.time = timer_read(); action_exec(encoder_ccw); } if (IS_PRESSED(encoder_cw)) { encoder_cw.pressed = false; - encoder_cw.time = (timer_read() | 1); + encoder_cw.time = timer_read(); action_exec(encoder_cw); } -}
\ No newline at end of file +} |