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

add sml write once cmd

This commit is contained in:
gemu2015 2022-02-11 08:01:07 +01:00
parent 8b7f18dcf4
commit ecd8e2ed29
2 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tasmota/xdrv_10_scripter.ino
View File

@ -3801,15 +3801,15 @@ extern char *SML_GetSVal(uint32_t index);
float fvar2; float fvar2;
lp = GetNumericArgument(lp, OPER_EQU, &fvar2, gv); lp = GetNumericArgument(lp, OPER_EQU, &fvar2, gv);
SCRIPT_SKIP_SPACES SCRIPT_SKIP_SPACES
if (fvar2==0) { if (fvar2 == 0) {
float fvar3; float fvar3;
lp = GetNumericArgument(lp, OPER_EQU, &fvar3, gv); lp = GetNumericArgument(lp, OPER_EQU, &fvar3, gv);
fvar = SML_SetBaud(fvar1, fvar3); fvar = SML_SetBaud(fvar1, fvar3);
} else if (fvar2==1) { } else if (fvar2 == 1) {
char str[SCRIPT_MAXSSIZE]; char str[SCRIPT_MAXSSIZE];
lp = GetStringArgument(lp, OPER_EQU, str, 0); lp = GetStringArgument(lp, OPER_EQU, str, 0);
fvar = SML_Write(fvar1, str); fvar = SML_Write(fvar1, str);
} else if (fvar2==2) { } else if (fvar2 == 2) {
char str[SCRIPT_MAXSSIZE]; char str[SCRIPT_MAXSSIZE];
str[0] = 0; str[0] = 0;
fvar = SML_Read(fvar1, str, SCRIPT_MAXSSIZE); fvar = SML_Read(fvar1, str, SCRIPT_MAXSSIZE);
@ -3817,8 +3817,27 @@ extern char *SML_GetSVal(uint32_t index);
lp++; lp++;
len = 0; len = 0;
goto strexit; goto strexit;
} else if (fvar2 == 3) {
uint8_t vtype;
struct T_INDEX ind;
lp = isvar(lp, &vtype, &ind, 0, 0, 0);
if (vtype != VAR_NV) {
// found variable as result
if (vtype == NUM_RES || (vtype & STYPE) == 0) {
// numeric result
fvar = -1;
} else {
// string result
uint8_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);
}
} else {
fvar = -99;
}
} else { } else {
#ifdef ED300L #ifdef ED300L
fvar = SML_Status(fvar1); fvar = SML_Status(fvar1);
#else #else

54
tasmota/xsns_53_sml.ino
View File

@ -89,6 +89,7 @@ struct METER_DESC {
char *txmem; char *txmem;
uint8_t index; uint8_t index;
uint8_t max_index; uint8_t max_index;
char *script_str;
uint8_t sopt; uint8_t sopt;
}; };
@ -3038,6 +3039,15 @@ char *SML_GetSVal(uint32_t index) {
if (index < 1 || index > MAX_METERS) { index = 1;} if (index < 1 || index > MAX_METERS) { index = 1;}
return &meter_id[index - 1][0]; return &meter_id[index - 1][0];
} }
int32_t SML_Set_WStr(uint32_t meter, char *hstr) {
if (meter < 1 || meter > meters_used) return -1;
meter--;
if (!meter_ss[meter]) return -2;
script_meter_desc[meter].script_str = hstr;
return 0;
}
#endif // USE_SML_SCRIPT_CMD #endif // USE_SML_SCRIPT_CMD
@ -3145,29 +3155,35 @@ char *SML_Get_Sequence(char *cp,uint32_t index) {
void SML_Check_Send(void) { void SML_Check_Send(void) {
sml_100ms_cnt++; sml_100ms_cnt++;
char *cp; char *cp;
for (uint32_t cnt=sml_desc_cnt; cnt<meters_used; cnt++) { for (uint32_t cnt = sml_desc_cnt; cnt < meters_used; cnt++) {
if (script_meter_desc[cnt].trxpin>=0 && script_meter_desc[cnt].txmem) { if (script_meter_desc[cnt].trxpin >= 0 && script_meter_desc[cnt].txmem) {
//AddLog(LOG_LEVEL_INFO, PSTR("100 ms>> %d - %s - %d"),sml_desc_cnt,script_meter_desc[cnt].txmem,script_meter_desc[cnt].tsecs); //AddLog(LOG_LEVEL_INFO, PSTR("100 ms>> %d - %s - %d"),sml_desc_cnt,script_meter_desc[cnt].txmem,script_meter_desc[cnt].tsecs);
if ((sml_100ms_cnt>=script_meter_desc[cnt].tsecs)) { if ((sml_100ms_cnt >= script_meter_desc[cnt].tsecs)) {
sml_100ms_cnt=0; sml_100ms_cnt = 0;
//AddLog(LOG_LEVEL_INFO, PSTR("100 ms>> 2"),cp); // check for scriptsync extra output
if (script_meter_desc[cnt].max_index>1) { if (script_meter_desc[cnt].script_str) {
script_meter_desc[cnt].index++; cp = script_meter_desc[cnt].script_str;
if (script_meter_desc[cnt].index>=script_meter_desc[cnt].max_index) { script_meter_desc[cnt].script_str = 0;
script_meter_desc[cnt].index=0; } else {
//AddLog(LOG_LEVEL_INFO, PSTR("100 ms>> 2"),cp);
if (script_meter_desc[cnt].max_index>1) {
script_meter_desc[cnt].index++;
if (script_meter_desc[cnt].index >= script_meter_desc[cnt].max_index) {
script_meter_desc[cnt].index = 0;
sml_desc_cnt++;
}
cp=SML_Get_Sequence(script_meter_desc[cnt].txmem,script_meter_desc[cnt].index);
//SML_Send_Seq(cnt,cp);
} else {
cp = script_meter_desc[cnt].txmem;
//SML_Send_Seq(cnt,cp);
sml_desc_cnt++; sml_desc_cnt++;
} }
cp=SML_Get_Sequence(script_meter_desc[cnt].txmem,script_meter_desc[cnt].index);
//SML_Send_Seq(cnt,cp);
} else {
cp=script_meter_desc[cnt].txmem;
//SML_Send_Seq(cnt,cp);
sml_desc_cnt++;
} }
//AddLog(LOG_LEVEL_INFO, PSTR(">> %s"),cp); //AddLog(LOG_LEVEL_INFO, PSTR(">> %s"),cp);
SML_Send_Seq(cnt,cp); SML_Send_Seq(cnt,cp);
if (sml_desc_cnt>=meters_used) { if (sml_desc_cnt >= meters_used) {
sml_desc_cnt=0; sml_desc_cnt = 0;
} }
break; break;
} }
@ -3175,8 +3191,8 @@ void SML_Check_Send(void) {
sml_desc_cnt++; sml_desc_cnt++;
} }
if (sml_desc_cnt>=meters_used) { if (sml_desc_cnt >= meters_used) {
sml_desc_cnt=0; sml_desc_cnt = 0;
} }
} }
} }