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

Special configuration file for the simulation can be set

Browse Source
This commit is contained in:
ollo
2018-01-02 14:47:49 +01:00
parent 36fea30afc
commit 225f4af842
5 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
simulation/src/de/c3ma/ollo/WS2812Simulation.java
View File

@@ -88,8 +88,24 @@ public class WS2812Simulation implements LuaSimulation {
if (args.length >= 2) {
simu.setWS2812Layout(new File(args[1]));
}
simu.callScript(f.getName());
try {
if (args.length >= 3) {
File additionalFile = new File(args[2]);
if (additionalFile.exists() && (simu.doFile != null)) {
Files.copy(additionalFile.toPath(),
new File(simu.doFile.getWorkingDirectory() + File.separator + additionalFile.getName()).toPath());
System.out.println("Integrate " + additionalFile.getName() + " into simulation");
} else {
System.err.println("Script " + args[2] + " cannot be found");
System.exit(1);
}
}
simu.callScript(f.getName());
} catch (IOException e) {
System.err.println("[Nodemcu] " + e.getMessage());
}
}
} else {
printUsage();

8
simulation/src/de/c3ma/ollo/mockup/DoFileFunction.java
View File

@@ -43,4 +43,12 @@ public class DoFileFunction extends OneArgFunction {
this.workingDir = workingDir;
}
public String getWorkingDirectory() {
if (workingDir != null) {
return workingDir.getAbsolutePath();
} else {
return null;
}
}
}

2
simulation/src/de/c3ma/ollo/mockup/ui/WS2812Layout.java
View File

@@ -172,7 +172,7 @@ public class WS2812Layout extends JFrame {
} else {
sb.append("" + this.getText());
}
sb.append(Integer.toHexString(this.getForeground().getRed()) +
sb.append("|" + Integer.toHexString(this.getForeground().getRed()) +
" " + Integer.toHexString(this.getForeground().getGreen()) +
" " + Integer.toHexString(this.getForeground().getBlue()));