Satisfaction75 post merge updates (#23158)

This commit is contained in:
Joel Challis 2024-02-27 12:48:11 +00:00 committed by GitHub
parent bafbca3604
commit b3462157dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 4 additions and 104 deletions

View file

@ -50,7 +50,7 @@ void board_init(void) {
SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
}
void keyboard_post_init_kb(){
void keyboard_post_init_kb(void) {
/*
This is a workaround to some really weird behavior
Without this code, the OLED will turn on, but not when you initially plug the keyboard in.
@ -63,6 +63,8 @@ void keyboard_post_init_kb(){
oled_init(OLED_ROTATION_0);
}
#endif
keyboard_post_init_user();
}
#ifdef VIA_ENABLE

View file

@ -33,7 +33,7 @@ enum encoder_modes {
};
enum custom_encoder_behavior {
ENC_CUSTOM_CW = 0,
ENC_CUSTOM_CW,
ENC_CUSTOM_CCW,
ENC_CUSTOM_PRESS
};
@ -77,12 +77,6 @@ extern int8_t month_config;
extern int8_t day_config;
extern uint8_t previous_encoder_mode;
// Backlighting
#ifdef BACKLIGHT_ENABLE
extern backlight_config_t kb_backlight_config;
extern bool kb_backlight_breathing;
#endif
void pre_encoder_mode_change(void);
void post_encoder_mode_change(void);
void change_encoder_mode(bool negative);