Satisfaction75 post merge updates (qmk#23158)

nuess0r · Sep 8, 2024 · b5ce230 · b5ce230
1 parent 9170cbc
commit b5ce230
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 104 deletions.
diff --git 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
@@ -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);

diff --git a/keyboards/cannonkeys/satisfaction75/halconf.h b/keyboards/cannonkeys/satisfaction75/halconf.h
@@ -14,7 +14,5 @@
 
 #define HAL_USE_RTC TRUE
 
-#define HAL_USE_SPI TRUE
-
 #include_next <halconf.h>
 
diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json
@@ -4,7 +4,6 @@
     "maintainer": "awkannan",
     "backlight": {
         "breathing": true,
-        "breathing_period": 6,
         "levels": 24,
         "pin": "A6"
     },

diff --git a/keyboards/cannonkeys/satisfaction75/mcuconf.h b/keyboards/cannonkeys/satisfaction75/mcuconf.h
@@ -21,7 +21,3 @@
 
 #undef STM32_PWM_USE_TIM3
 #define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/config.h b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/config.h
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/keymap.c b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/keymap.c
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/readme.md b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/readme.md
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/rules.mk
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/jae/keymap.c b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/jae/keymap.c
diff --git a/keyboards/cannonkeys/satisfaction75_hs/halconf.h b/keyboards/cannonkeys/satisfaction75_hs/halconf.h
@@ -12,7 +12,5 @@
 
 #define HAL_USE_RTC TRUE
 
-#define HAL_USE_SPI TRUE
-
 #include_next <halconf.h>
 
diff --git a/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h b/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h
@@ -18,7 +18,3 @@
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,5 @@

		#define HAL_USE_RTC TRUE

		#define HAL_USE_SPI TRUE

		#include_next <halconf.h>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,5 @@

		#define HAL_USE_RTC TRUE

		#define HAL_USE_SPI TRUE

		#include_next <halconf.h>