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

The time can be set within the GUI

Browse Source
This commit is contained in:
ollo
2018-02-03 16:51:00 +01:00
parent 28b7bbe04a
commit ca47018a32
4 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
simulation/src/de/c3ma/ollo/mockup/ESP8266Time.java
View File

@@ -23,6 +23,8 @@ public class ESP8266Time extends TwoArgFunction {
private static long gSimulationStartTime = 0;
private static long gOverwrittenTime = 0;
@Override
public LuaValue call(LuaValue modname, LuaValue env) {
env.checkglobals();
@@ -48,11 +50,16 @@ public class ESP8266Time extends TwoArgFunction {
gSimulationStartTime = System.currentTimeMillis();
}
long time = System.currentTimeMillis();
if (ESP8266Tmr.gTimingFactor > 1) {
time = gSimulationStartTime + ((time - gSimulationStartTime) * ESP8266Tmr.gTimingFactor);
if (gOverwrittenTime == 0) {
/* Time simulation is disabled -> calculate something according to the speedup factor */
long time = System.currentTimeMillis();
if (ESP8266Tmr.gTimingFactor > 1) {
time = gSimulationStartTime + ((time - gSimulationStartTime) * ESP8266Tmr.gTimingFactor);
}
return time;
} else {
return gOverwrittenTime;
}
return time;
}
private class SyncFunction extends ThreeArgFunction {
@@ -87,5 +94,9 @@ public class ESP8266Time extends TwoArgFunction {
}
}
public static void setOverwrittenTime(long timeInMillis) {
gOverwrittenTime = timeInMillis;
}
}