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

epaper area update, fix graph overflow

Browse Source
This commit is contained in:
gemu2015 2021-11-16 08:12:23 +01:00
parent 3885a19b57
commit a35846769d
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tasmota/xdrv_13_display.ino
View File

@ -701,6 +701,12 @@ void DisplayText(void)
if (renderer) renderer->fillCircle(disp_xpos, disp_ypos, temp, fg_color); if (renderer) renderer->fillCircle(disp_xpos, disp_ypos, temp, fg_color);
//else DisplayDrawFilledCircle(disp_xpos, disp_ypos, temp, fg_color); //else DisplayDrawFilledCircle(disp_xpos, disp_ypos, temp, fg_color);
break; break;
case 'm':
// epaper draw mode currently only for 4,7 inch displays
var = atoiv(cp, &temp);
cp += var;
if (renderer) renderer->ep_update_mode(temp);
break;
case 'r': case 'r':
// rectangle // rectangle
var = atoiv(cp, &temp); var = atoiv(cp, &temp);
@ -723,7 +729,27 @@ void DisplayText(void)
break; break;
case 'u': case 'u':
// rounded rectangle // rounded rectangle
{ int16_t rad; { int16_t rad, xp, yp, width, height;
if (*cp == 'p') {
// update epaper display
cp++;
var = atoiv(cp, &xp);
cp += var;
cp++;
var = atoiv(cp, &yp);
cp += var;
cp++;
var = atoiv(cp, &width);
cp += var;
cp++;
var = atoiv(cp, &height);
cp += var;
cp++;
var = atoiv(cp, &temp);
cp += var;
if (renderer) renderer->ep_update_area(xp, yp, width, height, temp);
break;
}
var = atoiv(cp, &temp); var = atoiv(cp, &temp);
cp += var; cp += var;
cp++; cp++;
@ -1100,7 +1126,7 @@ extern FS *ffsp;
if (buttons[num]) { if (buttons[num]) {
if (!sbt) { if (!sbt) {
buttons[num]->vpower.slider = 0; buttons[num]->vpower.slider = 0;
buttons[num]->initButtonUL(renderer, gxp, gyp, gxs, gys, GetColorFromIndex(outline),\ buttons[num]->xinitButtonUL(renderer, gxp, gyp, gxs, gys, GetColorFromIndex(outline),\
GetColorFromIndex(fill), GetColorFromIndex(textcolor), bbuff, textsize); GetColorFromIndex(fill), GetColorFromIndex(textcolor), bbuff, textsize);
if (!bflags) { if (!bflags) {
// power button // power button
@ -1969,6 +1995,7 @@ void ApplyDisplayDimmer(void) {
// still call Berry virtual display in case it is not managed entirely by renderer // still call Berry virtual display in case it is not managed entirely by renderer
Xdsp18(FUNC_DISPLAY_DIM); Xdsp18(FUNC_DISPLAY_DIM);
#endif // USE_BERRY #endif // USE_BERRY
} else { } else {
XdspCall(FUNC_DISPLAY_DIM); XdspCall(FUNC_DISPLAY_DIM);
} }
@ -2631,7 +2658,11 @@ void Restore_graph(uint8_t num, char *path) {
if (count<=4) { if (count<=4) {
if (count==0) gp->xcnt=atoi(vbuff); if (count==0) gp->xcnt=atoi(vbuff);
} else { } else {
gp->values[count-5]=atoi(vbuff); uint8_t yval = atoi(vbuff);
if (yval >= gp->ys) {
yval = gp->ys - 1;
}
gp->values[count-5] = yval;
} }
} }
fp.close(); fp.close();
@ -2735,9 +2766,9 @@ void AddValue(uint8_t num,float fval) {
// decimation option // decimation option
if (gp->decimation<0) { if (gp->decimation<0) {
if (gp->dcnt>=-gp->decimation) { if (gp->dcnt>=-gp->decimation) {
gp->dcnt=0;
// calc average // calc average
val=gp->summ/-gp->decimation; val=gp->summ/gp->dcnt;
gp->dcnt=0;
gp->summ=0; gp->summ=0;
// add to graph // add to graph
AddGraph(num,val); AddGraph(num,val);