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

Compare commits

merge into: Ollo:master
Branches Tags
Ollo:master
Ollo:staticHTML
Ollo:sim
Ollo:ollo
Ollo:ESP12F
Ollo:ntp
...
pull from: Ollo:sim
Branches Tags
Ollo:master
Ollo:staticHTML
Ollo:sim
Ollo:ollo
Ollo:ESP12F
Ollo:ntp

1 Commits
master ... sim

Author SHA1 Message Date
Ollo
acda0ded1c Start simulation of _diet-files 2022-12-09 21:26:11 +01:00
2 changed files with 22 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
init.lua
View File

@ -11,7 +11,7 @@ bootledtimer:register(75, tmr.ALARM_AUTO, function (timer)
spaceLeds = math.max(MAXLEDS - (counter1*2), 0) spaceLeds = math.max(MAXLEDS - (counter1*2), 0)
ws2812.write(string.char(16,0,0):rep(counter1) .. string.char(0,0,0):rep(spaceLeds) .. string.char(0,0,8):rep(counter1)) ws2812.write(string.char(16,0,0):rep(counter1) .. string.char(0,0,0):rep(spaceLeds) .. string.char(0,0,8):rep(counter1))
if ((counter1*2) > 114) then if ((counter1*2) > 114) then
timer:unregister() bootledtimer:unregister()
end end
end) end)
bootledtimer:start() bootledtimer:start()

23
simulation/src/de/c3ma/ollo/mockup/ESP8266File.java
View File

@ -1,7 +1,8 @@
package de.c3ma.ollo.mockup; package de.c3ma.ollo.mockup;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.io.IOException;
import java.nio.file.Files;
import org.luaj.vm2.LuaTable; import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
@ -21,6 +22,8 @@ public class ESP8266File extends TwoArgFunction {
private File openedFile = null; private File openedFile = null;
private String SHRINKED_FILE_POSTFIX = "_diet";
@Override @Override
public LuaValue call(LuaValue modname, LuaValue env) { public LuaValue call(LuaValue modname, LuaValue env) {
env.checkglobals(); env.checkglobals();
@ -59,9 +62,25 @@ public class ESP8266File extends TwoArgFunction {
final String codeFileName = fileName.checkjstring(); final String codeFileName = fileName.checkjstring();
final File f = new File( workingDir.getAbsolutePath() + File.separator + codeFileName); final File f = new File( workingDir.getAbsolutePath() + File.separator + codeFileName);
//System.out.println("[FILE] Loading " + codeFileName); // Check if the file exists as it
if (f.exists()) { if (f.exists()) {
ESP8266File.this.openedFile = f; ESP8266File.this.openedFile = f;
} else {
if (codeFileName.contains(SHRINKED_FILE_POSTFIX)) {
File fShrinked = new File( workingDir.getAbsolutePath() + File.separator + codeFileName.replace(SHRINKED_FILE_POSTFIX, ""));
File fShrinkedLC = new File(fShrinked.getAbsolutePath().replace(".lua", ".lc"));
if (!fShrinkedLC.exists()) {
try {
System.out.println("[FILE] Generate " + codeFileName);
Files.copy(fShrinked.toPath(), f.toPath());
} catch (IOException e) {
System.err.println("[FILE] Generate " + codeFileName + " failed: " + e.getMessage());
}
} else {
System.out.println("[FILE] Already found " + fShrinkedLC.getName());
return LuaValue.valueOf(true);
}
}
} }
return LuaValue.valueOf((f.exists())); return LuaValue.valueOf((f.exists()));