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

Merge pull request #8409 from gemu2015/scripter-fix 

Scripter fix
This commit is contained in:
Theo Arends 2020-05-10 18:26:52 +02:00 committed by GitHub
parent 9ae2ad9214 39a92c2767
commit 650aca898d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tasmota/xdrv_10_scripter.ino
View File

@ -1879,6 +1879,19 @@ chknext:
len=0; len=0;
goto strexit; goto strexit;
} }
#ifdef ESP32
if (!strncmp(vname,"sf(",3)) {
lp+=2;
lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
if (fvar<80) fvar=80;
if (fvar>240) fvar=240;
setCpuFrequencyMhz(fvar);
fvar=getCpuFrequencyMhz();
lp++;
len=0;
goto exit;
}
#endif
#if defined(USE_TIMERS) && defined(USE_SUNRISE) #if defined(USE_TIMERS) && defined(USE_SUNRISE)
if (!strncmp(vname,"sunrise",7)) { if (!strncmp(vname,"sunrise",7)) {
fvar=SunMinutes(0); fvar=SunMinutes(0);
@ -2093,7 +2106,7 @@ chknext:
len=0; len=0;
goto exit; goto exit;
} }
#endif #endif //ESP32, USE_WEBCAM
if (!strncmp(vname,"wday",4)) { if (!strncmp(vname,"wday",4)) {
fvar=RtcTime.day_of_week; fvar=RtcTime.day_of_week;
goto exit; goto exit;
@ -2692,11 +2705,13 @@ int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
return -99; return -99;
} }
DynamicJsonBuffer jsonBuffer; // on heap JsonObject *jo=0;
JsonObject &jobj=jsonBuffer.parseObject(js);
JsonObject *jo; if (js) {
if (js) jo=&jobj; DynamicJsonBuffer jsonBuffer; // on heap
else jo=0; JsonObject &jobj=jsonBuffer.parseObject(js);
jo=&jobj;
}
char *lp=glob_script_mem.scriptptr; char *lp=glob_script_mem.scriptptr;
@ -5119,6 +5134,8 @@ bool RulesProcessEvent(char *json_event) {
#ifdef USE_SCRIPT_TASK #ifdef USE_SCRIPT_TASK
uint16_t task_timer1; uint16_t task_timer1;
uint16_t task_timer2; uint16_t task_timer2;
TaskHandle_t task_t1;
TaskHandle_t task_t2;
void script_task1(void *arg) { void script_task1(void *arg) {
while (1) { while (1) {
@ -5143,14 +5160,16 @@ void script_task2(void *arg) {
uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core) { uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core) {
//return 0; //return 0;
BaseType_t res=0; BaseType_t res = 0;
if (core>1) {core = 1;} if (core > 1) { core = 1; }
if (num == 1) { if (num == 1) {
res = xTaskCreatePinnedToCore(script_task1, "T 1", STASK_STACK, NULL, STASK_PRIO, NULL, core); if (task_t1) { vTaskDelete(task_t1); }
task_timer1=time; res = xTaskCreatePinnedToCore(script_task1, "T1", STASK_STACK, NULL, STASK_PRIO, &task_t1, core);
task_timer1 = time;
} else { } else {
res = xTaskCreatePinnedToCore(script_task2, "T 2", STASK_STACK, NULL, STASK_PRIO, NULL, core); if (task_t2) { vTaskDelete(task_t2); }
task_timer2=time; res = xTaskCreatePinnedToCore(script_task2, "T2", STASK_STACK, NULL, STASK_PRIO, &task_t2, core);
task_timer2 = time;
} }
return res; return res;
} }