jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unwanted display interactions

Browse Source 
Fix unwanted display interactions when no display is configured
This commit is contained in:
Theo Arends 2021-09-29 16:36:33 +02:00
parent 9b35c54ed1
commit 0b944fddba
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tasmota/xdrv_13_display.ino
View File

@ -1782,38 +1782,39 @@ void DisplayLocalSensor(void)
void DisplayInitDriver(void) void DisplayInitDriver(void)
{ {
XdspCall(FUNC_DISPLAY_INIT_DRIVER); XdspCall(FUNC_DISPLAY_INIT_DRIVER);
ApplyDisplayDimmer();
#ifdef USE_MULTI_DISPLAY
Set_display(0);
#endif // USE_MULTI_DISPLAY
if (renderer) {
renderer->setTextFont(Settings->display_font);
renderer->setTextSize(Settings->display_size);
// force opaque mode
renderer->setDrawMode(0);
for (uint32_t cnt = 0; cnt < (MAX_INDEXCOLORS - PREDEF_INDEXCOLORS); cnt++) {
index_colors[cnt] = 0;
}
}
#ifdef USE_DT_VARS
free_dt_vars();
#endif
#ifdef USE_UFILESYS
Display_Text_From_File(DISP_BATCH_FILE);
#endif
#ifdef USE_GRAPH
for (uint8_t count = 0; count < NUM_GRAPHS; count++) { graph[count] = 0; }
#endif
// AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "Display model %d"), Settings->display_model); // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "Display model %d"), Settings->display_model);
if (Settings->display_model) { if (Settings->display_model) {
ApplyDisplayDimmer();
#ifdef USE_MULTI_DISPLAY
Set_display(0);
#endif // USE_MULTI_DISPLAY
if (renderer) {
renderer->setTextFont(Settings->display_font);
renderer->setTextSize(Settings->display_size);
// force opaque mode
renderer->setDrawMode(0);
for (uint32_t cnt = 0; cnt < (MAX_INDEXCOLORS - PREDEF_INDEXCOLORS); cnt++) {
index_colors[cnt] = 0;
}
}
#ifdef USE_DT_VARS
free_dt_vars();
#endif
#ifdef USE_UFILESYS
Display_Text_From_File(DISP_BATCH_FILE);
#endif
#ifdef USE_GRAPH
for (uint8_t count = 0; count < NUM_GRAPHS; count++) { graph[count] = 0; }
#endif
TasmotaGlobal.devices_present++; TasmotaGlobal.devices_present++;
if (!PinUsed(GPIO_BACKLIGHT)) { if (!PinUsed(GPIO_BACKLIGHT)) {
if (TasmotaGlobal.light_type && (4 == Settings->display_model)) { if (TasmotaGlobal.light_type && (4 == Settings->display_model)) {