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
				
			
		| 
						 | 
				
			
			@ -25,38 +25,44 @@ enum layer_names {
 | 
			
		|||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [_LAY0] = LAYOUT(
 | 
			
		||||
                            KC_PSLS, KC_PAST, KC_PMNS, 
 | 
			
		||||
    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
 | 
			
		||||
        KC_PSLS, KC_PAST, KC_PMNS,
 | 
			
		||||
        KC_P7, KC_P8,   KC_P9,   KC_PPLS,
 | 
			
		||||
        KC_P4, KC_P5,   KC_P6,   KC_PPLS,
 | 
			
		||||
        KC_P1, KC_P2,   KC_P3,   KC_PENT,
 | 
			
		||||
        KC_P0, KC_P0,   KC_PDOT, KC_PENT
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [_LAY1] = LAYOUT(
 | 
			
		||||
                      _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______  
 | 
			
		||||
        _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [_LAY2] = LAYOUT(
 | 
			
		||||
                      _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______
 | 
			
		||||
        _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    [_LAY3] = LAYOUT(
 | 
			
		||||
                      _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______, 
 | 
			
		||||
    _______, _______, _______, _______, _______, _______
 | 
			
		||||
    ),
 | 
			
		||||
        _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 | 
			
		||||
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
 | 
			
		||||
    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
 | 
			
		||||
    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
 | 
			
		||||
    [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
 | 
			
		||||
};
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef OLED_ENABLE
 | 
			
		||||
/*===========================================    OLED CONFIGURATION    ===========================================*/
 | 
			
		||||
#define OLED_ROTATE      true         // OLED rotation (flip 180* from default orientation)
 | 
			
		||||
| 
						 | 
				
			
			@ -112,18 +118,18 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 | 
			
		|||
// Draw static background image to OLED (keyboard with no bottom row)
 | 
			
		||||
static void render_background(void) {
 | 
			
		||||
    static const char PROGMEM nullbits_n_oled[] = {
 | 
			
		||||
        0x00, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x80, 0x20, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 
 | 
			
		||||
        0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
 | 
			
		||||
        0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00, 
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
 | 
			
		||||
        0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 
 | 
			
		||||
        0x00, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x80, 0x20, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
 | 
			
		||||
        0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
 | 
			
		||||
        0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00,
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
 | 
			
		||||
        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
 | 
			
		||||
        0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 | 
			
		||||
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00,
 | 
			
		||||
    };
 | 
			
		||||
    oled_write_raw_P(nullbits_n_oled, sizeof(nullbits_n_oled));
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,3 +4,4 @@ VIA_ENABLE = yes
 | 
			
		|||
SPACE_CADET_ENABLE = no
 | 
			
		||||
GRAVE_ESC_ENABLE = no
 | 
			
		||||
MAGIC_ENABLE = no
 | 
			
		||||
ENCODER_MAP_ENABLE = yes
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue