mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13252 from gemu2015/multi_display 

fix multi display issues
This commit is contained in:
Theo Arends 2021-10-01 16:12:57 +02:00 committed by GitHub
parent e1c0942811 7e38e75116
commit 63f526972c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/lib_display/UDisplay/uDisplay.cpp
View File

@ -70,6 +70,7 @@ uDisplay::uDisplay(char *lp) : Renderer(800, 600) {
bg_col = 0; bg_col = 0;
splash_font = -1; splash_font = -1;
rotmap_xmin = -1; rotmap_xmin = -1;
bpanel = -1;
allcmd_mode = 0; allcmd_mode = 0;
startline = 0xA1; startline = 0xA1;
uint8_t section = 0; uint8_t section = 0;

23
tasmota/xdrv_13_display.ino
View File

@ -63,6 +63,8 @@ struct MULTI_DISP {
int16_t disp_ypos; int16_t disp_ypos;
uint8_t color_type; uint8_t color_type;
uint8_t auto_draw; uint8_t auto_draw;
uint8_t model;
uint8_t used;
} displays[MAX_MULTI_DISPLAYS]; } displays[MAX_MULTI_DISPLAYS];
uint8_t cur_display; uint8_t cur_display;
Renderer *Init_uDisplay(const char *desc, int8_t cs); Renderer *Init_uDisplay(const char *desc, int8_t cs);
@ -75,6 +77,8 @@ void Set_display(uint8_t index) {
displays[index].auto_draw = auto_draw; displays[index].auto_draw = auto_draw;
displays[index].disp_xpos = disp_xpos; displays[index].disp_xpos = disp_xpos;
displays[index].disp_ypos = disp_ypos; displays[index].disp_ypos = disp_ypos;
displays[index].model = Settings->display_model;
displays[index].used = 1;
cur_display = index; cur_display = index;
} }
@ -87,6 +91,7 @@ void Get_display(uint8_t index) {
disp_xpos = displays[index].disp_xpos; disp_xpos = displays[index].disp_xpos;
disp_ypos = displays[index].disp_ypos; disp_ypos = displays[index].disp_ypos;
if (renderer) renderer->setDrawMode(auto_draw >> 1); if (renderer) renderer->setDrawMode(auto_draw >> 1);
//Settings->display_model = displays[index].model;
cur_display = index; cur_display = index;
} }
#endif // USE_MULTI_DISPLAY #endif // USE_MULTI_DISPLAY
@ -587,16 +592,21 @@ void DisplayText(void)
break; break;
#ifdef USE_MULTI_DISPLAY #ifdef USE_MULTI_DISPLAY
case 'S': case 'S':
{ { int16_t rot = -1, srot, model;
var = atoiv(cp, &temp); var = atoiv(cp, &temp);
cp += var; cp += var;
if (temp < 1 || temp > MAX_MULTI_DISPLAYS) { if (temp < 1 || temp > MAX_MULTI_DISPLAYS) {
temp = 1; temp = 1;
} }
temp--; temp--;
if (*cp == 'r') {
cp++;
var = atoiv(cp, &rot);
cp += var;
}
if (*cp == ':') { if (*cp == ':') {
cp++; cp++;
if (displays[temp].display) { if (displays[temp].used) {
Set_display(cur_display); Set_display(cur_display);
Get_display(temp); Get_display(temp);
} }
@ -613,13 +623,22 @@ void DisplayText(void)
uint32_t size = fp.size(); uint32_t size = fp.size();
char *fdesc = (char *)calloc(size + 4, 1); char *fdesc = (char *)calloc(size + 4, 1);
if (fdesc) { if (fdesc) {
model = Settings->display_model;
fp.read((uint8_t*)fdesc, size); fp.read((uint8_t*)fdesc, size);
fp.close(); fp.close();
Get_display(temp); Get_display(temp);
if (rot >= 0) {
srot = Settings->display_rotate;
Settings->display_rotate = rot;
}
renderer = Init_uDisplay(fdesc, -1); renderer = Init_uDisplay(fdesc, -1);
if (rot >= 0) {
Settings->display_rotate = srot;
}
Set_display(temp); Set_display(temp);
AddLog(LOG_LEVEL_INFO, PSTR("DSP: File descriptor loaded %x"),renderer); AddLog(LOG_LEVEL_INFO, PSTR("DSP: File descriptor loaded %x"),renderer);
free(fdesc); free(fdesc);
Settings->display_model = model;
} }
} }
} }