mirror of https://github.com/arendst/Tasmota.git
max variables > 256 (#20358)
This commit is contained in:
gemu
GitHub
parent
a38f869052
commit
9194ac6c94
|
|
@ -70,9 +70,13 @@ const uint8_t SCRIPT_VERS[2] = {5, 2};
|
|||
#endif // USE_SML_M
|
||||
|
||||
#ifndef MAXFILT
|
||||
#define MAXFILT 5
|
||||
#define MAXFILT 10
|
||||
#endif
|
||||
|
||||
#ifndef SCRIPT_SVARSIZE
|
||||
#define SCRIPT_SVARSIZE 20
|
||||
#endif
|
||||
|
||||
#ifndef SCRIPT_MAXSSIZE
|
||||
#define SCRIPT_MAXSSIZE 48
|
||||
#endif
|
||||
|
|
@ -156,6 +160,7 @@ char *Get_esc_char(char *cp, char *esc_chr);
|
|||
#define MAX_EXT_ARRAYS 5
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef STASK_PRIO
|
||||
#define STASK_PRIO 1
|
||||
#endif
|
||||
|
|
@ -335,10 +340,18 @@ typedef union {
|
|||
};
|
||||
} SCRIPT_TYPE;
|
||||
|
||||
|
||||
#if 1
|
||||
struct T_INDEX {
|
||||
uint16_t index;
|
||||
SCRIPT_TYPE bits;
|
||||
};
|
||||
#else
|
||||
struct T_INDEX {
|
||||
uint8_t index;
|
||||
SCRIPT_TYPE bits;
|
||||
};
|
||||
#endif
|
||||
|
||||
struct M_FILT {
|
||||
#ifdef LARGE_ARRAYS
|
||||
|
|
@ -479,7 +492,7 @@ struct SCRIPT_MEM {
|
|||
uint16_t script_size;
|
||||
uint8_t *script_pram;
|
||||
uint16_t script_pram_size;
|
||||
uint8_t numvars;
|
||||
uint16_t numvars;
|
||||
uint8_t arres;
|
||||
void *script_mem;
|
||||
uint16_t script_mem_size;
|
||||
|
|
@ -627,7 +640,7 @@ void ScriptEverySecond(void) {
|
|||
struct T_INDEX *vtp = glob_script_mem.type;
|
||||
TS_FLOAT delta = (millis() - glob_script_mem.script_lastmillis) / 1000.0;
|
||||
glob_script_mem.script_lastmillis = millis();
|
||||
for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
|
||||
for (uint16_t count = 0; count < glob_script_mem.numvars; count++) {
|
||||
if (vtp[count].bits.is_timer) {
|
||||
// decrements timers
|
||||
TS_FLOAT *fp = &glob_script_mem.fvars[vtp[count].index];
|
||||
|
|
@ -1144,7 +1157,7 @@ char *script;
|
|||
// now preset permanent vars
|
||||
TS_FLOAT *fp = (TS_FLOAT*)glob_script_mem.script_pram;
|
||||
struct T_INDEX *vtp = glob_script_mem.type;
|
||||
for (uint8_t count = 0; count<glob_script_mem.numvars; count++) {
|
||||
for (uint16_t count = 0; count < glob_script_mem.numvars; count++) {
|
||||
if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
|
||||
uint8_t index = vtp[count].index;
|
||||
if (vtp[count].bits.is_filter) {
|
||||
|
|
@ -1165,7 +1178,7 @@ char *script;
|
|||
}
|
||||
}
|
||||
sp = (char*)fp;
|
||||
for (uint8_t count = 0; count<glob_script_mem.numvars; count++) {
|
||||
for (uint16_t count = 0; count < glob_script_mem.numvars; count++) {
|
||||
if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
|
||||
uint8_t index = vtp[count].index;
|
||||
char *dp = glob_script_mem.glob_snp + (index * glob_script_mem.max_ssize);
|
||||
|
|
@ -1829,6 +1842,10 @@ int32_t opt_fext(File *fp, char *ts_from, char *ts_to, uint32_t flg) {
|
|||
return fres;
|
||||
}
|
||||
|
||||
#ifndef FEXT_MAX_LINE_LENGTH
|
||||
#define FEXT_MAX_LINE_LENGTH 256
|
||||
#endif
|
||||
|
||||
// assume 1. entry is timestamp, others are tab delimited values until LF
|
||||
// file reference, from timestamp, to timestampm, column offset, array pointers, array lenght, number of arrays
|
||||
int32_t extract_from_file(File *fp, char *ts_from, char *ts_to, int8_t coffs, TS_FLOAT **a_ptr, uint16_t *a_len, uint8_t numa, int16_t accum) {
|
||||
|
|
@ -1843,7 +1860,7 @@ int32_t extract_from_file(File *fp, char *ts_from, char *ts_to, int8_t coffs, T
|
|||
// seek to last entry
|
||||
if (cpos > 1) cpos -= 2;
|
||||
// now seek back to last line
|
||||
uint8_t lbuff[256];
|
||||
uint8_t lbuff[FEXT_MAX_LINE_LENGTH];
|
||||
uint8_t iob;
|
||||
uint16_t index = sizeof(lbuff) -1;
|
||||
fp->seek(cpos - sizeof(lbuff), SeekSet);
|
||||
|
|
@ -1928,6 +1945,9 @@ int32_t extract_from_file(File *fp, char *ts_from, char *ts_to, int8_t coffs, T
|
|||
uint8_t buff[2], iob;
|
||||
fp->read(buff, 1);
|
||||
iob = buff[0];
|
||||
TS_FLOAT fval;
|
||||
uint16_t curpos;
|
||||
|
||||
if (iob == '\t' || iob == ',' || iob == '\n' || iob == '\r') {
|
||||
rstr[sindex] = 0;
|
||||
sindex = 0;
|
||||
|
|
@ -1964,10 +1984,11 @@ int32_t extract_from_file(File *fp, char *ts_from, char *ts_to, int8_t coffs, T
|
|||
} else {
|
||||
// data columns
|
||||
if (range) {
|
||||
uint8_t curpos = colpos - coffs;
|
||||
curpos = colpos - coffs;
|
||||
if (colpos >= coffs && curpos < numa) {
|
||||
if (a_len[curpos]) {
|
||||
TS_FLOAT fval = CharToFloat(rstr);
|
||||
fval = CharToFloat(rstr);
|
||||
nextcol:
|
||||
uint8_t flg = 1;
|
||||
if ((mflg[curpos] & 1) == 1) {
|
||||
// absolute values, build diffs
|
||||
|
|
@ -2008,6 +2029,13 @@ int32_t extract_from_file(File *fp, char *ts_from, char *ts_to, int8_t coffs, T
|
|||
}
|
||||
colpos++;
|
||||
if (iob == '\n' || iob == '\r') {
|
||||
// end of line
|
||||
if (colpos <= numa) {
|
||||
// empty column
|
||||
curpos = colpos - coffs;
|
||||
fval = 0;
|
||||
goto nextcol;
|
||||
} else {
|
||||
lastpos = fp->position();
|
||||
colpos = 0;
|
||||
lines ++;
|
||||
|
|
@ -2018,6 +2046,7 @@ int32_t extract_from_file(File *fp, char *ts_from, char *ts_to, int8_t coffs, T
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
rstr[sindex] = iob;
|
||||
sindex++;
|
||||
}
|
||||
|
|
@ -2315,7 +2344,7 @@ uint32_t match_vars(char *dvnam, TS_FLOAT **fp, char **sp, uint32_t *ind) {
|
|||
uint8_t slen = strlen(cp);
|
||||
if (slen == olen && *cp == dvnam[0]) {
|
||||
if (!strncmp(cp, dvnam, olen)) {
|
||||
uint8_t index = vtp[count].index;
|
||||
uint16_t index = vtp[count].index;
|
||||
if (vtp[count].bits.is_string == 0) {
|
||||
if (vtp[count].bits.is_filter) {
|
||||
// error
|
||||
|
|
@ -2852,7 +2881,17 @@ chknext:
|
|||
SCRIPT_SKIP_SPACES
|
||||
uint16_t alens;
|
||||
TS_FLOAT *fps;
|
||||
char *slp = lp;
|
||||
lp = get_array_by_name(lp, &fps, &alens, 0);
|
||||
if (lp == 0 || fps == 0) {
|
||||
lp = slp;
|
||||
lp = GetNumericArgument(lp, OPER_EQU, &fvar, 0);
|
||||
for (uint32_t cnt = 0; cnt < alend; cnt++ ) {
|
||||
fpd[cnt] = fvar;
|
||||
}
|
||||
fvar = alend;
|
||||
goto nfuncexit;
|
||||
}
|
||||
SCRIPT_SKIP_SPACES
|
||||
if (alens < alend) {
|
||||
alend = alens;
|
||||
|
|
@ -2983,7 +3022,7 @@ chknext:
|
|||
uint8_t vtype;
|
||||
lp = isvar(lp + 4, &vtype, &ind, 0, 0, gv);
|
||||
if (!ind.bits.constant) {
|
||||
uint8_t index = glob_script_mem.type[ind.index].index;
|
||||
uint16_t index = glob_script_mem.type[ind.index].index;
|
||||
fvar = glob_script_mem.fvars[index] != glob_script_mem.s_fvars[index];
|
||||
glob_script_mem.s_fvars[index] = glob_script_mem.fvars[index];
|
||||
} else {
|
||||
|
|
@ -3145,7 +3184,7 @@ extern void W8960_SetGain(uint8_t sel, uint16_t value);
|
|||
uint8_t vtype;
|
||||
lp = isvar(lp + 5, &vtype, &ind, 0, 0, gv);
|
||||
if (!ind.bits.constant) {
|
||||
uint8_t index = glob_script_mem.type[ind.index].index;
|
||||
uint16_t index = glob_script_mem.type[ind.index].index;
|
||||
fvar = glob_script_mem.fvars[index] - glob_script_mem.s_fvars[index];
|
||||
glob_script_mem.s_fvars[index] = glob_script_mem.fvars[index];
|
||||
} else {
|
||||
|
|
@ -3341,7 +3380,7 @@ extern void W8960_SetGain(uint8_t sel, uint16_t value);
|
|||
if (!strncmp_XP(lp, XPSTR("fr("), 3)) {
|
||||
struct T_INDEX ind;
|
||||
uint8_t vtype;
|
||||
uint8_t sindex = 0;
|
||||
uint16_t sindex = 0;
|
||||
lp = isvar(lp + 3, &vtype, &ind, 0, 0, gv);
|
||||
if (vtype != VAR_NV) {
|
||||
// found variable as result
|
||||
|
|
@ -4934,7 +4973,7 @@ extern char *SML_GetSVal(uint32_t index);
|
|||
fvar = -1;
|
||||
} else {
|
||||
// string result
|
||||
uint8_t sindex = glob_script_mem.type[ind.index].index;
|
||||
uint16_t sindex = glob_script_mem.type[ind.index].index;
|
||||
char *cp = glob_script_mem.glob_snp + (sindex * glob_script_mem.max_ssize);
|
||||
fvar = SML_Set_WStr(fvar1, cp);
|
||||
}
|
||||
|
|
@ -4957,6 +4996,14 @@ extern char *SML_GetSVal(uint32_t index);
|
|||
SML_Decode(fvar - 1);
|
||||
goto nfuncexit;
|
||||
}
|
||||
if (!strncmp_XP(lp, XPSTR("smls("), 5)) {
|
||||
TS_FLOAT meter;
|
||||
lp = GetNumericArgument(lp + 5, OPER_EQU, &meter, gv);
|
||||
if (meter < 1) meter = 1;
|
||||
lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
|
||||
SML_Shift_Num(meter - 1, fvar);
|
||||
goto nfuncexit;
|
||||
}
|
||||
if (!strncmp_XP(lp, XPSTR("smlv["), 5)) {
|
||||
lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
|
||||
fvar = sml_getv(fvar);
|
||||
|
|
@ -6424,7 +6471,7 @@ extern "C" {
|
|||
|
||||
int32_t UpdVar(char *vname, float *fvar, uint32_t mode) {
|
||||
uint8_t type;
|
||||
uint8_t index;
|
||||
uint16_t index;
|
||||
if (*vname == '@') {
|
||||
vname++;
|
||||
type = *vname;
|
||||
|
|
@ -8304,9 +8351,9 @@ void Scripter_save_pvars(void) {
|
|||
TS_FLOAT *fp = (TS_FLOAT*)glob_script_mem.script_pram;
|
||||
mlen+=sizeof(TS_FLOAT);
|
||||
struct T_INDEX *vtp = glob_script_mem.type;
|
||||
for (uint8_t count = 0; count<glob_script_mem.numvars; count++) {
|
||||
for (uint16_t count = 0; count < glob_script_mem.numvars; count++) {
|
||||
if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
|
||||
uint8_t index = vtp[count].index;
|
||||
uint16_t index = vtp[count].index;
|
||||
if (vtp[count].bits.is_filter) {
|
||||
// save array
|
||||
uint16_t len = 0;
|
||||
|
|
@ -8330,7 +8377,7 @@ void Scripter_save_pvars(void) {
|
|||
}
|
||||
}
|
||||
char *cp = (char*)fp;
|
||||
for (uint8_t count = 0; count<glob_script_mem.numvars; count++) {
|
||||
for (uint16_t count = 0; count < glob_script_mem.numvars; count++) {
|
||||
if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
|
||||
uint8_t index = vtp[count].index;
|
||||
char *sp = glob_script_mem.glob_snp + (index * glob_script_mem.max_ssize);
|
||||
|
|
@ -9344,7 +9391,7 @@ bool Script_SubCmd(void) {
|
|||
char cmdbuff[128];
|
||||
char *cp = cmdbuff;
|
||||
*cp++ = '#';
|
||||
strcpy(cp, command);
|
||||
strlcpy(cp, command, sizeof(cmdbuff) - 1);
|
||||
uint8_t tlen = strlen(command);
|
||||
cp += tlen;
|
||||
if (XdrvMailbox.data_len > 0) {
|
||||
|
|
@ -10537,7 +10584,7 @@ uint16_t cipos = 0;
|
|||
lp = isvar(lp, &vtype, &ind, &sysvar, 0, 0);
|
||||
if (vtype != VAR_NV) {
|
||||
SCRIPT_SKIP_SPACES
|
||||
uint8_t index = glob_script_mem.type[ind.index].index;
|
||||
uint16_t index = glob_script_mem.type[ind.index].index;
|
||||
if ((vtype & STYPE) == 0) {
|
||||
// numeric result
|
||||
//Serial.printf("numeric %d - %d \n",ind.index,index);
|
||||
|
|
@ -10631,6 +10678,8 @@ uint32_t cnt;
|
|||
#define WSO_FORCEPLAIN 4
|
||||
#define WSO_FORCEMAIN 8
|
||||
#define WSO_FORCEGUI 16
|
||||
#define WSO_FORCETAB 32
|
||||
#define WSO_FORCESUBFILE 64
|
||||
#define WSO_STOP_DIV 0x80
|
||||
|
||||
void WCS_DIV(uint8_t flag) {
|
||||
|
|
@ -10731,7 +10780,7 @@ void ScriptWebShow(char mc, uint8_t page) {
|
|||
//goto nextwebline;
|
||||
} else if (!strncmp(lp, "%/", 2)) {
|
||||
// send file
|
||||
if (mc) {
|
||||
if (mc || (specopt & WSO_FORCESUBFILE)) {
|
||||
web_send_file(mc, lp + 1);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -10775,6 +10824,9 @@ int32_t web_send_file(char mc, char *fname) {
|
|||
// skip comment lines
|
||||
continue;
|
||||
}
|
||||
if (*lp == ';') {
|
||||
// continue;
|
||||
}
|
||||
web_send_line(mc, lbuff);
|
||||
}
|
||||
file.close();
|
||||
|
|
@ -10814,6 +10866,15 @@ const char *gc_str;
|
|||
|
||||
bool dogui = ((!mc && (*lin != '$')) || (mc == 'w' && (*lin != '$'))) && (!(specopt & WSO_FORCEMAIN));
|
||||
|
||||
if (!strncmp(lin, "%=#", 3)) {
|
||||
// subroutine
|
||||
uint8_t sflg = specopt;
|
||||
specopt = WSO_FORCEPLAIN;
|
||||
lin = scripter_sub(lin + 1, 0);
|
||||
specopt = sflg;
|
||||
return lin;
|
||||
}
|
||||
|
||||
if ((dogui && !(specopt & WSO_FORCEGUI)) || (!dogui && (specopt & WSO_FORCEGUI))) {
|
||||
//if ( ((!mc && (*lin != '$')) || (mc == 'w' && (*lin != '$'))) && (!(specopt & WSO_FORCEMAIN)) || (specopt & WSO_FORCEGUI)) {
|
||||
// normal web section
|
||||
|
|
@ -11207,6 +11268,9 @@ const char *gc_str;
|
|||
WCS_DIV(specopt | WSO_STOP_DIV);
|
||||
lp++;
|
||||
|
||||
} else {
|
||||
if (specopt & WSO_FORCETAB) {
|
||||
WSContentSend_P(PSTR("{s}%s{e}"), lin);
|
||||
} else {
|
||||
if (mc == 'w' || (specopt & WSO_FORCEPLAIN)) {
|
||||
WSContentSend_P(PSTR("%s"), lin);
|
||||
|
|
@ -11218,6 +11282,7 @@ const char *gc_str;
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// end standard web interface
|
||||
} else {
|
||||
// main section interface
|
||||
|
|
@ -12140,15 +12205,24 @@ int32_t call2pwl(const char *url) {
|
|||
#endif // TESLA_POWERWALL
|
||||
|
||||
|
||||
//#ifdef ESP8266
|
||||
#include "WiFiClientSecureLightBearSSL.h"
|
||||
//#else
|
||||
//#include <WiFiClientSecure.h>
|
||||
//#endif //ESP8266
|
||||
|
||||
// get https info page json string
|
||||
uint32_t call2https(const char *host, const char *path) {
|
||||
//if (TasmotaGlobal.global_state.wifi_down) return 1;
|
||||
uint32_t status = 0;
|
||||
|
||||
//#ifdef ESP32
|
||||
// WiFiClientSecure *httpsClient;
|
||||
// httpsClient = new WiFiClientSecure;
|
||||
//#else
|
||||
BearSSL::WiFiClientSecure_light *httpsClient;
|
||||
httpsClient = new BearSSL::WiFiClientSecure_light(1024, 1024);
|
||||
//#endif
|
||||
|
||||
httpsClient->setTimeout(2000);
|
||||
httpsClient->setInsecure();
|
||||
|
|
|
|||
Loading…
Reference in New Issue