Merge remote-tracking branch 'origin/toril940mariorion_v25' into toril940mariorion_v25

This commit is contained in:
toril940 2023-10-26 18:58:26 +01:00
commit 26ac52c10d
2 changed files with 0 additions and 11 deletions

View File

@ -39,9 +39,6 @@
#define WS2812_DMA_CHANNEL 1 #define WS2812_DMA_CHANNEL 1
// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP // #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
#define CAPS_LOCK_LED A6
#define SCROLL_LOCK_LED A15
#define INDICATOR_0 C9 #define INDICATOR_0 C9
#define INDICATOR_1 C8 #define INDICATOR_1 C8
#define INDICATOR_2 C7 #define INDICATOR_2 C7

View File

@ -29,14 +29,6 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
} }
__attribute__((weak)) bool led_update_kb(led_t led_state) {
if(led_update_user(led_state)) {
writePin(CAPS_LOCK_LED, !led_state.caps_lock);
writePin(SCROLL_LOCK_LED, !led_state.num_lock);
}
return true;
}
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) { switch (get_highest_layer(state)) {
case 1: case 1: