Remove encoder in-matrix workaround code (#20389)
This commit is contained in:
jack
GitHub
parent
74fbd5a031
commit
c4a67d3f33
241 changed files with 1106 additions and 5235 deletions
|
|
@ -81,39 +81,6 @@
|
|||
{"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
|
||||
{"matrix": [4, 3], "x": 2, "y": 4}
|
||||
]
|
||||
},
|
||||
"LAYOUT_via_6x4": {
|
||||
"layout": [
|
||||
{"matrix": [5, 0], "x": 0, "y": 0},
|
||||
{"matrix": [5, 1], "x": 1, "y": 0},
|
||||
{"matrix": [5, 2], "x": 3, "y": 0},
|
||||
{"matrix": [5, 3], "x": 4, "y": 0},
|
||||
|
||||
{"matrix": [0, 0], "x": 0.5, "y": 1.1},
|
||||
{"matrix": [0, 1], "x": 1.5, "y": 1.1},
|
||||
{"matrix": [0, 2], "x": 2.5, "y": 1.1},
|
||||
{"matrix": [0, 3], "x": 3.5, "y": 1.1},
|
||||
|
||||
{"matrix": [1, 0], "x": 0.5, "y": 2.1},
|
||||
{"matrix": [1, 1], "x": 1.5, "y": 2.1},
|
||||
{"matrix": [1, 2], "x": 2.5, "y": 2.1},
|
||||
{"matrix": [1, 3], "x": 3.5, "y": 2.1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0.5, "y": 3.1},
|
||||
{"matrix": [2, 1], "x": 1.5, "y": 3.1},
|
||||
{"matrix": [2, 2], "x": 2.5, "y": 3.1},
|
||||
{"matrix": [2, 3], "x": 3.5, "y": 3.1},
|
||||
|
||||
{"matrix": [3, 0], "x": 0.5, "y": 4.1},
|
||||
{"matrix": [3, 1], "x": 1.5, "y": 4.1},
|
||||
{"matrix": [3, 2], "x": 2.5, "y": 4.1},
|
||||
{"matrix": [3, 3], "x": 3.5, "y": 4.1},
|
||||
|
||||
{"matrix": [4, 0], "x": 0.5, "y": 5.1},
|
||||
{"matrix": [4, 1], "x": 1.5, "y": 5.1},
|
||||
{"matrix": [4, 2], "x": 2.5, "y": 5.1},
|
||||
{"matrix": [4, 3], "x": 3.5, "y": 5.1}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
//#define GENESIS_LAYER_COLORS
|
||||
|
|
@ -24,36 +24,32 @@
|
|||
|
||||
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,
|
||||
[0] = LAYOUT_ortho_5x4(
|
||||
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,
|
||||
[1] = LAYOUT_ortho_5x4(
|
||||
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,
|
||||
[2] = LAYOUT_ortho_5x4(
|
||||
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,
|
||||
[3] = LAYOUT_ortho_5x4(
|
||||
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),
|
||||
|
||||
};
|
||||
|
|
@ -92,80 +88,11 @@ void keyboard_post_init_user(void) {
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
keyevent_t encoder_left_ccw = {
|
||||
.key = (keypos_t){.row = 5, .col = 0},
|
||||
.pressed = false,
|
||||
.type = KEY_EVENT
|
||||
#ifdef ENCODER_MAP_ENABLE
|
||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
|
||||
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
||||
[1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
|
||||
[2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
|
||||
[3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
|
||||
};
|
||||
|
||||
keyevent_t encoder_left_cw = {
|
||||
.key = (keypos_t){.row = 5, .col = 1},
|
||||
.pressed = false,
|
||||
.type = KEY_EVENT
|
||||
};
|
||||
|
||||
keyevent_t encoder_right_ccw = {
|
||||
.key = (keypos_t){.row = 5, .col = 2},
|
||||
.pressed = false,
|
||||
.type = KEY_EVENT
|
||||
};
|
||||
|
||||
keyevent_t encoder_right_cw = {
|
||||
.key = (keypos_t){.row = 5, .col = 3},
|
||||
.pressed = false,
|
||||
.type = KEY_EVENT
|
||||
};
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
if (encoder_left_ccw.pressed) {
|
||||
encoder_left_ccw.pressed = false;
|
||||
encoder_left_ccw.time = timer_read();
|
||||
action_exec(encoder_left_ccw);
|
||||
}
|
||||
|
||||
if (encoder_left_cw.pressed) {
|
||||
encoder_left_cw.pressed = false;
|
||||
encoder_left_cw.time = timer_read();
|
||||
action_exec(encoder_left_cw);
|
||||
}
|
||||
|
||||
if (encoder_right_ccw.pressed) {
|
||||
encoder_right_ccw.pressed = false;
|
||||
encoder_right_ccw.time = timer_read();
|
||||
action_exec(encoder_right_ccw);
|
||||
}
|
||||
|
||||
if (encoder_right_cw.pressed) {
|
||||
encoder_right_cw.pressed = false;
|
||||
encoder_right_cw.time = timer_read();
|
||||
action_exec(encoder_right_cw);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||
if (index == 0) {
|
||||
if (clockwise) {
|
||||
encoder_left_cw.pressed = true;
|
||||
encoder_left_cw.time = timer_read();
|
||||
action_exec(encoder_left_cw);
|
||||
} else {
|
||||
encoder_left_ccw.pressed = true;
|
||||
encoder_left_ccw.time = timer_read();
|
||||
action_exec(encoder_left_ccw);
|
||||
}
|
||||
} else {
|
||||
if (clockwise) {
|
||||
encoder_right_cw.pressed = true;
|
||||
encoder_right_cw.time = timer_read();
|
||||
action_exec(encoder_right_cw);
|
||||
} else {
|
||||
encoder_right_ccw.pressed = true;
|
||||
encoder_right_ccw.time = timer_read();
|
||||
action_exec(encoder_right_ccw);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
VIA_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
ENCODER_MAP_ENABLE = yes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue