Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Satisfaction75 post merge updates #23158

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Satisfaction75 post merge updates #23158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -63,6 +63,8 @@ void keyboard_post_init_kb(){
oled_init(OLED_ROTATION_0);
}
#endif

keyboard_post_init_user();
}

#ifdef VIA_ENABLE
Expand Down
8 changes: 1 addition & 7 deletions keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum encoder_modes {
};

enum custom_encoder_behavior {
ENC_CUSTOM_CW = 0,
ENC_CUSTOM_CW,
ENC_CUSTOM_CCW,
ENC_CUSTOM_PRESS
};
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions keyboards/cannonkeys/satisfaction75/halconf.h
View file
Open in desktop
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>

1 change: 0 additions & 1 deletion keyboards/cannonkeys/satisfaction75/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"maintainer": "awkannan",
"backlight": {
"breathing": true,
"breathing_period": 6,
"levels": 24,
"pin": "A6"
},
Expand Down
4 changes: 0 additions & 4 deletions keyboards/cannonkeys/satisfaction75/mcuconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 0 additions & 3 deletions keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/config.h
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/keymap.c
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/readme.md
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions keyboards/cannonkeys/satisfaction75/rev1/keymaps/boy_314/rules.mk
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions keyboards/cannonkeys/satisfaction75/rev1/keymaps/jae/keymap.c
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions keyboards/cannonkeys/satisfaction75_hs/halconf.h
View file
Open in desktop
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>

4 changes: 0 additions & 4 deletions keyboards/cannonkeys/satisfaction75_hs/mcuconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Loading