Ollo/Wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:0110/Wordclock

Browse Source
This commit is contained in:
Ollo 2021-03-18 19:30:12 +01:00
commit efadc4bc06
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.lua
View File

@ -33,7 +33,7 @@ end
initTimer = tmr.create()
initTimer:register(5000, tmr.ALARM_SINGLE, function (t)
bootledtimer:unregister()
t:unregister()
initTimer:unregister()
initTimer=nil
bootledtimer=nil
local modlist = { "timecore" , "displayword" }

14
simulation/src/de/c3ma/ollo/mockup/ESP8266Tmr.java
View File

@ -111,19 +111,19 @@ public class ESP8266Tmr extends TwoArgFunction {
}
}
private class dynStart extends VarArgFunction {
private class dynStart extends ZeroArgFunction {
private final int dynIndex;
public dynStart(int index) {
this.dynIndex = index;
}
public Varargs invoke(Varargs varargs) {
if (varargs.narg()== 0) {
public LuaValue call() {
if (dynamicThreads[dynIndex] != null) {
dynamicThreads[dynIndex].start();
System.out.println("[TMR] DynTimer" + dynIndex + " started");
}
}
return LuaValue.valueOf(true);
} else {
return LuaValue.valueOf(false);
}
}
}
@ -133,12 +133,14 @@ public class ESP8266Tmr extends TwoArgFunction {
this.dynIndex = index;
}
public LuaValue call() {
boolean status = false;
if (dynamicThreads[dynIndex] != null) {
dynamicThreads[dynIndex].stopThread();
dynamicThreads[dynIndex] = null;
System.out.println("[TMR] DynTimer" + dynIndex + " stopped");
status = true;
}
return LuaValue.valueOf(true);
return LuaValue.valueOf(status);
}
}