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

Merge branch 'development' of github.com:arendst/Tasmota into pr_tm1638

This commit is contained in:
Ajith Vasudevan 2021-02-28 16:34:32 +05:30
parent cd7a435696 9b070ea725
commit 5132794170
2 changed files with 185 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
tasmota/xdrv_10_scripter.ino
View File

@ -37,11 +37,6 @@ no math hierarchy (costs ram and execution time, better group with brackets, an
keywords if then else endif, or, and are better readable for beginners (others may use {}) keywords if then else endif, or, and are better readable for beginners (others may use {})
// to doo // to doo
remove all filesystem inititialization and gui
adapt 3 options
1. ufilesystem
2. eeprom hardware and emulation
3. compression
\*********************************************************************************************/ \*********************************************************************************************/
@ -5992,22 +5987,22 @@ bool ScriptMqttData(void)
value = sres; value = sres;
} }
#endif // SUPPORT_MQTT_EVENT_MORE #endif // SUPPORT_MQTT_EVENT_MORE
if (json_valid) { }
value.trim(); if (json_valid) {
char sbuffer[128]; value.trim();
char sbuffer[128];
if (!strncmp(lkey.c_str(), "Epoch", 5)) { if (!strncmp(lkey.c_str(), "Epoch", 5)) {
uint32_t ep = atoi(value.c_str()) - (uint32_t)EPOCH_OFFSET; uint32_t ep = atoi(value.c_str()) - (uint32_t)EPOCH_OFFSET;
snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=%d\n"), event_item.Event.c_str(), ep); snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=%d\n"), event_item.Event.c_str(), ep);
} else { } else {
snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=\"%s\"\n"), event_item.Event.c_str(), value.c_str()); snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=\"%s\"\n"), event_item.Event.c_str(), value.c_str());
}
#ifdef DEBUG_MQTT_EVENT
AddLog(LOG_LEVEL_INFO, PSTR("Script: setting script var %s"), sbuffer);
#endif
//toLog(sbuffer);
execute_script(sbuffer);
} }
#ifdef DEBUG_MQTT_EVENT
AddLog(LOG_LEVEL_INFO, PSTR("Script: setting script var %s"), sbuffer);
#endif
//toLog(sbuffer);
execute_script(sbuffer);
} }
} }
} }
@ -7397,6 +7392,7 @@ int32_t http_req(char *host, char *request) {
#include <WiFiClientSecure.h> #include <WiFiClientSecure.h>
#endif //ESP8266 #endif //ESP8266
// get tesla powerwall info page json string // get tesla powerwall info page json string
uint32_t call2https(const char *host, const char *path) { uint32_t call2https(const char *host, const char *path) {
if (TasmotaGlobal.global_state.wifi_down) return 1; if (TasmotaGlobal.global_state.wifi_down) return 1;
@ -7409,9 +7405,29 @@ uint32_t call2https(const char *host, const char *path) {
httpsClient = new BearSSL::WiFiClientSecure_light(1024, 1024); httpsClient = new BearSSL::WiFiClientSecure_light(1024, 1024);
#endif #endif
httpsClient->setTimeout(1500); httpsClient->setTimeout(2000);
httpsClient->setInsecure(); httpsClient->setInsecure();
#if 0
File file = ufsp->open("/tesla.cer", FS_FILE_READ);
uint16_t fsize = 0;
char *cert = 0;
if (file) {
fsize = file.size();
if (fsize) {
cert = (char*)malloc(fsize +2);
if (cert) {
file.read((uint8_t*)cert, fsize);
file.close();
httpsClient->setCACert(cert);
}
AddLog(LOG_LEVEL_INFO,PSTR(">>> cert %d"),fsize);
}
} else {
httpsClient->setCACert(root_ca);
}
#endif
uint32_t retry = 0; uint32_t retry = 0;
while ((!httpsClient->connect(host, 443)) && (retry < 5)) { while ((!httpsClient->connect(host, 443)) && (retry < 5)) {
delay(100); delay(100);
@ -7420,11 +7436,43 @@ uint32_t call2https(const char *host, const char *path) {
if (retry == 5) { if (retry == 5) {
return 2; return 2;
} }
String request = String("GET ") + path + AddLog(LOG_LEVEL_INFO,PSTR("connected"));
String request;
#if 0
File file = ufsp->open("/login.txt", FS_FILE_READ);
uint16_t fsize = 0;
char *cert = 0;
if (file) {
fsize = file.size();
if (fsize) {
cert = (char*)calloc(fsize +2, 1);
if (cert) {
file.read((uint8_t*)cert, fsize);
file.close();
//httpsClient->setCACert(cert);
}
AddLog(LOG_LEVEL_INFO,PSTR(">>> cert %d"),fsize);
}
}
request = String("POST ") + "/api/login/Basic" + " HTTP/1.1\r\n" + "Host: " + host + "\r\n" + cert + "\r\n" + "Content-Type: application/json" + "\r\n";
httpsClient->print(request);
AddLog_P(LOG_LEVEL_INFO,PSTR(">>> post request %s"),(char*)request.c_str());
String line = httpsClient->readStringUntil('\n');
AddLog(LOG_LEVEL_INFO,PSTR(">>> post response 1a %s"),(char*)line.c_str());
line = httpsClient->readStringUntil('\n');
AddLog(LOG_LEVEL_INFO,PSTR(">>> post response 1b %s"),(char*)line.c_str());
#endif
request = String("GET ") + path +
" HTTP/1.1\r\n" + " HTTP/1.1\r\n" +
"Host: " + host + "Host: " + host +
"\r\n" + "Connection: close\r\n\r\n"; "\r\n" + "Connection: close\r\n\r\n";
httpsClient->print(request); httpsClient->print(request);
// AddLog_P(LOG_LEVEL_INFO,PSTR(">>> get request %s"),(char*)request.c_str());
while (httpsClient->connected()) { while (httpsClient->connected()) {
String line = httpsClient->readStringUntil('\n'); String line = httpsClient->readStringUntil('\n');
@ -7441,6 +7489,7 @@ uint32_t call2https(const char *host, const char *path) {
} }
httpsClient->stop(); httpsClient->stop();
delete httpsClient; delete httpsClient;
// AddLog(LOG_LEVEL_INFO,PSTR(">>> response 2 %s"),(char*)result.c_str());
Run_Scripter(">jp", 3, (char*)result.c_str()); Run_Scripter(">jp", 3, (char*)result.c_str());
return 0; return 0;
} }

213
tasmota/xsns_53_sml.ino
View File

@ -1296,6 +1296,7 @@ void sml_shift_in(uint32_t meters,uint32_t shard) {
} }
} else if (meter_desc_p[meters].type=='v') { } else if (meter_desc_p[meters].type=='v') {
if (iob==EBUS_SYNC) { if (iob==EBUS_SYNC) {
sb_counter = 0;
SML_Decode(meters); SML_Decode(meters);
smltbuf[meters][0] = iob; smltbuf[meters][0] = iob;
meter_spos[meters] = 1; meter_spos[meters] = 1;
@ -1322,7 +1323,7 @@ void sml_shift_in(uint32_t meters,uint32_t shard) {
//AddLog(LOG_LEVEL_INFO, PSTR("ebus crc error")); //AddLog(LOG_LEVEL_INFO, PSTR("ebus crc error"));
} }
} }
meter_spos[meters]=0; meter_spos[meters] = 0;
return; return;
} }
smltbuf[meters][meter_spos[meters]] = iob; smltbuf[meters][meter_spos[meters]] = iob;
@ -1383,18 +1384,19 @@ void SML_Decode(uint8_t index) {
const char *mp=(const char*)meter_p; const char *mp=(const char*)meter_p;
int8_t mindex; int8_t mindex;
uint8_t *cp; uint8_t *cp;
uint8_t dindex=0,vindex=0; uint8_t dindex = 0, vindex = 0;
delay(0); delay(0);
while (mp != NULL) { while (mp != NULL) {
// check list of defines // check list of defines
if (*mp==0) break; if (*mp == 0) break;
// new section // new section
mindex=((*mp)&7)-1; mindex = ((*mp) & 7) - 1;
if (mindex<0 || mindex>=meters_used) mindex=0; if (mindex < 0 || mindex >= meters_used) mindex = 0;
mp+=2; mp += 2;
if (*mp=='=' && *(mp+1)=='h') { if (*mp == '=' && *(mp+1) == 'h') {
mp = strchr(mp, '|'); mp = strchr(mp, '|');
if (mp) mp++; if (mp) mp++;
continue; continue;
@ -1403,98 +1405,103 @@ void SML_Decode(uint8_t index) {
if (index!=mindex) goto nextsect; if (index!=mindex) goto nextsect;
// start of serial source buffer // start of serial source buffer
cp=&smltbuf[mindex][0]; cp = &smltbuf[mindex][0];
// compare // compare
if (*mp=='=') { if (*mp == '=') {
// calculated entry, check syntax // calculated entry, check syntax
mp++; mp++;
// do math m 1+2+3 // do math m 1+2+3
if (*mp=='m' && !sb_counter) { if (*mp == 'm' && !sb_counter) {
// only every 256 th byte // only every 256 th byte
// else it would be calculated every single serial byte // else it would be calculated every single serial byte
mp++; mp++;
while (*mp==' ') mp++; while (*mp == ' ') mp++;
// 1. index // 1. index
double dvar; double dvar;
uint8_t opr; uint8_t opr;
uint32_t ind; uint8_t mind;
ind=atoi(mp); int32_t ind;
while (*mp>='0' && *mp<='9') mp++; mind = strtol((char*)mp, (char**)&mp, 10);
if (ind<1 || ind>SML_MAX_VARS) ind=1; if (mind < 1 || mind > SML_MAX_VARS) mind = 1;
dvar=meter_vars[ind-1]; dvar = meter_vars[mind - 1];
for (uint8_t p = 0; p < 5; p++) { while (*mp==' ') mp++;
if (*mp=='@') { for (uint8_t p = 0; p < 8; p++) {
if (*mp == '@') {
// store result // store result
meter_vars[vindex]=dvar; meter_vars[vindex] = dvar;
mp++; mp++;
SML_Immediate_MQTT((const char*)mp,vindex,mindex);
break; break;
} }
opr=*mp; opr = *mp;
mp++; mp++;
uint8_t iflg=0; uint8_t iflg = 0;
if (*mp=='#') { if (*mp == '#') {
iflg=1; iflg = 1;
mp++; mp++;
} }
ind=atoi(mp); ind = strtol((char*)mp, (char**)&mp, 10);
while (*mp>='0' && *mp<='9') mp++; mind = ind;
if (ind<1 || ind>SML_MAX_VARS) ind=1; if (mind < 1 || mind > SML_MAX_VARS) mind = 1;
switch (opr) { switch (opr) {
case '+': case '+':
if (iflg) dvar+=ind; if (iflg) dvar += ind;
else dvar+=meter_vars[ind-1]; else dvar += meter_vars[mind - 1];
break; break;
case '-': case '-':
if (iflg) dvar-=ind; if (iflg) dvar -= ind;
else dvar-=meter_vars[ind-1]; else dvar -= meter_vars[mind - 1];
break; break;
case '*': case '*':
if (iflg) dvar*=ind; if (iflg) dvar *= ind;
else dvar*=meter_vars[ind-1]; else dvar *= meter_vars[mind - 1];
break; break;
case '/': case '/':
if (iflg) dvar/=ind; if (iflg) dvar /= ind;
else dvar/=meter_vars[ind-1]; else dvar /= meter_vars[mind - 1];
break; break;
} }
while (*mp==' ') mp++; while (*mp==' ') mp++;
if (*mp=='@') { if (*mp == '@') {
// store result // store result
meter_vars[vindex]=dvar; meter_vars[vindex] = dvar;
mp++; mp++;
SML_Immediate_MQTT((const char*)mp,vindex,mindex);
break; break;
} }
} }
double fac = CharToDouble((char*)mp);
meter_vars[vindex] /= fac;
SML_Immediate_MQTT((const char*)mp, vindex, mindex);
// get sfac
} else if (*mp=='d') { } else if (*mp=='d') {
// calc deltas d ind 10 (eg every 10 secs) // calc deltas d ind 10 (eg every 10 secs)
if (dindex<MAX_DVARS) { if (dindex < MAX_DVARS) {
// only n indexes // only n indexes
mp++; mp++;
while (*mp==' ') mp++; while (*mp == ' ') mp++;
uint8_t ind=atoi(mp); uint8_t ind = atoi(mp);
while (*mp>='0' && *mp<='9') mp++; while (*mp >= '0' && *mp <= '9') mp++;
if (ind<1 || ind>SML_MAX_VARS) ind=1; if (ind < 1 || ind > SML_MAX_VARS) ind = 1;
uint32_t delay=atoi(mp)*1000; uint32_t delay = atoi(mp) * 1000;
uint32_t dtime=millis()-dtimes[dindex]; uint32_t dtime = millis() - dtimes[dindex];
if (dtime>delay) { if (dtime > delay) {
// calc difference // calc difference
dtimes[dindex]=millis(); dtimes[dindex] = millis();
double vdiff = meter_vars[ind-1]-dvalues[dindex]; double vdiff = meter_vars[ind - 1] - dvalues[dindex];
dvalues[dindex]=meter_vars[ind-1]; dvalues[dindex] = meter_vars[ind - 1];
meter_vars[vindex]=(double)360000.0*vdiff/((double)dtime/10000.0); meter_vars[vindex] = (double)360000.0 * vdiff / ((double)dtime / 10000.0);
mp=strchr(mp,'@'); mp=strchr(mp,'@');
if (mp) { if (mp) {
mp++; mp++;
SML_Immediate_MQTT((const char*)mp,vindex,mindex); double fac = CharToDouble((char*)mp);
meter_vars[vindex] /= fac;
SML_Immediate_MQTT((const char*)mp, vindex, mindex);
} }
} }
dindex++; dindex++;
} }
} else if (*mp=='h') { } else if (*mp == 'h') {
// skip html tag line // skip html tag line
mp = strchr(mp, '|'); mp = strchr(mp, '|');
if (mp) mp++; if (mp) mp++;
@ -1502,27 +1509,27 @@ void SML_Decode(uint8_t index) {
} }
} else { } else {
// compare value // compare value
uint8_t found=1; uint8_t found = 1;
double ebus_dval=99; double ebus_dval = 99;
float mbus_dval=99; float mbus_dval = 99;
while (*mp!='@') { while (*mp != '@') {
if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') { if (meter_desc_p[mindex].type == 'o' || meter_desc_p[mindex].type == 'c') {
if (*mp++!=*cp++) { if (*mp++ != *cp++) {
found=0; found=0;
} }
} else { } else {
if (meter_desc_p[mindex].type=='s') { if (meter_desc_p[mindex].type == 's') {
// sml // sml
uint8_t val = hexnibble(*mp++) << 4; uint8_t val = hexnibble(*mp++) << 4;
val |= hexnibble(*mp++); val |= hexnibble(*mp++);
if (val!=*cp++) { if (val != *cp++) {
found=0; found=0;
} }
} else { } else {
// ebus mbus pzem vbus or raw // ebus mbus pzem vbus or raw
// XXHHHHSSUU // XXHHHHSSUU
if (*mp=='x') { if (*mp == 'x') {
if (*(mp+1)=='x') { if (*(mp + 1) == 'x') {
//ignore one byte //ignore one byte
mp += 2; mp += 2;
cp++; cp++;
@ -1824,11 +1831,11 @@ void SML_Decode(uint8_t index) {
meter_vars[vindex]=dval; meter_vars[vindex]=dval;
#endif #endif
//AddLog_P(LOG_LEVEL_INFO, PSTR(">> %s"),mp); //AddLog_P(LOG_LEVEL_INFO, PSTR(">> %s"),mp);
// get scaling factor // get scaling factor
double fac=CharToDouble((char*)mp); double fac = CharToDouble((char*)mp);
meter_vars[vindex]/=fac; meter_vars[vindex] /= fac;
SML_Immediate_MQTT((const char*)mp,vindex,mindex); SML_Immediate_MQTT((const char*)mp, vindex, mindex);
} }
} }
dvalid[vindex] = 1; dvalid[vindex] = 1;
@ -1953,8 +1960,14 @@ void SML_Show(boolean json) {
} else { } else {
mid=0; mid=0;
} }
} else if (*cp=='b') {
// bit value
#ifdef SML_BIT_TEXT
sprintf_P(tpowstr, PSTR("\"%s\""), (uint8_t)meter_vars[index]?D_ON:D_OFF);
mid = 2;
#endif
} else { } else {
mid=0; mid = 0;
} }
// skip scaling // skip scaling
cp=strchr(cp,','); cp=strchr(cp,',');
@ -2300,9 +2313,9 @@ dddef_exit:
txbuff[cnt] = *lp++; txbuff[cnt] = *lp++;
} }
if (txlen) { if (txlen) {
script_meter_desc[index].txmem = (char*)calloc(txlen+2, 1); script_meter_desc[index].txmem = (char*)calloc(txlen + 2, 1);
if (script_meter_desc[index].txmem) { if (script_meter_desc[index].txmem) {
strcpy(script_meter_desc[index].txmem,txbuff); strcpy(script_meter_desc[index].txmem, txbuff);
} }
script_meter_desc[index].index = 0; script_meter_desc[index].index = 0;
script_meter_desc[index].max_index = tx_entries; script_meter_desc[index].max_index = tx_entries;
@ -2721,55 +2734,59 @@ uint8_t sml_hexnibble(char chr) {
// send sequence every N Seconds // send sequence every N Seconds
void SML_Send_Seq(uint32_t meter,char *seq) { void SML_Send_Seq(uint32_t meter,char *seq) {
uint8_t sbuff[32]; uint8_t sbuff[48];
uint8_t *ucp=sbuff,slen=0; uint8_t *ucp = sbuff, slen = 0;
char *cp=seq; char *cp = seq;
uint8_t rflg = 0; uint8_t rflg = 0;
if (*cp=='r') { if (*cp == 'r') {
rflg = 1; rflg = 1;
cp++; cp++;
} }
while (*cp) { while (*cp) {
if (!*cp || !*(cp+1)) break; if (!*cp || !*(cp+1)) break;
if (*cp==',') break; if (*cp == ',') break;
uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1)); uint8_t iob = (sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp + 1));
cp+=2; cp += 2;
*ucp++=iob; *ucp++ = iob;
slen++; slen++;
if (slen>=sizeof(sbuff)) break; if (slen >= sizeof(sbuff)-6) break; // leave space for checksum
} }
if (script_meter_desc[meter].type=='m' || script_meter_desc[meter].type=='M') { if (script_meter_desc[meter].type == 'm' || script_meter_desc[meter].type == 'M') {
if (!rflg) { if (!rflg) {
*ucp++=0; *ucp++ = 0;
*ucp++=2; *ucp++ = 2;
slen+=2; slen += 2;
} }
// append crc // append crc
uint16_t crc = MBUS_calculateCRC(sbuff,slen); uint16_t crc = MBUS_calculateCRC(sbuff, slen);
*ucp++=lowByte(crc); *ucp++ = lowByte(crc);
*ucp++=highByte(crc); *ucp++ = highByte(crc);
slen+=2; slen += 2;
} }
if (script_meter_desc[meter].type=='o') { if (script_meter_desc[meter].type == 'o') {
for (uint32_t cnt=0;cnt<slen;cnt++) { for (uint32_t cnt = 0; cnt < slen; cnt++) {
sbuff[cnt]|=(CalcEvenParity(sbuff[cnt])<<7); sbuff[cnt] |= (CalcEvenParity(sbuff[cnt]) << 7);
} }
} }
if (script_meter_desc[meter].type=='p') { if (script_meter_desc[meter].type == 'p') {
*ucp++=0xc0; *ucp++ = 0xc0;
*ucp++=0xa8; *ucp++ = 0xa8;
*ucp++=1; *ucp++ = 1;
*ucp++=1; *ucp++ = 1;
*ucp++=0; *ucp++ = 0;
*ucp++=SML_PzemCrc(sbuff,6); *ucp++ = SML_PzemCrc(sbuff, 6);
slen+=6; slen += 6;
} }
meter_ss[meter]->write(sbuff,slen); meter_ss[meter]->write(sbuff, slen);
if (dump2log) { if (dump2log) {
#ifdef SML_DUMP_OUT_ALL
Hexdump(sbuff, slen);
#else
uint8_t type = meter_desc_p[(dump2log&7) - 1].type; uint8_t type = meter_desc_p[(dump2log&7) - 1].type;
if (type == 'm' || type == 'M') { if (type == 'm' || type == 'M') {
Hexdump(sbuff, slen); Hexdump(sbuff, slen);
} }
#endif
} }
} }