On universal display remove default backlight power if a PWM channel …

…is used for backlight
arendst · May 17, 2024 · 0d22583 · 0d22583
1 parent 2ddbc7c
commit 0d22583
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 - ESP32 compiler option from `target-align` to `no-target-align` (#21407)
+- On universal display remove default backlight power if a PWM channel is used for backlight
 
 ### Fixed
 - Domoticz re-subscribe on MQTT reconnect. Regression from v13.4.0.3 (#21281)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -126,6 +126,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ### Breaking Changed
 
 ### Changed
+- On universal display remove default backlight power if a PWM channel is used for backlight
 - ESP32 compiler option from `target-align` to `no-target-align` [#21407](https://github.com/arendst/Tasmota/issues/21407)
 
 ### Fixed

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
@@ -1908,7 +1908,11 @@ void DisplayInitDriver(void) {
 
  UpdateDevicesPresent(1);
  if (!PinUsed(GPIO_BACKLIGHT)) {
- if (TasmotaGlobal.light_type && (4 == Settings->display_model)) {
+// if (TasmotaGlobal.light_type && (4 == Settings->display_model)) {
+ if (TasmotaGlobal.light_type && // Assume PWM channel
+ ((4 == Settings->display_model) || // ILI9341 legacy
+ (17 == Settings->display_model)) // Universal
+ ) {
  UpdateDevicesPresent(-1); // Assume PWM channel is used for backlight
  }
  }