Browse Source

Fix backlight support for some boards (#21554)

pull/21572/head
Ryan 9 months ago
committed by GitHub
parent
commit
39679e055d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 61 additions and 29 deletions
  1. +3
    -0
      keyboards/deng/thirty/config.h
  2. +20
    -0
      keyboards/deng/thirty/halconf.h
  3. +0
    -1
      keyboards/deng/thirty/info.json
  4. +21
    -0
      keyboards/deng/thirty/mcuconf.h
  5. +5
    -0
      keyboards/deng/thirty/thirty.c
  6. +0
    -3
      keyboards/handwired/pill60/blackpill_f401/halconf.h
  7. +0
    -3
      keyboards/handwired/pill60/blackpill_f401/mcuconf.h
  8. +0
    -3
      keyboards/handwired/pill60/blackpill_f411/halconf.h
  9. +0
    -3
      keyboards/handwired/pill60/blackpill_f411/mcuconf.h
  10. +0
    -3
      keyboards/handwired/pill60/bluepill/halconf.h
  11. +0
    -4
      keyboards/handwired/pill60/bluepill/mcuconf.h
  12. +0
    -5
      keyboards/handwired/pill60/info.json
  13. +1
    -2
      keyboards/handwired/pill60/rules.mk
  14. +3
    -0
      keyboards/handwired/riblee_f401/config.h
  15. +2
    -1
      keyboards/handwired/riblee_f401/halconf.h
  16. +0
    -1
      keyboards/handwired/riblee_f401/info.json
  17. +6
    -0
      keyboards/handwired/riblee_f401/mcuconf.h

+ 3
- 0
keyboards/deng/thirty/config.h 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


+ 20
- 0
keyboards/deng/thirty/halconf.h 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>

+ 0
- 1
keyboards/deng/thirty/info.json View File

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


+ 21
- 0
keyboards/deng/thirty/mcuconf.h 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

+ 5
- 0
keyboards/deng/thirty/thirty.c 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;
}

+ 0
- 3
keyboards/handwired/pill60/blackpill_f401/halconf.h View File

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

+ 0
- 3
keyboards/handwired/pill60/blackpill_f401/mcuconf.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

+ 0
- 3
keyboards/handwired/pill60/blackpill_f411/halconf.h View File

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

+ 0
- 3
keyboards/handwired/pill60/blackpill_f411/mcuconf.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

+ 0
- 3
keyboards/handwired/pill60/bluepill/halconf.h View File

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

+ 0
- 4
keyboards/handwired/pill60/bluepill/mcuconf.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

+ 0
- 5
keyboards/handwired/pill60/info.json 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": {


+ 1
- 2
keyboards/handwired/pill60/rules.mk 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


+ 3
- 0
keyboards/handwired/riblee_f401/config.h View File

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

+ 2
- 1
keyboards/handwired/riblee_f401/halconf.h 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>

+ 0
- 1
keyboards/handwired/riblee_f401/info.json View File

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


+ 6
- 0
keyboards/handwired/riblee_f401/mcuconf.h View File

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

Loading…
Cancel
Save