0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🚸 TFT backlight PWM / brightness (#22841)

Browse source
This commit is contained in:
Tanguy Pruvot 2021-09-27 21:01:47 +02:00 committed by GitHub
parent 942b76082c
commit f73175d826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View file

@ -338,6 +338,15 @@ void MarlinUI::draw_kill_screen() {
void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
#if HAS_LCD_BRIGHTNESS
void MarlinUI::_set_brightness() {
#if PIN_EXISTS(TFT_BACKLIGHT)
if (PWM_PIN(TFT_BACKLIGHT_PIN))
analogWrite(pin_t(TFT_BACKLIGHT_PIN), brightness);
#endif
}
#endif
#if HAS_LCD_MENU
#include "../menu/menu.h"

1
Marlin/src/lcd/language/language_fr.h
View file

@ -336,6 +336,7 @@ namespace Language_fr {
LSTR MSG_FILAMENT_LOAD = _UxGT("Charger mm");
LSTR MSG_ADVANCE_K = _UxGT("Avance K");
LSTR MSG_ADVANCE_K_E = _UxGT("Avance K *");
LSTR MSG_BRIGHTNESS = _UxGT("Luminosité LCD");
LSTR MSG_CONTRAST = _UxGT("Contraste LCD");
LSTR MSG_STORE_EEPROM = _UxGT("Enregistrer config.");
LSTR MSG_LOAD_EEPROM = _UxGT("Charger config.");

4
Marlin/src/lcd/tft/touch.cpp
View file

@ -294,7 +294,9 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
}
void Touch::wakeUp() {
if (isSleeping()) {
#if PIN_EXISTS(TFT_BACKLIGHT)
#if HAS_LCD_BRIGHTNESS
ui._set_brightness();
#elif PIN_EXISTS(TFT_BACKLIGHT)
WRITE(TFT_BACKLIGHT_PIN, HIGH);
#endif
}

9
Marlin/src/lcd/tft/ui_common.cpp
View file

@ -210,6 +210,15 @@ void MarlinUI::clear_lcd() {
cursor.set(0, 0);
}
#if HAS_LCD_BRIGHTNESS
void MarlinUI::_set_brightness() {
#if PIN_EXISTS(TFT_BACKLIGHT)
if (PWM_PIN(TFT_BACKLIGHT_PIN))
analogWrite(pin_t(TFT_BACKLIGHT_PIN), brightness);
#endif
}
#endif
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
void MarlinUI::touch_calibration_screen() {

10
Marlin/src/lcd/tft_io/tft_io.cpp
View file

@ -49,6 +49,10 @@
#include "ili9341.h"
#include "ili9328.h"
#if HAS_LCD_BRIGHTNESS
#include "../marlinui.h"
#endif
#define DEBUG_OUT ENABLED(DEBUG_GRAPHICAL_TFT)
#include "../../core/debug_out.h"
@ -72,6 +76,9 @@ if (lcd_id != 0xFFFFFFFF) return;
#if PIN_EXISTS(TFT_BACKLIGHT)
WRITE(TFT_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT));
#if HAS_LCD_BRIGHTNESS && DISABLED(DELAYED_BACKLIGHT_INIT)
ui._set_brightness();
#endif
#endif
// io.Init();
@ -141,11 +148,12 @@ if (lcd_id != 0xFFFFFFFF) return;
lcd_id = 0;
}
#else
#error Unsupported TFT driver
#error "Unsupported TFT driver"
#endif
#if PIN_EXISTS(TFT_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT)
WRITE(TFT_BACKLIGHT_PIN, HIGH);
TERN_(HAS_LCD_BRIGHTNESS, ui._set_brightness());
#endif
}

4
Marlin/src/lcd/touch/touch_buttons.cpp
View file

@ -122,7 +122,9 @@ uint8_t TouchButtons::read_buttons() {
}
void TouchButtons::wakeUp() {
if (isSleeping()) {
#if PIN_EXISTS(TFT_BACKLIGHT)
#if HAS_LCD_BRIGHTNESS
ui._set_brightness();
#elif PIN_EXISTS(TFT_BACKLIGHT)
WRITE(TFT_BACKLIGHT_PIN, HIGH);
#endif
}

6
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
View file

@ -135,6 +135,7 @@
#define TFT_RESET_PIN PC4 // pin 33
#define TFT_BACKLIGHT_PIN PD12 // pin 59
#define TFT_BACKLIGHT_PWM 150 // Brightness with alt. TIM4 chan 1 (1-255)
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
#define DOGLCD_SCK -1
@ -143,6 +144,11 @@
#define TFT_BUFFER_SIZE 3200
#endif
#if defined(TFT_BACKLIGHT_PWM) && !defined(MAPLE_STM32F1)
#define HAS_LCD_BRIGHTNESS 1
#define DEFAULT_LCD_BRIGHTNESS TFT_BACKLIGHT_PWM
#endif
#if ENABLED(SDIO_SUPPORT)
#define SD_SS_PIN -1 // else SDSS set to PA4 in M43 (spi_pins.h)
#endif