Fix keyboards/keymaps for boolean encoder callback changes (#12985)

This commit is contained in:
Drashna Jaelre 2021-05-27 21:30:47 -07:00 committed by GitHub
parent d17754408d
commit 1acbb0d7b2

View file

@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO, KC_MUTE, KC_P4, KC_P5, KC_P6, KC_NO,
MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, MO(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT,
KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO, KC_BSPC, KC_P0, KC_NO, KC_PDOT, KC_NO,
_______, _______, _______ _______, _______, _______
), ),
[_FN1] = LAYOUT( [_FN1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______,
@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_NO,
_______, RGB_VAD, RGB_SPD, RGB_VAI, _______, _______, RGB_VAD, RGB_SPD, RGB_VAI, _______,
_______, RGB_SAD, KC_NO, RGB_SAI, KC_NO, _______, RGB_SAD, KC_NO, RGB_SAI, KC_NO,
_______, _______, _______ _______, _______, _______
), ),
[_FN2] = LAYOUT( [_FN2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______,
@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, KC_NO, _______, _______, _______, _______, KC_NO,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_NO, _______, _______, _______, _______, KC_NO,
_______, _______, _______ _______, _______, _______
), ),
[_FN3] = LAYOUT( [_FN3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, KC_NO, _______, _______, _______, _______, KC_NO,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_NO, _______, _______, _______, _______, KC_NO,
_______, _______, _______ _______, _______, _______
) )
}; };
#ifdef ENCODER_ENABLE #ifdef ENCODER_ENABLE
void encoder_update_user(uint8_t index, bool clockwise) { bool encoder_update_user(uint8_t index, bool clockwise) {
switch (index) { switch (index) {
case 0: case 0:
if (clockwise) { if (clockwise) {
@ -82,7 +82,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
} }
break; break;
} }
return true;
} }
#endif #endif
@ -107,7 +107,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
} }
void oled_task_user(void) { void oled_task_user(void) {
render_logo(); render_logo();
oled_set_cursor(0,6); oled_set_cursor(0,6);
oled_write_ln_P(PSTR("Layer"), false); oled_write_ln_P(PSTR("Layer"), false);
@ -135,4 +135,4 @@ void encoder_update_user(uint8_t index, bool clockwise) {
oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
} }
#endif #endif