diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-04-09 22:41:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-09 13:41:32 +0100 |
| commit | 5d6d9594212073ca52b80a1a949510187af47b13 (patch) | |
| tree | 6dec049b0a1a0f6ec4ac2869000c0c6b8ea55e78 | |
| parent | 441988ef3895171d640e807205e7978ff9755acd (diff) | |
Fix up via keymap builds. (#20383)
* Fix up via keymap builds.
- Usages of old IS_PRESSED.
* Fix up bad code.
* Fix up bad code.
| -rw-r--r-- | keyboards/custommk/evo70/keymaps/via/keymap.c | 36 | ||||
| -rw-r--r-- | keyboards/custommk/genesis/rev2/keymaps/via/keymap.c | 46 | ||||
| -rw-r--r-- | keyboards/dailycraft/owl8/keymaps/via/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/dailycraft/stickey4/keymaps/via/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c | 16 | ||||
| -rw-r--r-- | keyboards/monarch/keymaps/via/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/rate/pistachio_mp/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/rmi_kb/chevron/keymaps/via/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c | 4 | ||||
| -rw-r--r-- | users/talljoe/talljoe.c | 4 |
13 files changed, 73 insertions, 73 deletions
diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c index ba0d231118..8019834b4f 100644 --- a/keyboards/custommk/evo70/keymaps/via/keymap.c +++ b/keyboards/custommk/evo70/keymaps/via/keymap.c | |||
| @@ -19,31 +19,31 @@ | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | 20 | ||
| 21 | [0] = LAYOUT( | 21 | [0] = LAYOUT( |
| 22 | QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, | 22 | QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, |
| 23 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, | 23 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, |
| 24 | KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, | 24 | KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, |
| 25 | KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, | 25 | KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, |
| 26 | KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT), | 26 | KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT), |
| 27 | 27 | ||
| 28 | [1] = LAYOUT( | 28 | [1] = LAYOUT( |
| 29 | QK_BOOT, 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_TRNS, KC_TRNS, | 29 | QK_BOOT, 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_TRNS, KC_TRNS, |
| 30 | KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 30 | KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 31 | KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 31 | KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 32 | KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 32 | KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 33 | KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 33 | KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 34 | 34 | ||
| 35 | [2] = LAYOUT( | 35 | [2] = LAYOUT( |
| 36 | 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, | 36 | 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, |
| 37 | 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, | 37 | 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, |
| 38 | 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, | 38 | 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, |
| 39 | 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, | 39 | 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, |
| 40 | 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), | 40 | 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), |
| 41 | 41 | ||
| 42 | [3] = LAYOUT( | 42 | [3] = LAYOUT( |
| 43 | 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, | 43 | 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, |
| 44 | 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, | 44 | 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, |
| 45 | 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, | 45 | 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, |
| 46 | 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, | 46 | 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, |
| 47 | 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), | 47 | 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), |
| 48 | 48 | ||
| 49 | }; | 49 | }; |
| @@ -86,13 +86,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | void matrix_scan_user(void) { | 88 | void matrix_scan_user(void) { |
| 89 | if (IS_PRESSED(encoder_ccw)) { | 89 | if (encoder_ccw.pressed) { |
| 90 | encoder_ccw.pressed = false; | 90 | encoder_ccw.pressed = false; |
| 91 | encoder_ccw.time = timer_read(); | 91 | encoder_ccw.time = timer_read(); |
| 92 | action_exec(encoder_ccw); | 92 | action_exec(encoder_ccw); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | if (IS_PRESSED(encoder_cw)) { | 95 | if (encoder_cw.pressed) { |
| 96 | encoder_cw.pressed = false; | 96 | encoder_cw.pressed = false; |
| 97 | encoder_cw.time = timer_read(); | 97 | encoder_cw.time = timer_read(); |
| 98 | action_exec(encoder_cw); | 98 | action_exec(encoder_cw); |
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 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
| 18 | 18 | ||
| 19 | //#define GENESIS_LAYER_COLORS | 19 | //#define GENESIS_LAYER_COLORS |
| @@ -26,34 +26,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 26 | 26 | ||
| 27 | [0] = LAYOUT_via_6x4( | 27 | [0] = LAYOUT_via_6x4( |
| 28 | KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, | 28 | KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, |
| 29 | MO(1), KC_PSLS, KC_PAST, KC_PMNS, | 29 | MO(1), KC_PSLS, KC_PAST, KC_PMNS, |
| 30 | KC_P7, KC_P8, KC_P9, KC_PGUP, | 30 | KC_P7, KC_P8, KC_P9, KC_PGUP, |
| 31 | KC_P4, KC_P5, KC_P6, KC_PPLS, | 31 | KC_P4, KC_P5, KC_P6, KC_PPLS, |
| 32 | KC_P1, KC_P2, KC_P3, KC_PGDN, | 32 | KC_P1, KC_P2, KC_P3, KC_PGDN, |
| 33 | KC_P0, KC_SPC, KC_PDOT, KC_PENT), | 33 | KC_P0, KC_SPC, KC_PDOT, KC_PENT), |
| 34 | 34 | ||
| 35 | [1] = LAYOUT_via_6x4( | 35 | [1] = LAYOUT_via_6x4( |
| 36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 36 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 37 | KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, | 37 | KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, |
| 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 39 | RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, | 39 | RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, |
| 40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 41 | RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS), | 41 | RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS), |
| 42 | 42 | ||
| 43 | [2] = LAYOUT_via_6x4( | 43 | [2] = LAYOUT_via_6x4( |
| 44 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 44 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 50 | 50 | ||
| 51 | [3] = LAYOUT_via_6x4( | 51 | [3] = LAYOUT_via_6x4( |
| 52 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 52 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 53 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 53 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 54 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 54 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 55 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 55 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 56 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 56 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 57 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 57 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 58 | 58 | ||
| 59 | }; | 59 | }; |
| @@ -113,35 +113,35 @@ keyevent_t encoder_right_ccw = { | |||
| 113 | 113 | ||
| 114 | keyevent_t encoder_right_cw = { | 114 | keyevent_t encoder_right_cw = { |
| 115 | .key = (keypos_t){.row = 5, .col = 3}, | 115 | .key = (keypos_t){.row = 5, .col = 3}, |
| 116 | .pressed = false | 116 | .pressed = false, |
| 117 | .type = KEY_EVENT | 117 | .type = KEY_EVENT |
| 118 | }; | 118 | }; |
| 119 | 119 | ||
| 120 | void matrix_scan_user(void) { | 120 | void matrix_scan_user(void) { |
| 121 | if (IS_PRESSED(encoder_left_ccw)) { | 121 | if (encoder_left_ccw.pressed) { |
| 122 | encoder_left_ccw.pressed = false; | 122 | encoder_left_ccw.pressed = false; |
| 123 | encoder_left_ccw.time = timer_read(); | 123 | encoder_left_ccw.time = timer_read(); |
| 124 | action_exec(encoder_left_ccw); | 124 | action_exec(encoder_left_ccw); |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | if (IS_PRESSED(encoder_left_cw)) { | 127 | if (encoder_left_cw.pressed) { |
| 128 | encoder_left_cw.pressed = false; | 128 | encoder_left_cw.pressed = false; |
| 129 | encoder_left_cw.time = timer_read(); | 129 | encoder_left_cw.time = timer_read(); |
| 130 | action_exec(encoder_left_cw); | 130 | action_exec(encoder_left_cw); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | if (IS_PRESSED(encoder_right_ccw)) { | 133 | if (encoder_right_ccw.pressed) { |
| 134 | encoder_right_ccw.pressed = false; | 134 | encoder_right_ccw.pressed = false; |
| 135 | encoder_right_ccw.time = timer_read(); | 135 | encoder_right_ccw.time = timer_read(); |
| 136 | action_exec(encoder_right_ccw); | 136 | action_exec(encoder_right_ccw); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | if (IS_PRESSED(encoder_right_cw)) { | 139 | if (encoder_right_cw.pressed) { |
| 140 | encoder_right_cw.pressed = false; | 140 | encoder_right_cw.pressed = false; |
| 141 | encoder_right_cw.time = timer_read(); | 141 | encoder_right_cw.time = timer_read(); |
| 142 | action_exec(encoder_right_cw); | 142 | action_exec(encoder_right_cw); |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | 147 | ||
diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c index 667392b946..1a3bb0f0ae 100644 --- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c +++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c | |||
| @@ -75,25 +75,25 @@ keyevent_t encoder2_cw = { | |||
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | void matrix_scan_user(void) { | 77 | void matrix_scan_user(void) { |
| 78 | if (IS_PRESSED(encoder1_ccw)) { | 78 | if (encoder1_ccw.pressed) { |
| 79 | encoder1_ccw.pressed = false; | 79 | encoder1_ccw.pressed = false; |
| 80 | encoder1_ccw.time = timer_read(); | 80 | encoder1_ccw.time = timer_read(); |
| 81 | action_exec(encoder1_ccw); | 81 | action_exec(encoder1_ccw); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | if (IS_PRESSED(encoder1_cw)) { | 84 | if (encoder1_cw.pressed) { |
| 85 | encoder1_cw.pressed = false; | 85 | encoder1_cw.pressed = false; |
| 86 | encoder1_cw.time = timer_read(); | 86 | encoder1_cw.time = timer_read(); |
| 87 | action_exec(encoder1_cw); | 87 | action_exec(encoder1_cw); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | if (IS_PRESSED(encoder2_ccw)) { | 90 | if (encoder2_ccw.pressed) { |
| 91 | encoder2_ccw.pressed = false; | 91 | encoder2_ccw.pressed = false; |
| 92 | encoder2_ccw.time = timer_read(); | 92 | encoder2_ccw.time = timer_read(); |
| 93 | action_exec(encoder2_ccw); | 93 | action_exec(encoder2_ccw); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | if (IS_PRESSED(encoder2_cw)) { | 96 | if (encoder2_cw.pressed) { |
| 97 | encoder2_cw.pressed = false; | 97 | encoder2_cw.pressed = false; |
| 98 | encoder2_cw.time = timer_read(); | 98 | encoder2_cw.time = timer_read(); |
| 99 | action_exec(encoder2_cw); | 99 | action_exec(encoder2_cw); |
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c index 30d8ad188e..30de32fa60 100644 --- a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c +++ b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c | |||
| @@ -67,25 +67,25 @@ keyevent_t encoder2_cw = { | |||
| 67 | }; | 67 | }; |
| 68 | 68 | ||
| 69 | void matrix_scan_user(void) { | 69 | void matrix_scan_user(void) { |
| 70 | if (IS_PRESSED(encoder1_ccw)) { | 70 | if (encoder1_ccw.pressed) { |
| 71 | encoder1_ccw.pressed = false; | 71 | encoder1_ccw.pressed = false; |
| 72 | encoder1_ccw.time = timer_read(); | 72 | encoder1_ccw.time = timer_read(); |
| 73 | action_exec(encoder1_ccw); | 73 | action_exec(encoder1_ccw); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | if (IS_PRESSED(encoder1_cw)) { | 76 | if (encoder1_cw.pressed) { |
| 77 | encoder1_cw.pressed = false; | 77 | encoder1_cw.pressed = false; |
| 78 | encoder1_cw.time = timer_read(); | 78 | encoder1_cw.time = timer_read(); |
| 79 | action_exec(encoder1_cw); | 79 | action_exec(encoder1_cw); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | if (IS_PRESSED(encoder2_ccw)) { | 82 | if (encoder2_ccw.pressed) { |
| 83 | encoder2_ccw.pressed = false; | 83 | encoder2_ccw.pressed = false; |
| 84 | encoder2_ccw.time = timer_read(); | 84 | encoder2_ccw.time = timer_read(); |
| 85 | action_exec(encoder2_ccw); | 85 | action_exec(encoder2_ccw); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (IS_PRESSED(encoder2_cw)) { | 88 | if (encoder2_cw.pressed) { |
| 89 | encoder2_cw.pressed = false; | 89 | encoder2_cw.pressed = false; |
| 90 | encoder2_cw.time = timer_read(); | 90 | encoder2_cw.time = timer_read(); |
| 91 | action_exec(encoder2_cw); | 91 | action_exec(encoder2_cw); |
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c index 5655d2ca48..7349bf2411 100644 --- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c +++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c | |||
| @@ -130,49 +130,49 @@ keyevent_t encoder4_cw = { | |||
| 130 | 130 | ||
| 131 | 131 | ||
| 132 | void matrix_scan_user(void) { | 132 | void matrix_scan_user(void) { |
| 133 | if (IS_PRESSED(encoder1_ccw)) { | 133 | if (encoder1_ccw.pressed) { |
| 134 | encoder1_ccw.pressed = false; | 134 | encoder1_ccw.pressed = false; |
| 135 | encoder1_ccw.time = timer_read(); | 135 | encoder1_ccw.time = timer_read(); |
| 136 | action_exec(encoder1_ccw); | 136 | action_exec(encoder1_ccw); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | if (IS_PRESSED(encoder1_cw)) { | 139 | if (encoder1_cw.pressed) { |
| 140 | encoder1_cw.pressed = false; | 140 | encoder1_cw.pressed = false; |
| 141 | encoder1_cw.time = timer_read(); | 141 | encoder1_cw.time = timer_read(); |
| 142 | action_exec(encoder1_cw); | 142 | action_exec(encoder1_cw); |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | if (IS_PRESSED(encoder2_ccw)) { | 145 | if (encoder2_ccw.pressed) { |
| 146 | encoder2_ccw.pressed = false; | 146 | encoder2_ccw.pressed = false; |
| 147 | encoder2_ccw.time = timer_read(); | 147 | encoder2_ccw.time = timer_read(); |
| 148 | action_exec(encoder2_ccw); | 148 | action_exec(encoder2_ccw); |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | if (IS_PRESSED(encoder2_cw)) { | 151 | if (encoder2_cw.pressed) { |
| 152 | encoder2_cw.pressed = false; | 152 | encoder2_cw.pressed = false; |
| 153 | encoder2_cw.time = timer_read(); | 153 | encoder2_cw.time = timer_read(); |
| 154 | action_exec(encoder2_cw); | 154 | action_exec(encoder2_cw); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | if (IS_PRESSED(encoder3_ccw)) { | 157 | if (encoder3_ccw.pressed) { |
| 158 | encoder3_ccw.pressed = false; | 158 | encoder3_ccw.pressed = false; |
| 159 | encoder3_ccw.time = timer_read(); | 159 | encoder3_ccw.time = timer_read(); |
| 160 | action_exec(encoder3_ccw); | 160 | action_exec(encoder3_ccw); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | if (IS_PRESSED(encoder3_cw)) { | 163 | if (encoder3_cw.pressed) { |
| 164 | encoder3_cw.pressed = false; | 164 | encoder3_cw.pressed = false; |
| 165 | encoder3_cw.time = timer_read(); | 165 | encoder3_cw.time = timer_read(); |
| 166 | action_exec(encoder3_cw); | 166 | action_exec(encoder3_cw); |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | if (IS_PRESSED(encoder4_ccw)) { | 169 | if (encoder4_ccw.pressed) { |
| 170 | encoder4_ccw.pressed = false; | 170 | encoder4_ccw.pressed = false; |
| 171 | encoder4_ccw.time = timer_read(); | 171 | encoder4_ccw.time = timer_read(); |
| 172 | action_exec(encoder4_ccw); | 172 | action_exec(encoder4_ccw); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | if (IS_PRESSED(encoder4_cw)) { | 175 | if (encoder4_cw.pressed) { |
| 176 | encoder4_cw.pressed = false; | 176 | encoder4_cw.pressed = false; |
| 177 | encoder4_cw.time = timer_read(); | 177 | encoder4_cw.time = timer_read(); |
| 178 | action_exec(encoder4_cw); | 178 | action_exec(encoder4_cw); |
diff --git a/keyboards/monarch/keymaps/via/keymap.c b/keyboards/monarch/keymaps/via/keymap.c index 9fded17e9e..c70f9c213b 100644 --- a/keyboards/monarch/keymaps/via/keymap.c +++ b/keyboards/monarch/keymaps/via/keymap.c | |||
| @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, |
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_ON, | 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_ON, |
| 34 | _______, _______, _______, BL_TOGG, _______, BL_DOWN, BL_OFF, BL_UP, | 34 | _______, _______, _______, BL_TOGG, _______, BL_DOWN, BL_OFF, BL_UP, |
| 35 | _______, _______ | 35 | _______, _______ |
| 36 | ), | 36 | ), |
| 37 | [2] = LAYOUT_all( | 37 | [2] = LAYOUT_all( |
| @@ -65,13 +65,13 @@ keyevent_t encoder_cw = { | |||
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | void matrix_scan_user(void) { | 67 | void matrix_scan_user(void) { |
| 68 | if (IS_PRESSED(encoder_ccw)) { | 68 | if (encoder_ccw.pressed) { |
| 69 | encoder_ccw.pressed = false; | 69 | encoder_ccw.pressed = false; |
| 70 | encoder_ccw.time = timer_read(); | 70 | encoder_ccw.time = timer_read(); |
| 71 | action_exec(encoder_ccw); | 71 | action_exec(encoder_ccw); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | if (IS_PRESSED(encoder_cw)) { | 74 | if (encoder_cw.pressed) { |
| 75 | encoder_cw.pressed = false; | 75 | encoder_cw.pressed = false; |
| 76 | encoder_cw.time = timer_read(); | 76 | encoder_cw.time = timer_read(); |
| 77 | action_exec(encoder_cw); | 77 | action_exec(encoder_cw); |
diff --git a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c index bee139ac93..f459a76970 100644 --- a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c +++ b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c | |||
| @@ -100,7 +100,7 @@ void encoder_action_register(uint8_t index, bool clockwise) { | |||
| 100 | keyevent_t encoder_event = (keyevent_t) { | 100 | keyevent_t encoder_event = (keyevent_t) { |
| 101 | .key = clockwise ? ENC_CW : ENC_CCW, | 101 | .key = clockwise ? ENC_CW : ENC_CCW, |
| 102 | .pressed = true, | 102 | .pressed = true, |
| 103 | .time = timer_read() | 103 | .time = timer_read(), |
| 104 | .type = KEY_EVENT | 104 | .type = KEY_EVENT |
| 105 | }; | 105 | }; |
| 106 | encoder_state = (clockwise ^ 1) | (clockwise << 1); | 106 | encoder_state = (clockwise ^ 1) | (clockwise << 1); |
diff --git a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c index 4dd5f34817..8651a3dee7 100644 --- a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c | |||
| @@ -59,13 +59,13 @@ keyevent_t encoder_cw = { | |||
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | void matrix_scan_user(void) { | 61 | void matrix_scan_user(void) { |
| 62 | if (IS_PRESSED(encoder_ccw)) { | 62 | if (encoder_ccw.pressed) { |
| 63 | encoder_ccw.pressed = false; | 63 | encoder_ccw.pressed = false; |
| 64 | encoder_ccw.time = timer_read(); | 64 | encoder_ccw.time = timer_read(); |
| 65 | action_exec(encoder_ccw); | 65 | action_exec(encoder_ccw); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | if (IS_PRESSED(encoder_cw)) { | 68 | if (encoder_cw.pressed) { |
| 69 | encoder_cw.pressed = false; | 69 | encoder_cw.pressed = false; |
| 70 | encoder_cw.time = timer_read(); | 70 | encoder_cw.time = timer_read(); |
| 71 | action_exec(encoder_cw); | 71 | action_exec(encoder_cw); |
diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c index fa85436e48..dbf282b68f 100644 --- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c | |||
| @@ -65,13 +65,13 @@ keyevent_t encoder_cw = { | |||
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | void matrix_scan_user(void) { | 67 | void matrix_scan_user(void) { |
| 68 | if (IS_PRESSED(encoder_ccw)) { | 68 | if (encoder_ccw.pressed) { |
| 69 | encoder_ccw.pressed = false; | 69 | encoder_ccw.pressed = false; |
| 70 | encoder_ccw.time = timer_read(); | 70 | encoder_ccw.time = timer_read(); |
| 71 | action_exec(encoder_ccw); | 71 | action_exec(encoder_ccw); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | if (IS_PRESSED(encoder_cw)) { | 74 | if (encoder_cw.pressed) { |
| 75 | encoder_cw.pressed = false; | 75 | encoder_cw.pressed = false; |
| 76 | encoder_cw.time = timer_read(); | 76 | encoder_cw.time = timer_read(); |
| 77 | action_exec(encoder_cw); | 77 | action_exec(encoder_cw); |
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c index 825b11c95d..2c33b4869c 100644 --- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c | |||
| @@ -40,13 +40,13 @@ keyevent_t encoder_cw = { | |||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | void matrix_scan_user(void) { | 42 | void matrix_scan_user(void) { |
| 43 | if (IS_PRESSED(encoder_ccw)) { | 43 | if (encoder_ccw.pressed) { |
| 44 | encoder_ccw.pressed = false; | 44 | encoder_ccw.pressed = false; |
| 45 | encoder_ccw.time = timer_read(); | 45 | encoder_ccw.time = timer_read(); |
| 46 | action_exec(encoder_ccw); | 46 | action_exec(encoder_ccw); |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | if (IS_PRESSED(encoder_cw)) { | 49 | if (encoder_cw.pressed) { |
| 50 | encoder_cw.pressed = false; | 50 | encoder_cw.pressed = false; |
| 51 | encoder_cw.time = timer_read(); | 51 | encoder_cw.time = timer_read(); |
| 52 | action_exec(encoder_cw); | 52 | action_exec(encoder_cw); |
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c index 1feb3d4686..05df87fc94 100644 --- a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c +++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c | |||
| @@ -48,13 +48,13 @@ keyevent_t encoder_cw = { | |||
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | void matrix_scan_user(void) { | 50 | void matrix_scan_user(void) { |
| 51 | if (IS_PRESSED(encoder_ccw)) { | 51 | if (encoder_ccw.pressed) { |
| 52 | encoder_ccw.pressed = false; | 52 | encoder_ccw.pressed = false; |
| 53 | encoder_ccw.time = timer_read(); | 53 | encoder_ccw.time = timer_read(); |
| 54 | action_exec(encoder_ccw); | 54 | action_exec(encoder_ccw); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | if (IS_PRESSED(encoder_cw)) { | 57 | if (encoder_cw.pressed) { |
| 58 | encoder_cw.pressed = false; | 58 | encoder_cw.pressed = false; |
| 59 | encoder_cw.time = timer_read(); | 59 | encoder_cw.time = timer_read(); |
| 60 | action_exec(encoder_cw); | 60 | action_exec(encoder_cw); |
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c index ed5075636a..56a083d444 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c | |||
| @@ -48,13 +48,13 @@ keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = fal | |||
| 48 | keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false, .type = KEY_EVENT}; | 48 | keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false, .type = KEY_EVENT}; |
| 49 | 49 | ||
| 50 | void matrix_scan_user(void) { | 50 | void matrix_scan_user(void) { |
| 51 | if (IS_PRESSED(encoder1_ccw)) { | 51 | if (encoder1_ccw.pressed) { |
| 52 | encoder1_ccw.pressed = false; | 52 | encoder1_ccw.pressed = false; |
| 53 | encoder1_ccw.time = timer_read(); | 53 | encoder1_ccw.time = timer_read(); |
| 54 | action_exec(encoder1_ccw); | 54 | action_exec(encoder1_ccw); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | if (IS_PRESSED(encoder1_cw)) { | 57 | if (encoder1_cw.pressed) { |
| 58 | encoder1_cw.pressed = false; | 58 | encoder1_cw.pressed = false; |
| 59 | encoder1_cw.time = timer_read(); | 59 | encoder1_cw.time = timer_read(); |
| 60 | action_exec(encoder1_cw); | 60 | action_exec(encoder1_cw); |
diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c index 5e58bc9e3f..61158be760 100644 --- a/users/talljoe/talljoe.c +++ b/users/talljoe/talljoe.c | |||
| @@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 205 | break; | 205 | break; |
| 206 | #ifdef ZEAL_RGB | 206 | #ifdef ZEAL_RGB |
| 207 | case BL_TOGG: | 207 | case BL_TOGG: |
| 208 | if (IS_PRESSED(record->event)) { | 208 | if (record->event.pressed) { |
| 209 | if (g_config.effect) { | 209 | if (g_config.effect) { |
| 210 | last_effect = g_config.effect; | 210 | last_effect = g_config.effect; |
| 211 | g_config.effect = 0; | 211 | g_config.effect = 0; |
| @@ -215,7 +215,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 215 | } | 215 | } |
| 216 | return false; | 216 | return false; |
| 217 | case EFFECT...EFFECT_END: | 217 | case EFFECT...EFFECT_END: |
| 218 | if (IS_PRESSED(record->event)) { | 218 | if (record->event.pressed) { |
| 219 | uint8_t effect = keycode - EFFECT; | 219 | uint8_t effect = keycode - EFFECT; |
| 220 | if(effect == g_config.effect) | 220 | if(effect == g_config.effect) |
| 221 | effect = 0; // Toggle effect on second press | 221 | effect = 0; // Toggle effect on second press |
