diff options
| author | jack <0x6A73@pm.me> | 2023-06-19 09:46:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 09:46:27 -0600 |
| commit | c4a67d3f3302f3096bb6b15921c9587643164ba9 (patch) | |
| tree | bf10e469333ba42b708e76cfc085eb450d92359e /keyboards/sawnsprojects | |
| parent | 74fbd5a0313769655914166bc872d41461509bd3 (diff) | |
Remove encoder in-matrix workaround code (#20389)
Diffstat (limited to 'keyboards/sawnsprojects')
8 files changed, 36 insertions, 221 deletions
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index e5700d1b29..e38ed127bb 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h | |||
| @@ -16,11 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | /* Encoders */ | ||
| 20 | |||
| 21 | #define ENCODERS_CW_KEY { { 12, 3 } } | ||
| 22 | #define ENCODERS_CCW_KEY { { 12, 4 } } | ||
| 23 | |||
| 24 | /* RGB */ | 19 | /* RGB */ |
| 25 | #define RGBLIGHT_HUE_STEP 8 | 20 | #define RGBLIGHT_HUE_STEP 8 |
| 26 | #define RGBLIGHT_SAT_STEP 8 | 21 | #define RGBLIGHT_SAT_STEP 8 |
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c deleted file mode 100644 index 96fcc9a614..0000000000 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | /* Copyright 2020 Neil Brian Ramirez | ||
| 2 | * Copyright 2021 drashna jael're (@drashna) | ||
| 3 | * Copyright 2021 uybv | ||
| 4 | * Copyright 2021 SawnsProjects | ||
| 5 | * | ||
| 6 | * This program is free software: you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation, either version 3 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | */ | ||
| 19 | |||
| 20 | #include "encoder_actions.h" | ||
| 21 | |||
| 22 | #ifdef ENCODER_ENABLE | ||
| 23 | static uint8_t encoder_state[NUM_ENCODERS] = {0}; | ||
| 24 | static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY; | ||
| 25 | static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY; | ||
| 26 | |||
| 27 | void encoder_action_unregister(void) { | ||
| 28 | for (int index = 0; index < NUM_ENCODERS; ++index) { | ||
| 29 | if (encoder_state[index]) { | ||
| 30 | keyevent_t encoder_event = (keyevent_t) { | ||
| 31 | .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], | ||
| 32 | .pressed = false, | ||
| 33 | .time = timer_read(), | ||
| 34 | .type = KEY_EVENT | ||
| 35 | }; | ||
| 36 | encoder_state[index] = 0; | ||
| 37 | action_exec(encoder_event); | ||
| 38 | } | ||
| 39 | } | ||
| 40 | } | ||
| 41 | |||
| 42 | void encoder_action_register(uint8_t index, bool clockwise) { | ||
| 43 | keyevent_t encoder_event = (keyevent_t) { | ||
| 44 | .key = clockwise ? encoder_cw[index] : encoder_ccw[index], | ||
| 45 | .pressed = true, | ||
| 46 | .time = timer_read(), | ||
| 47 | .type = KEY_EVENT | ||
| 48 | }; | ||
| 49 | encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); | ||
| 50 | action_exec(encoder_event); | ||
| 51 | } | ||
| 52 | |||
| 53 | #endif | ||
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h deleted file mode 100644 index fb22632632..0000000000 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* Copyright 2020 Neil Brian Ramirez | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 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/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | |||
| 21 | void encoder_action_unregister(void); | ||
| 22 | |||
| 23 | void encoder_action_register(uint8_t index, bool clockwise); \ No newline at end of file | ||
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h deleted file mode 100644 index 5f25d9c5c3..0000000000 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* Copyright 2021 SawnsProjects | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 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/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
| 20 | #include "encoder_actions.h" | ||
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 07506d85bf..9b6739ccf5 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | "processor": "atmega32u4", | 33 | "processor": "atmega32u4", |
| 34 | "bootloader": "atmel-dfu", | 34 | "bootloader": "atmel-dfu", |
| 35 | "layouts": { | 35 | "layouts": { |
| 36 | "LAYOUT_all": { | 36 | "LAYOUT": { |
| 37 | "layout": [ | 37 | "layout": [ |
| 38 | {"matrix": [0, 0], "x": 0, "y": 0}, | 38 | {"matrix": [0, 0], "x": 0, "y": 0}, |
| 39 | {"matrix": [0, 1], "x": 1, "y": 0}, | 39 | {"matrix": [0, 1], "x": 1, "y": 0}, |
| @@ -111,88 +111,6 @@ | |||
| 111 | {"matrix": [4, 14], "x": 14, "y": 4}, | 111 | {"matrix": [4, 14], "x": 14, "y": 4}, |
| 112 | {"matrix": [4, 15], "x": 15, "y": 4} | 112 | {"matrix": [4, 15], "x": 15, "y": 4} |
| 113 | ] | 113 | ] |
| 114 | }, | ||
| 115 | "LAYOUT_via_rotary": { | ||
| 116 | "layout": [ | ||
| 117 | {"matrix": [0, 0], "x": 0, "y": 0.75}, | ||
| 118 | {"matrix": [0, 1], "x": 1, "y": 0.75}, | ||
| 119 | {"matrix": [0, 2], "x": 2, "y": 0.75}, | ||
| 120 | {"matrix": [0, 3], "x": 3, "y": 0.75}, | ||
| 121 | {"matrix": [0, 4], "x": 4, "y": 0.75}, | ||
| 122 | {"matrix": [0, 5], "x": 5, "y": 0.75}, | ||
| 123 | {"matrix": [0, 6], "x": 6, "y": 0.75}, | ||
| 124 | {"matrix": [0, 7], "x": 7, "y": 0.75}, | ||
| 125 | {"matrix": [0, 8], "x": 8, "y": 0.75}, | ||
| 126 | {"matrix": [0, 9], "x": 9, "y": 0.75}, | ||
| 127 | {"matrix": [0, 10], "x": 10, "y": 0.75}, | ||
| 128 | {"matrix": [0, 11], "x": 11, "y": 0.75}, | ||
| 129 | {"matrix": [0, 12], "x": 12, "y": 0.75}, | ||
| 130 | {"matrix": [0, 13], "x": 13, "y": 0.75}, | ||
| 131 | {"matrix": [0, 14], "x": 14, "y": 0.75}, | ||
| 132 | {"matrix": [0, 15], "x": 15, "y": 0.75}, | ||
| 133 | |||
| 134 | {"matrix": [3, 12], "x": 14.75, "y": 0, "w": 0.75, "h": 0.75}, | ||
| 135 | {"matrix": [4, 12], "x": 15.5, "y": 0, "w": 0.75, "h": 0.75}, | ||
| 136 | |||
| 137 | {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5}, | ||
| 138 | {"matrix": [1, 1], "x": 1.5, "y": 1.75}, | ||
| 139 | {"matrix": [1, 2], "x": 2.5, "y": 1.75}, | ||
| 140 | {"matrix": [1, 3], "x": 3.5, "y": 1.75}, | ||
| 141 | {"matrix": [1, 4], "x": 4.5, "y": 1.75}, | ||
| 142 | {"matrix": [1, 5], "x": 5.5, "y": 1.75}, | ||
| 143 | {"matrix": [1, 6], "x": 6.5, "y": 1.75}, | ||
| 144 | {"matrix": [1, 7], "x": 7.5, "y": 1.75}, | ||
| 145 | {"matrix": [1, 8], "x": 8.5, "y": 1.75}, | ||
| 146 | {"matrix": [1, 9], "x": 9.5, "y": 1.75}, | ||
| 147 | {"matrix": [1, 10], "x": 10.5, "y": 1.75}, | ||
| 148 | {"matrix": [1, 11], "x": 11.5, "y": 1.75}, | ||
| 149 | {"matrix": [1, 12], "x": 12.5, "y": 1.75}, | ||
| 150 | {"matrix": [1, 13], "x": 13.5, "y": 1.75, "w": 1.5}, | ||
| 151 | {"matrix": [1, 15], "x": 15, "y": 1.75}, | ||
| 152 | |||
| 153 | {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.75}, | ||
| 154 | {"matrix": [2, 1], "x": 1.75, "y": 2.75}, | ||
| 155 | {"matrix": [2, 2], "x": 2.75, "y": 2.75}, | ||
| 156 | {"matrix": [2, 3], "x": 3.75, "y": 2.75}, | ||
| 157 | {"matrix": [2, 4], "x": 4.75, "y": 2.75}, | ||
| 158 | {"matrix": [2, 5], "x": 5.75, "y": 2.75}, | ||
| 159 | {"matrix": [2, 6], "x": 6.75, "y": 2.75}, | ||
| 160 | {"matrix": [2, 7], "x": 7.75, "y": 2.75}, | ||
| 161 | {"matrix": [2, 8], "x": 8.75, "y": 2.75}, | ||
| 162 | {"matrix": [2, 9], "x": 9.75, "y": 2.75}, | ||
| 163 | {"matrix": [2, 10], "x": 10.75, "y": 2.75}, | ||
| 164 | {"matrix": [2, 11], "x": 11.75, "y": 2.75}, | ||
| 165 | {"matrix": [2, 13], "x": 12.75, "y": 2.75, "w": 2.25}, | ||
| 166 | {"matrix": [2, 15], "x": 15, "y": 2.75}, | ||
| 167 | |||
| 168 | {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25}, | ||
| 169 | {"matrix": [3, 2], "x": 2.25, "y": 3.75}, | ||
| 170 | {"matrix": [3, 3], "x": 3.25, "y": 3.75}, | ||
| 171 | {"matrix": [3, 4], "x": 4.25, "y": 3.75}, | ||
| 172 | {"matrix": [3, 5], "x": 5.25, "y": 3.75}, | ||
| 173 | {"matrix": [3, 6], "x": 6.25, "y": 3.75}, | ||
| 174 | {"matrix": [3, 7], "x": 7.25, "y": 3.75}, | ||
| 175 | {"matrix": [3, 8], "x": 8.25, "y": 3.75}, | ||
| 176 | {"matrix": [3, 9], "x": 9.25, "y": 3.75}, | ||
| 177 | {"matrix": [3, 10], "x": 10.25, "y": 3.75}, | ||
| 178 | {"matrix": [3, 11], "x": 11.25, "y": 3.75}, | ||
| 179 | {"matrix": [3, 13], "x": 12.25, "y": 3.75, "w": 1.75}, | ||
| 180 | {"matrix": [3, 14], "x": 14, "y": 3.75}, | ||
| 181 | {"matrix": [3, 15], "x": 15, "y": 3.75}, | ||
| 182 | |||
| 183 | {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25}, | ||
| 184 | {"matrix": [4, 2], "x": 1.25, "y": 4.75, "w": 1.25}, | ||
| 185 | {"matrix": [4, 3], "x": 2.5, "y": 4.75, "w": 1.25}, | ||
| 186 | {"matrix": [4, 5], "x": 3.75, "y": 4.75, "w": 2.25}, | ||
| 187 | {"matrix": [4, 6], "x": 6, "y": 4.75, "w": 1.25}, | ||
| 188 | {"matrix": [4, 7], "x": 7.25, "y": 4.75, "w": 2.75}, | ||
| 189 | {"matrix": [4, 8], "x": 10, "y": 4.75, "w": 1.25}, | ||
| 190 | {"matrix": [4, 11], "x": 11.25, "y": 4.75, "w": 1.25}, | ||
| 191 | |||
| 192 | {"matrix": [4, 13], "x": 13, "y": 4.75}, | ||
| 193 | {"matrix": [4, 14], "x": 14, "y": 4.75}, | ||
| 194 | {"matrix": [4, 15], "x": 15, "y": 4.75} | ||
| 195 | ] | ||
| 196 | } | 114 | } |
| 197 | } | 115 | } |
| 198 | } | 116 | } |
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c index 13883d07e4..8487c555ba 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | [0] = LAYOUT_all( | 22 | [0] = LAYOUT( |
| 23 | KC_ESC, 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_GRV, KC_PSCR, | 23 | KC_ESC, 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_GRV, KC_PSCR, |
| 24 | 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_DEL, | 24 | 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_DEL, |
| 25 | 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_PGUP, | 25 | 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_PGUP, |
| @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 27 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 27 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 28 | ), | 28 | ), |
| 29 | 29 | ||
| 30 | [1] = LAYOUT_all( | 30 | [1] = LAYOUT( |
| 31 | KC_TRNS, 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, KC_TRNS, | 31 | KC_TRNS, 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, KC_TRNS, |
| 32 | 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, | 32 | 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, |
| 33 | 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, | 33 | 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, |
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c index d55eb74fb0..8af6494c2a 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c | |||
| @@ -19,42 +19,42 @@ | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | [0] = LAYOUT_via_rotary( | 22 | [0] = LAYOUT( |
| 23 | KC_ESC, 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_GRV, KC_PSCR, KC_VOLD ,KC_VOLU, | 23 | KC_ESC, 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_GRV, KC_PSCR, |
| 24 | 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_DEL, | 24 | 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_DEL, |
| 25 | 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_PGUP, | 25 | 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_PGUP, |
| 26 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN, | 26 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN, |
| 27 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 27 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 28 | ), | 28 | ), |
| 29 | 29 | ||
| 30 | [1] = LAYOUT_via_rotary( | 30 | [1] = LAYOUT( |
| 31 | KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, | 31 | KC_TRNS, 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, KC_TRNS, |
| 32 | 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, | 32 | 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, |
| 33 | 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, | 33 | 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, |
| 34 | 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, | 34 | 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, |
| 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 36 | ), | 36 | ), |
| 37 | [2] = LAYOUT_via_rotary( | 37 | [2] = LAYOUT( |
| 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, 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, | 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, |
| 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 | 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 | 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, |
| 42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 43 | ), | 43 | ), |
| 44 | [3] = LAYOUT_via_rotary( | 44 | [3] = LAYOUT( |
| 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, 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, | 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, |
| 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 | 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 | 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, |
| 49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 50 | ), | 50 | ), |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | 53 | #ifdef ENCODER_MAP_ENABLE | |
| 54 | void matrix_scan_user(void) { | 54 | const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { |
| 55 | encoder_action_unregister(); | 55 | [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, |
| 56 | } | 56 | [1] = { ENCODER_CCW_CW(_______, _______) }, |
| 57 | bool encoder_update_user(uint8_t index, bool clockwise) { | 57 | [2] = { ENCODER_CCW_CW(_______, _______) }, |
| 58 | encoder_action_register(index, clockwise); | 58 | [3] = { ENCODER_CCW_CW(_______, _______) }, |
| 59 | return false; // override kb default behavior | 59 | }; |
| 60 | }; \ No newline at end of file | 60 | #endif |
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk index a9739430b9..1189f4ad19 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | VIA_ENABLE = yes | 1 | VIA_ENABLE = yes |
| 2 | LTO_ENABLE = yes | 2 | LTO_ENABLE = yes |
| 3 | 3 | ENCODER_MAP_ENABLE = yes | |
| 4 | # Added encoder Action | ||
| 5 | SRC += encoder_actions.c \ No newline at end of file | ||
