diff options
| author | Ryan <[email protected]> | 2023-07-21 09:41:02 +1000 | 
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-21 09:41:02 +1000 | 
| commit | 39679e055d803fcd0fda3669088df694e0e31b2c (patch) | |
| tree | e4c06867348da1db27a04b9d7a34dd2ba8db3a30 | |
| parent | 4137685f8eb3ecde7ba0158a78cd9c411ee05606 (diff) | |
| download | qmk_firmware-39679e055d803fcd0fda3669088df694e0e31b2c.tar.gz qmk_firmware-39679e055d803fcd0fda3669088df694e0e31b2c.zip | |
Fix backlight support for some boards (#21554)
| -rw-r--r-- | keyboards/deng/thirty/config.h | 3 | ||||
| -rw-r--r-- | keyboards/deng/thirty/halconf.h | 20 | ||||
| -rw-r--r-- | keyboards/deng/thirty/info.json | 1 | ||||
| -rw-r--r-- | keyboards/deng/thirty/mcuconf.h | 21 | ||||
| -rw-r--r-- | keyboards/deng/thirty/thirty.c | 5 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/blackpill_f401/halconf.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/blackpill_f401/mcuconf.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/blackpill_f411/halconf.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/blackpill_f411/mcuconf.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/bluepill/halconf.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/bluepill/mcuconf.h | 4 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/info.json | 5 | ||||
| -rw-r--r-- | keyboards/handwired/pill60/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/handwired/riblee_f401/config.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/riblee_f401/halconf.h | 3 | ||||
| -rw-r--r-- | keyboards/handwired/riblee_f401/info.json | 1 | ||||
| -rw-r--r-- | keyboards/handwired/riblee_f401/mcuconf.h | 6 | 
17 files changed, 61 insertions, 29 deletions
| diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index d80983202f..20e6673dd2 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -15,6 +15,9 @@   */  #pragma once +#define BACKLIGHT_PWM_DRIVER PWMD2 +#define BACKLIGHT_PWM_CHANNEL 4 +  /* RGB Matrix */  #ifdef RGB_MATRIX_ENABLE  #define RGB_MATRIX_LED_COUNT 30 diff --git a/keyboards/deng/thirty/halconf.h b/keyboards/deng/thirty/halconf.h new file mode 100644 index 0000000000..b107a87e75 --- /dev/null +++ b/keyboards/deng/thirty/halconf.h @@ -0,0 +1,20 @@ +/* Copyright 2020 Nick Brassel (tzarc) + * + *  This program is free software: you can redistribute it and/or modify + *  it under the terms of the GNU General Public License as published by + *  the Free Software Foundation, either version 3 of the License, or + *  (at your option) any later version. + * + *  This program is distributed in the hope that it will be useful, + *  but WITHOUT ANY WARRANTY; without even the implied warranty of + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *  GNU General Public License for more details. + * + *  You should have received a copy of the GNU General Public License + *  along with this program.  If not, see <https://www.gnu.org/licenses/>. + */ +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next <halconf.h> diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 1d9b018e6b..59f3616215 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -17,7 +17,6 @@      },      "diode_direction": "COL2ROW",      "backlight": { -        "driver": "software",          "pin": "B11",          "levels": 5,          "on_state": 0 diff --git a/keyboards/deng/thirty/mcuconf.h b/keyboards/deng/thirty/mcuconf.h new file mode 100644 index 0000000000..8ff617051f --- /dev/null +++ b/keyboards/deng/thirty/mcuconf.h @@ -0,0 +1,21 @@ +/* Copyright 2020 Nick Brassel (tzarc) + * + *  This program is free software: you can redistribute it and/or modify + *  it under the terms of the GNU General Public License as published by + *  the Free Software Foundation, either version 3 of the License, or + *  (at your option) any later version. + * + *  This program is distributed in the hope that it will be useful, + *  but WITHOUT ANY WARRANTY; without even the implied warranty of + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *  GNU General Public License for more details. + * + *  You should have received a copy of the GNU General Public License + *  along with this program.  If not, see <https://www.gnu.org/licenses/>. + */ +#pragma once + +#include_next <mcuconf.h> + +#undef STM32_PWM_USE_TIM2 +#define STM32_PWM_USE_TIM2 TRUE diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c index 2e582d6833..7d49bc1b03 100644 --- a/keyboards/deng/thirty/thirty.c +++ b/keyboards/deng/thirty/thirty.c @@ -46,3 +46,8 @@ led_config_t g_led_config = {  };  #endif + +void board_init(void) { +    // Remap B11 AF to TIM2_CH4 +    AFIO->MAPR |= AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2; +} diff --git a/keyboards/handwired/pill60/blackpill_f401/halconf.h b/keyboards/handwired/pill60/blackpill_f401/halconf.h index 1e126a8656..b2ef07f1c9 100644 --- a/keyboards/handwired/pill60/blackpill_f401/halconf.h +++ b/keyboards/handwired/pill60/blackpill_f401/halconf.h @@ -23,7 +23,4 @@  #define HAL_USE_I2C TRUE -#define HAL_USE_PWM TRUE -  #include_next <halconf.h> - diff --git a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h index ab89514fb1..563b86d26d 100644 --- a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h +++ b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h @@ -19,6 +19,3 @@  #undef STM32_I2C_USE_I2C1  #define STM32_I2C_USE_I2C1 TRUE - -#undef STM32_PWM_USE_TIM5 -#define STM32_PWM_USE_TIM5 TRUE
\ No newline at end of file diff --git a/keyboards/handwired/pill60/blackpill_f411/halconf.h b/keyboards/handwired/pill60/blackpill_f411/halconf.h index 435bf3274e..f563693fac 100644 --- a/keyboards/handwired/pill60/blackpill_f411/halconf.h +++ b/keyboards/handwired/pill60/blackpill_f411/halconf.h @@ -23,7 +23,4 @@  #define HAL_USE_I2C TRUE -#define HAL_USE_PWM TRUE -  #include_next <halconf.h> - diff --git a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h index ab89514fb1..563b86d26d 100644 --- a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h +++ b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h @@ -19,6 +19,3 @@  #undef STM32_I2C_USE_I2C1  #define STM32_I2C_USE_I2C1 TRUE - -#undef STM32_PWM_USE_TIM5 -#define STM32_PWM_USE_TIM5 TRUE
\ No newline at end of file diff --git a/keyboards/handwired/pill60/bluepill/halconf.h b/keyboards/handwired/pill60/bluepill/halconf.h index 459ec86e2d..d423df1512 100644 --- a/keyboards/handwired/pill60/bluepill/halconf.h +++ b/keyboards/handwired/pill60/bluepill/halconf.h @@ -23,7 +23,4 @@  #define HAL_USE_I2C TRUE -#define HAL_USE_PWM TRUE -  #include_next <halconf.h> - diff --git a/keyboards/handwired/pill60/bluepill/mcuconf.h b/keyboards/handwired/pill60/bluepill/mcuconf.h index 22f8b02704..f335353541 100644 --- a/keyboards/handwired/pill60/bluepill/mcuconf.h +++ b/keyboards/handwired/pill60/bluepill/mcuconf.h @@ -26,9 +26,5 @@  #undef STM32_I2C_USE_I2C1  #define STM32_I2C_USE_I2C1 TRUE -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE -  #undef STM32_SPI_USE_SPI2  #define STM32_SPI_USE_SPI2 FALSE - diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index 6cc337f8ee..ac8c9013ba 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -13,11 +13,6 @@              {"pin_a": "B9", "pin_b": "B8", "resolution": 2}          ]      }, -    "backlight": { -        "driver": "software", -        "pin": "B14", -        "levels": 5 -    },      "debounce": 1,      "layouts": {          "LAYOUT": { diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk index f8bae6b6df..f7d65c56c2 100644 --- a/keyboards/handwired/pill60/rules.mk +++ b/keyboards/handwired/pill60/rules.mk @@ -7,10 +7,9 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control  CONSOLE_ENABLE = yes        # Console for debug  COMMAND_ENABLE = yes        # Commands for debug and configuration  NKRO_ENABLE = yes           # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality +BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality  RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow  AUDIO_ENABLE = no           # Audio output -SLEEP_LED_ENABLE = yes  OLED_ENABLE = yes  OLED_DRIVER = SSD1306  ENCODER_ENABLE = yes diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h index c39cbc87f5..3e384e5b5b 100644 --- a/keyboards/handwired/riblee_f401/config.h +++ b/keyboards/handwired/riblee_f401/config.h @@ -16,4 +16,7 @@  #pragma once +#define BACKLIGHT_PWM_DRIVER PWMD5 +#define BACKLIGHT_PWM_CHANNEL 1 +  #define MOUSEKEY_INTERVAL 32 diff --git a/keyboards/handwired/riblee_f401/halconf.h b/keyboards/handwired/riblee_f401/halconf.h index 3c20471df1..b537d56c26 100644 --- a/keyboards/handwired/riblee_f401/halconf.h +++ b/keyboards/handwired/riblee_f401/halconf.h @@ -23,5 +23,6 @@  #define SERIAL_USB_BUFFERS_SIZE 256 -#include_next <halconf.h> +#define HAL_USE_PWM TRUE +#include_next <halconf.h> diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 4ff8ec21f6..933973d5f3 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -17,7 +17,6 @@      },      "diode_direction": "COL2ROW",      "backlight": { -        "driver": "software",          "pin": "A0",          "levels": 5      }, diff --git a/keyboards/handwired/riblee_f401/mcuconf.h b/keyboards/handwired/riblee_f401/mcuconf.h new file mode 100644 index 0000000000..674f5e362f --- /dev/null +++ b/keyboards/handwired/riblee_f401/mcuconf.h @@ -0,0 +1,6 @@ +#pragma once + +#include_next <mcuconf.h> + +#undef STM32_PWM_USE_TIM5 +#define STM32_PWM_USE_TIM5 TRUE | 
