From 5d6d9594212073ca52b80a1a949510187af47b13 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 9 Apr 2023 22:41:32 +1000 Subject: Fix up via keymap builds. (#20383) * Fix up via keymap builds. - Usages of old IS_PRESSED. * Fix up bad code. * Fix up bad code. --- .../custommk/genesis/rev2/keymaps/via/keymap.c | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'keyboards/custommk/genesis') diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c index f6a3c936df..9c04a33e15 100644 --- a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c +++ b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + #include QMK_KEYBOARD_H //#define GENESIS_LAYER_COLORS @@ -26,34 +26,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_via_6x4( KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, - MO(1), KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PGUP, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PGDN, + MO(1), KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PGUP, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PGDN, KC_P0, KC_SPC, KC_PDOT, KC_PENT), [1] = LAYOUT_via_6x4( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS), [2] = LAYOUT_via_6x4( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [3] = LAYOUT_via_6x4( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; @@ -113,35 +113,35 @@ keyevent_t encoder_right_ccw = { keyevent_t encoder_right_cw = { .key = (keypos_t){.row = 5, .col = 3}, - .pressed = false + .pressed = false, .type = KEY_EVENT }; void matrix_scan_user(void) { - if (IS_PRESSED(encoder_left_ccw)) { + if (encoder_left_ccw.pressed) { encoder_left_ccw.pressed = false; encoder_left_ccw.time = timer_read(); action_exec(encoder_left_ccw); } - if (IS_PRESSED(encoder_left_cw)) { + if (encoder_left_cw.pressed) { encoder_left_cw.pressed = false; encoder_left_cw.time = timer_read(); action_exec(encoder_left_cw); } - if (IS_PRESSED(encoder_right_ccw)) { + if (encoder_right_ccw.pressed) { encoder_right_ccw.pressed = false; encoder_right_ccw.time = timer_read(); action_exec(encoder_right_ccw); } - if (IS_PRESSED(encoder_right_cw)) { + if (encoder_right_cw.pressed) { encoder_right_cw.pressed = false; encoder_right_cw.time = timer_read(); action_exec(encoder_right_cw); } - + } -- cgit v1.2.3