Fix backlight support for some boards (#21554)

2023-07-21 09:41:02 +10:00
parent 4137685f8e
commit 39679e055d
17 changed files with 61 additions and 29 deletions
--- 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>
-
--- 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
--- 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>
-
--- 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
--- 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>
-
--- 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
-
--- 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": {
--- 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
--- 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
--- 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>
--- 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
    },
--- a/keyboards/handwired/riblee_f401/mcuconf.h
+++ 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