deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cooja: Load whole simulation before executing it in nogui mode

Browse source
This commit is contained in:
Moritz 'Morty' Strübe 2012-10-30 11:41:55 +01:00
parent 53f4d27af4
commit becd2d4e15
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -3227,14 +3227,14 @@ public class GUI extends Observable {
logger.fatal("Error: " + e.getMessage(), e); logger.fatal("Error: " + e.getMessage(), e);
System.exit(1); System.exit(1);
} }
sim.setSpeedLimit(null);
sim.startSimulation();
} else { } else {
logger.fatal("No test editor controlling simulation, aborting"); logger.fatal("No test editor controlling simulation, aborting");
System.exit(1); System.exit(1);
} }
} }
sim.setSpeedLimit(null);
sim.startSimulation();
} else if (args.length > 0 && args[0].startsWith("-applet")) { } else if (args.length > 0 && args[0].startsWith("-applet")) {
String tmpWebPath=null, tmpBuildPath=null, tmpEsbFirmware=null, tmpSkyFirmware=null; String tmpWebPath=null, tmpBuildPath=null, tmpEsbFirmware=null, tmpSkyFirmware=null;

2
tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
View file

@ -672,8 +672,6 @@ public class ScriptRunner extends VisPlugin {
} catch (Exception e) { } catch (Exception e) {
logger.fatal("Error: " + e.getMessage(), e); logger.fatal("Error: " + e.getMessage(), e);
} }
simulation.setSpeedLimit(null);
simulation.startSimulation();
} }
return true; return true;
} }