Fix backlight support for some boards (#21554)

master
Ryan 2023-07-21 09:41:02 +10:00 committed by GitHub
parent 4137685f8e
commit 39679e055d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 61 additions and 29 deletions

View File

@ -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

View File

@ -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>

View File

@ -17,7 +17,6 @@
},
"diode_direction": "COL2ROW",
"backlight": {
"driver": "software",
"pin": "B11",
"levels": 5,
"on_state": 0

View File

@ -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

View File

@ -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;
}

View File

@ -23,7 +23,4 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE
#include_next <halconf.h>

View File

@ -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

View File

@ -23,7 +23,4 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE
#include_next <halconf.h>

View File

@ -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

View File

@ -23,7 +23,4 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE
#include_next <halconf.h>

View File

@ -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

View File

@ -13,11 +13,6 @@
{"pin_a": "B9", "pin_b": "B8", "resolution": 2}
]
},
"backlight": {
"driver": "software",
"pin": "B14",
"levels": 5
},
"debounce": 1,
"layouts": {
"LAYOUT": {

View File

@ -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

View File

@ -16,4 +16,7 @@
#pragma once
#define BACKLIGHT_PWM_DRIVER PWMD5
#define BACKLIGHT_PWM_CHANNEL 1
#define MOUSEKEY_INTERVAL 32

View File

@ -23,5 +23,6 @@
#define SERIAL_USB_BUFFERS_SIZE 256
#include_next <halconf.h>
#define HAL_USE_PWM TRUE
#include_next <halconf.h>

View File

@ -17,7 +17,6 @@
},
"diode_direction": "COL2ROW",
"backlight": {
"driver": "software",
"pin": "A0",
"levels": 5
},

View File

@ -0,0 +1,6 @@
#pragma once
#include_next <mcuconf.h>
#undef STM32_PWM_USE_TIM5
#define STM32_PWM_USE_TIM5 TRUE