jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-30 14:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix scripter core 2.3.0 related compile errors

Browse Source 
Fix scripter core 2.3.0 related compile errors (#6045)
This commit is contained in:
Theo Arends 2019-07-08 17:52:02 +02:00
parent da7ab3274b
commit ecd288f32f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sonoff/xdrv_10_scripter.ino
View File

@ -1613,7 +1613,7 @@ extern "C" {
} }
uint16_t GetStack(void) { uint16_t GetStack(void) {
register uint32_t *sp asm("a1"); register uint32_t *sp asm("a1");
return (4 * (sp - g_pcont.stack)); return (4 * (sp - g_cont.stack));
} }
#else #else
@ -1640,7 +1640,7 @@ char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo) {
strlcpy(str,str1,sizeof(str)); strlcpy(str,str1,sizeof(str));
break; break;
case OPER_PLS: case OPER_PLS:
strlcat(str,str1,sizeof(str)); strncat(str,str1,sizeof(str));
break; break;
} }
slp=lp; slp=lp;
@ -1704,7 +1704,7 @@ struct T_INDEX ind;
fvar/=fvar1; fvar/=fvar1;
break; break;
case OPER_PERC: case OPER_PERC:
fvar=fmod(fvar,fvar1); fvar=fmodf(fvar,fvar1);
break; break;
case OPER_XOR: case OPER_XOR:
fvar=(uint32_t)fvar^(uint32_t)fvar1; fvar=(uint32_t)fvar^(uint32_t)fvar1;
@ -2289,7 +2289,7 @@ int16_t Run_Scripter(const char *type, uint8_t tlen, char *js) {
*dfvar/=fvar; *dfvar/=fvar;
break; break;
case OPER_PERCEQU: case OPER_PERCEQU:
*dfvar=fmod(*dfvar,fvar); *dfvar=fmodf(*dfvar,fvar);
break; break;
case OPER_ANDEQU: case OPER_ANDEQU:
*dfvar=(uint32_t)*dfvar&(uint32_t)fvar; *dfvar=(uint32_t)*dfvar&(uint32_t)fvar;
@ -2346,7 +2346,7 @@ int16_t Run_Scripter(const char *type, uint8_t tlen, char *js) {
if (lastop==OPER_EQU) { if (lastop==OPER_EQU) {
strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize); strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
} else if (lastop==OPER_PLSEQU) { } else if (lastop==OPER_PLSEQU) {
strlcat(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize); strncat(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
} }
} }
} }