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

fix google chart

This commit is contained in:
gemu2015 2022-12-04 08:16:21 +01:00
parent 25ab45288b
commit 0015b5fc04
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View File

@ -9209,7 +9209,7 @@ uint16_t cipos = 0;
if (*lp == ')' || *lp == 0) break; if (*lp == ')' || *lp == 0) break;
char *lp1 = lp; char *lp1 = lp;
float sysvar; float sysvar;
lp=isvar(lp, &vtype, &ind, &sysvar, 0, 0); lp = isvar(lp, &vtype, &ind, &sysvar, 0, 0);
if (vtype != VAR_NV) { if (vtype != VAR_NV) {
SCRIPT_SKIP_SPACES SCRIPT_SKIP_SPACES
uint8_t index = glob_script_mem.type[ind.index].index; uint8_t index = glob_script_mem.type[ind.index].index;
@ -9958,12 +9958,12 @@ exgc:
lp++; lp++;
strcpy_P(stacked,"true"); strcpy_P(stacked,"true");
} }
if (*lp=='2') { if (*lp == '2') {
lp++; lp++;
nanum = 2; nanum = 2;
y2f = 1; y2f = 1;
} }
if (*lp=='t') { if (*lp == 't') {
lp++; lp++;
tonly = 1; tonly = 1;
} }
@ -9982,6 +9982,7 @@ exgc:
if (!ind.bits.constant && glob_script_mem.type[ind.index].bits.is_filter) { if (!ind.bits.constant && glob_script_mem.type[ind.index].bits.is_filter) {
// is 1. array // is 1. array
lp = slp; lp = slp;
max_entries = 0;
} }
} }
} }
@ -10009,7 +10010,7 @@ exgc:
// we know how many arrays and the number of entries // we know how many arrays and the number of entries
//Serial.printf("arrays %d\n",anum); //Serial.printf("arrays %d\n",anum);
//Serial.printf("entries %d\n",entries); //Serial.printf("entries %d\n",entries);
if (gs_ctype=='T') { if (gs_ctype == 'T') {
if (anum && !(entries & 1)) { if (anum && !(entries & 1)) {
WSContentSend_P(SCRIPT_MSG_GTABLEa); WSContentSend_P(SCRIPT_MSG_GTABLEa);
char label[SCRIPT_MAXSSIZE]; char label[SCRIPT_MAXSSIZE];
@ -10017,7 +10018,7 @@ exgc:
SCRIPT_SKIP_SPACES SCRIPT_SKIP_SPACES
char lab2[SCRIPT_MAXSSIZE]; char lab2[SCRIPT_MAXSSIZE];
lab2[0] = 0; lab2[0] = 0;
if (*lp!=')') { if (*lp != ')') {
lp = GetStringArgument(lp, OPER_EQU, lab2, 0); lp = GetStringArgument(lp, OPER_EQU, lab2, 0);
WSContentSend_P(SCRIPT_MSG_GTABLEe); WSContentSend_P(SCRIPT_MSG_GTABLEe);
} else { } else {
@ -10068,6 +10069,7 @@ exgc:
//goto nextwebline; //goto nextwebline;
} }
} else { } else {
// we need to fetch the labels now // we need to fetch the labels now
WSContentSend_P(SCRIPT_MSG_GTABLEa); WSContentSend_P(SCRIPT_MSG_GTABLEa);
lp = gc_send_labels(lp, anum); lp = gc_send_labels(lp, anum);
@ -10121,7 +10123,6 @@ exgc:
divflg = entries / segments; divflg = entries / segments;
if (!divflg) divflg = 1; if (!divflg) divflg = 1;
} }
uint32_t aind = ipos; uint32_t aind = ipos;
if (aind >= entries) aind = entries - 1; if (aind >= entries) aind = entries - 1;
for (uint32_t cnt = 0; cnt < entries; cnt++) { for (uint32_t cnt = 0; cnt < entries; cnt++) {