From fee5251bd455b72b7a372d2019ee8b98249a6ece Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:30:31 +0200 Subject: [PATCH] Fix universal display power regression (#21726) --- CHANGELOG.md | 1 + RELEASENOTES.md | 1 + tasmota/tasmota_xdrv_driver/xdrv_13_display.ino | 9 ++++----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0717d2f40..34683759d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Berry `bytes.resize()` for large sizes (#21716) +- On universal display remove default backlight power if a single PWM channel is used for backlight. Regression from 14.0.0.1 (#21726) ### Removed diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 737de22c9..b09b5e27b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -167,6 +167,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm - Matter refactor reading of multiple attributes to reduce memory pressure [#21675](https://github.com/arendst/Tasmota/issues/21675) ### Fixed +- On universal display remove default backlight power if a single PWM channel is used for backlight. Regression from 14.0.0.1 [#21726](https://github.com/arendst/Tasmota/issues/21726) - Shutter MQTT on inverted shutter [#21663](https://github.com/arendst/Tasmota/issues/21663) - Scripter TCP server [#21660](https://github.com/arendst/Tasmota/issues/21660) - ESP32 allow use of UART0 with enabled USB_CDC_CONSOLE [#21496](https://github.com/arendst/Tasmota/issues/21496) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino index b0350afef..8c0151232 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino @@ -1892,12 +1892,11 @@ void DisplayInitDriver(void) { UpdateDevicesPresent(1); if (!PinUsed(GPIO_BACKLIGHT)) { -// 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 + if ((LT_PWM1 == TasmotaGlobal.light_type) && // Single PWM light channel + ((4 == Settings->display_model) || // ILI9341 legacy + (17 == Settings->display_model)) // Universal ) { - UpdateDevicesPresent(-1); // Assume PWM channel is used for backlight + UpdateDevicesPresent(-1); // Assume PWM channel is used for backlight } } disp_device = TasmotaGlobal.devices_present;