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

Removed original config.lua file, before the simulation one is integrated

Browse Source
This commit is contained in:
ollo
2019-04-24 21:00:12 +02:00
parent 0aacfc2222
commit 8c73a1a8a0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
simulation/config.lua
View File

@@ -12,4 +12,3 @@ color4=string.char(tonumber(green2*0.2), 0, 0)
colorBg=string.char(0,0,0) -- black is the default background color colorBg=string.char(0,0,0) -- black is the default background color
sntpserverhostname="ptbtime1.ptb.de" sntpserverhostname="ptbtime1.ptb.de"
timezoneoffset=1 timezoneoffset=1

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

@@ -93,9 +93,16 @@ public class WS2812Simulation implements LuaSimulation {
if (args.length >= 3) { if (args.length >= 3) {
File additionalFile = new File(args[2]); File additionalFile = new File(args[2]);
if (additionalFile.exists() && (simu.doFile != null)) { if (additionalFile.exists() && (simu.doFile != null)) {
File targetFile = new File(simu.doFile.getWorkingDirectory()
Files.copy(additionalFile.toPath(), new File(simu.doFile.getWorkingDirectory() + File.separator + additionalFile.getName());
+ File.separator + additionalFile.getName()).toPath()); if (targetFile.exists()) {
if (targetFile.delete()) {
System.out.println("Removed original " + targetFile.getName() + "");
} else {
System.err.println("Cannot removed original " + targetFile.getName() + "");
}
}
Files.copy(additionalFile.toPath(), targetFile.toPath());
System.out.println("Integrate " + additionalFile.getName() + " into simulation"); System.out.println("Integrate " + additionalFile.getName() + " into simulation");
} else { } else {
System.err.println("Script " + args[2] + " cannot be found"); System.err.println("Script " + args[2] + " cannot be found");