summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys/lib
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2024-02-27 12:48:11 +0000
committerGitHub <noreply@github.com>2024-02-27 12:48:11 +0000
commitb3462157dc2fb5d029f12bf9ecc8ae1d0340e8dd (patch)
treeb5afb6605b3b5fd93abc7a660ad4c6a8ceb6384b /keyboards/cannonkeys/lib
parentbafbca3604e288a7dde773c74f9bf3de730e0e97 (diff)
Satisfaction75 post merge updates (#23158)
Diffstat (limited to 'keyboards/cannonkeys/lib')
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c4
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h8
2 files changed, 4 insertions, 8 deletions
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
index ce9422c5a8..e148ae468a 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
@@ -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
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
index 30caeadc38..9c46642195 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
@@ -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);