Remove encoder in-matrix workaround code (#20389)
This commit is contained in:
		
							parent
							
								
									74fbd5a031
								
							
						
					
					
						commit
						c4a67d3f33
					
				
					 241 changed files with 1106 additions and 5235 deletions
				
			
		| 
						 | 
				
			
			@ -6,64 +6,31 @@
 | 
			
		|||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT_all(
 | 
			
		||||
                                       KC_J,    KC_U,    KC_K,    KC_I,    KC_L,    KC_O, KC_SCLN,
 | 
			
		||||
        KC_VOLD, KC_MUTE, KC_VOLU,
 | 
			
		||||
        KC_MUTE,
 | 
			
		||||
                                       KC_J,    KC_U,    KC_K,    KC_I,    KC_L,    KC_O, KC_SCLN
 | 
			
		||||
    ),
 | 
			
		||||
    [1] = LAYOUT_all(
 | 
			
		||||
                                    _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,
 | 
			
		||||
        _______,
 | 
			
		||||
                                    _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
    [2] = LAYOUT_all(
 | 
			
		||||
                                    _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,
 | 
			
		||||
        _______,
 | 
			
		||||
                                    _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
    [3] = LAYOUT_all(
 | 
			
		||||
                                    _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______,
 | 
			
		||||
        _______,
 | 
			
		||||
                                    _______, _______, _______, _______, _______, _______, _______
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
 | 
			
		||||
static uint8_t encoder_state[NUM_ENCODERS] = {0};
 | 
			
		||||
static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
 | 
			
		||||
static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
 | 
			
		||||
 | 
			
		||||
void encoder_action_unregister(void) {
 | 
			
		||||
    for (int index = 0; index < NUM_ENCODERS; ++index) {
 | 
			
		||||
        if (encoder_state[index]) {
 | 
			
		||||
            keyevent_t encoder_event = (keyevent_t) {
 | 
			
		||||
                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
 | 
			
		||||
                .pressed = false,
 | 
			
		||||
                .time = timer_read(),
 | 
			
		||||
                .type = KEY_EVENT
 | 
			
		||||
            };
 | 
			
		||||
            encoder_state[index] = 0;
 | 
			
		||||
            action_exec(encoder_event);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void encoder_action_register(uint8_t index, bool clockwise) {
 | 
			
		||||
    keyevent_t encoder_event = (keyevent_t) {
 | 
			
		||||
        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
 | 
			
		||||
        .pressed = true,
 | 
			
		||||
        .time = timer_read(),
 | 
			
		||||
        .type = KEY_EVENT
 | 
			
		||||
    };
 | 
			
		||||
    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
 | 
			
		||||
    action_exec(encoder_event);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void matrix_scan_user(void) {
 | 
			
		||||
    encoder_action_unregister();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		||||
    encoder_action_register(index, clockwise);
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 | 
			
		||||
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 | 
			
		||||
    [1] = { ENCODER_CCW_CW(_______, _______) },
 | 
			
		||||
    [2] = { ENCODER_CCW_CW(_______, _______) },
 | 
			
		||||
    [3] = { ENCODER_CCW_CW(_______, _______) },
 | 
			
		||||
};
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1,2 @@
 | 
			
		|||
VIA_ENABLE = yes
 | 
			
		||||
ENCODER_MAP_ENABLE = yes
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue