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

fix web comments+ leading zeroes

This commit is contained in:
gemu2015 2022-03-03 08:23:56 +01:00
parent fb829a58a3
commit 571057167e
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tasmota/xdrv_10_scripter.ino
View File

@ -480,12 +480,16 @@ void flt2char(float num, char *nbuff) {
// convert float to char with leading zeros // convert float to char with leading zeros
void f2char(float num, uint32_t dprec, uint32_t lzeros, char *nbuff) { void f2char(float num, uint32_t dprec, uint32_t lzeros, char *nbuff) {
dtostrfd(num, dprec, nbuff); dtostrfd(num, dprec, nbuff);
if (lzeros>1) { if (lzeros > 1) {
// check leading zeros // check leading zeros
uint32_t nd = num; uint32_t nd = strlen(nbuff);
nd/=10; for (uint8_t cnt = 0; cnt < nd; cnt++) {
nd+=1; if (nbuff[cnt] == '.') {
if (lzeros>nd) { nd = cnt;
break;
}
}
if (lzeros > nd) {
// insert zeros // insert zeros
char cpbuf[24]; char cpbuf[24];
char *cp = cpbuf; char *cp = cpbuf;
@ -4191,6 +4195,8 @@ extern char *SML_GetSVal(uint32_t index);
uint32_t cycles; uint32_t cycles;
uint64_t accu = 0; uint64_t accu = 0;
char sbuffer[32]; char sbuffer[32];
/*
// PSTR performance test // PSTR performance test
// this is best case since everything will be in cache // this is best case since everything will be in cache
// PSTR at least 3 times slower here, will be much slower if cache missed // PSTR at least 3 times slower here, will be much slower if cache missed
@ -4204,6 +4210,7 @@ extern char *SML_GetSVal(uint32_t index);
accu += ESP.getCycleCount()-cycles; accu += ESP.getCycleCount()-cycles;
} }
fvar = accu / 1000; fvar = accu / 1000;
*/
goto nfuncexit; goto nfuncexit;
} }
#endif #endif
@ -8296,7 +8303,6 @@ void ScriptWebShow(char mc, uint8_t page) {
break; break;
} }
if (*lp != ';') { if (*lp != ';') {
// send this line to web // send this line to web
SCRIPT_SKIP_SPACES SCRIPT_SKIP_SPACES
if (!strncmp(lp, "%for ", 5)) { if (!strncmp(lp, "%for ", 5)) {
@ -8341,14 +8347,14 @@ void ScriptWebShow(char mc, uint8_t page) {
} else { } else {
web_send_line(mc, lp); web_send_line(mc, lp);
} }
}
nextwebline: nextwebline:
if (*lp == SCRIPT_EOL) { if (*lp == SCRIPT_EOL) {
lp++; lp++;
} else { } else {
lp = strchr(lp, SCRIPT_EOL); lp = strchr(lp, SCRIPT_EOL);
if (!lp) break; if (!lp) break;
lp++; lp++;
}
} }
} }
} }
@ -9232,6 +9238,7 @@ int32_t url2file(uint8_t fref, char *url) {
uint32_t read = stream->readBytes(buff, size); uint32_t read = stream->readBytes(buff, size);
glob_script_mem.files[fref].write(buff, read); glob_script_mem.files[fref].write(buff, read);
len -= read; len -= read;
AddLog(LOG_LEVEL_INFO,PSTR("HTTP read %d"), len);
} }
delayMicroseconds(1); delayMicroseconds(1);
} }
@ -9467,7 +9474,7 @@ uint32_t script_i2c(uint8_t sel, uint32_t val, uint32_t val1) {
for (uint8_t cnt = 0; cnt < val1; cnt++) { for (uint8_t cnt = 0; cnt < val1; cnt++) {
rval <<= 8; rval <<= 8;
rval |= script_i2c_wire->read(); rval |= (uint8_t)script_i2c_wire->read();
} }
break; break;