diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..87f8700b5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tools/mspsim"]
+ path = tools/mspsim
+ url = https://github.com/contiki-os/mspsim.git
diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c
index 3e6857215..4816650f6 100644
--- a/core/dev/cc2420.c
+++ b/core/dev/cc2420.c
@@ -60,6 +60,15 @@
#define CC2420_CONF_CHECKSUM 0
#endif /* CC2420_CONF_CHECKSUM */
+#ifndef CC2420_CONF_CHANNEL
+#define CC2420_CONF_CHANNEL 26
+#endif /* CC2420_CONF_CHANNEL */
+
+#ifndef CC2420_CONF_CCA_THRESH
+#define CC2420_CONF_CCA_THRESH -45
+#endif /* CC2420_CONF_CCA_THRESH */
+
+
#ifndef CC2420_CONF_AUTOACK
#define CC2420_CONF_AUTOACK 0
#endif /* CC2420_CONF_AUTOACK */
@@ -331,7 +340,8 @@ cc2420_init(void)
setreg(CC2420_SECCTRL0, reg);
cc2420_set_pan_addr(0xffff, 0x0000, NULL);
- cc2420_set_channel(26);
+ cc2420_set_channel(CC2420_CONF_CHANNEL);
+ cc2420_set_cca_threshold(CC2420_CONF_CCA_THRESH);
flushrx();
diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h
index fc7eb8133..b7058450c 100644
--- a/platform/exp5438/contiki-conf.h
+++ b/platform/exp5438/contiki-conf.h
@@ -90,9 +90,17 @@
#define PACKETBUF_CONF_ATTRS_INLINE 1
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif /* RF_CHANNEL */
+#ifdef RF_CHANNEL
+#define CC2420_CONF_CHANNEL RF_CHANNEL
+#endif
+
+#ifndef CC2420_CONF_CHANNEL
+#define CC2420_CONF_CHANNEL 26
+#endif /* CC2420_CONF_CHANNEL */
+
+#ifndef CC2420_CONF_CCA_THRESH
+#define CC2420_CONF_CCA_THRESH -45
+#endif /* CC2420_CONF_CCA_THRESH */
#define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0
diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c
index 662243444..59ced9328 100644
--- a/platform/exp5438/contiki-exp5438-main.c
+++ b/platform/exp5438/contiki-exp5438-main.c
@@ -71,10 +71,6 @@ extern unsigned char node_mac[8];
//SENSORS(&button_sensor);
/*---------------------------------------------------------------------------*/
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif
-/*---------------------------------------------------------------------------*/
static void
set_rime_addr(void)
{
@@ -200,8 +196,6 @@ main(int argc, char **argv)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
- cc2420_set_channel(RF_CHANNEL);
-
leds_off(LEDS_ALL);
if(node_id > 0) {
@@ -224,7 +218,7 @@ main(int argc, char **argv)
NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL);
process_start(&tcpip_process, NULL);
@@ -265,7 +259,7 @@ main(int argc, char **argv)
NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#if !WITH_UIP6
diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h
index b4aadf206..e12140445 100644
--- a/platform/micaz/contiki-conf.h
+++ b/platform/micaz/contiki-conf.h
@@ -90,9 +90,17 @@
#define PACKETBUF_CONF_ATTRS_INLINE 1
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif /* RF_CHANNEL */
+#ifdef RF_CHANNEL
+#define CC2420_CONF_CHANNEL RF_CHANNEL
+#endif
+
+#ifndef CC2420_CONF_CHANNEL
+#define CC2420_CONF_CHANNEL 26
+#endif /* CC2420_CONF_CHANNEL */
+
+#ifndef CC2420_CONF_CCA_THRESH
+#define CC2420_CONF_CCA_THRESH -45
+#endif /* CC2420_CONF_CCA_THRESH */
#define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0
diff --git a/platform/micaz/init-net.c b/platform/micaz/init-net.c
index 4bfebd1c4..6e67c43ae 100644
--- a/platform/micaz/init-net.c
+++ b/platform/micaz/init-net.c
@@ -139,14 +139,12 @@ init_net(void)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
- cc2420_set_channel(RF_CHANNEL);
-
#if WITH_UIP6
memcpy(&uip_lladdr.addr, ds2401_id, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
- /* printf(" %s channel %u\n", sicslowmac_driver.name, RF_CHANNEL); */
+ /* printf(" %s channel %u\n", sicslowmac_driver.name, CC2420_CONF_CHANNEL); */
/* Setup X-MAC for 802.15.4 */
queuebuf_init();
@@ -158,7 +156,7 @@ init_net(void)
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL);
process_start(&tcpip_process, NULL);
@@ -199,7 +197,7 @@ init_net(void)
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index b151f9c51..402164e9c 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -90,9 +90,17 @@
#define PACKETBUF_CONF_ATTRS_INLINE 1
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif /* RF_CHANNEL */
+#ifdef RF_CHANNEL
+#define CC2420_CONF_CHANNEL RF_CHANNEL
+#endif
+
+#ifndef CC2420_CONF_CHANNEL
+#define CC2420_CONF_CHANNEL 26
+#endif /* CC2420_CONF_CHANNEL */
+
+#ifndef CC2420_CONF_CCA_THRESH
+#define CC2420_CONF_CCA_THRESH -45
+#endif /* CC2420_CONF_CCA_THRESH */
#define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0
diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index ad042b588..361d47878 100644
--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@@ -115,10 +115,7 @@ force_float_inclusion()
#endif
/*---------------------------------------------------------------------------*/
void uip_log(char *msg) { puts(msg); }
-/*---------------------------------------------------------------------------*/
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif
+
/*---------------------------------------------------------------------------*/
#if 0
void
@@ -272,7 +269,6 @@ main(int argc, char **argv)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
- cc2420_set_channel(RF_CHANNEL);
printf(CONTIKI_VERSION_STRING " started. ");
if(node_id > 0) {
@@ -289,7 +285,7 @@ main(int argc, char **argv)
memcpy(&uip_lladdr.addr, ds2411_id, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
-/* printf(" %s channel %u\n", sicslowmac_driver.name, RF_CHANNEL); */
+/* printf(" %s channel %u\n", sicslowmac_driver.name, CC2420_CONF_CCA_THRESH); */
/* Setup X-MAC for 802.15.4 */
queuebuf_init();
@@ -297,11 +293,12 @@ main(int argc, char **argv)
NETSTACK_MAC.init();
NETSTACK_NETWORK.init();
- printf("%s %s, channel check rate %lu Hz, radio channel %u\n",
+ printf("%s %s, channel check rate %lu Hz, radio channel %u, CCA threshold %i\n",
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL,
+ CC2420_CONF_CCA_THRESH);
process_start(&tcpip_process, NULL);
@@ -342,7 +339,7 @@ main(int argc, char **argv)
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CCA_THRESH);
#endif /* WITH_UIP6 */
#if !WITH_UIP && !WITH_UIP6
diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h
index b5a9d57b2..1a00b0df0 100644
--- a/platform/z1/contiki-conf.h
+++ b/platform/z1/contiki-conf.h
@@ -92,9 +92,17 @@
#define PACKETBUF_CONF_ATTRS_INLINE 1
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif /* RF_CHANNEL */
+#ifdef RF_CHANNEL
+#define CC2420_CONF_CHANNEL RF_CHANNEL
+#endif
+
+#ifndef CC2420_CONF_CHANNEL
+#define CC2420_CONF_CHANNEL 26
+#endif /* CC2420_CONF_CHANNEL */
+
+#ifndef CC2420_CONF_CCA_THRESH
+#define CC2420_CONF_CCA_THRESH -45
+#endif /* CC2420_CONF_CCA_THRESH */
#define IEEE802154_CONF_PANID 0xABCD
diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c
index 5e9660216..fafea096a 100644
--- a/platform/z1/contiki-z1-main.c
+++ b/platform/z1/contiki-z1-main.c
@@ -123,10 +123,6 @@ force_float_inclusion()
/*---------------------------------------------------------------------------*/
void uip_log(char *msg) { puts(msg); }
/*---------------------------------------------------------------------------*/
-#ifndef RF_CHANNEL
-#define RF_CHANNEL 26
-#endif
-/*---------------------------------------------------------------------------*/
#if 0
void
force_inclusion(int d1, int d2)
@@ -289,7 +285,6 @@ main(int argc, char **argv)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
- cc2420_set_channel(RF_CHANNEL);
leds_off(LEDS_ALL);
@@ -306,7 +301,7 @@ main(int argc, char **argv)
memcpy(&uip_lladdr.addr, node_mac, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
-/* printf(" %s channel %u\n", sicslowmac_driver.name, RF_CHANNEL); */
+/* printf(" %s channel %u\n", sicslowmac_driver.name, CC2420_CONF_CHANNEL); */
/* Setup X-MAC for 802.15.4 */
queuebuf_init();
@@ -319,7 +314,7 @@ main(int argc, char **argv)
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL);
process_start(&tcpip_process, NULL);
@@ -360,7 +355,7 @@ main(int argc, char **argv)
NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
- RF_CHANNEL);
+ CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#if !WITH_UIP && !WITH_UIP6
diff --git a/regression-tests/08-collect/01-sky-shell-collect.csc b/regression-tests/08-collect/01-sky-shell-collect.csc
index b2f277514..32694c103 100644
--- a/regression-tests/08-collect/01-sky-shell-collect.csc
+++ b/regression-tests/08-collect/01-sky-shell-collect.csc
@@ -33,7 +33,7 @@
se.sics.cooja.mspmote.interfaces.MspMoteID
se.sics.cooja.mspmote.interfaces.SkyButton
se.sics.cooja.mspmote.interfaces.SkyFlash
- se.sics.cooja.mspmote.interfaces.SkyByteRadio
+ se.sics.cooja.mspmote.interfaces.Msp802154Radio
se.sics.cooja.mspmote.interfaces.MspSerial
se.sics.cooja.mspmote.interfaces.SkyLED
@@ -371,7 +371,7 @@ total_latency = 0;
nodes_starting = true;
for(i = 1; i <= nrNodes; i++) {
booted[i] = false;
- received[i] = "__________";
+ received[i] = "___________";
hops[i] = received[i];
}
@@ -404,7 +404,7 @@ GENERATE_MSG(20000, "continue");
YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
node = sink_node;
log.log("Writing netcmd\n");
-node.write("netcmd { repeat 10 30 { randwait 30 collect-view-data | blink | send } }");
+node.write("netcmd { repeat 11 30 { randwait 30 collect-view-data | blink | send } }");
while(true) {
YIELD();
@@ -471,7 +471,7 @@ while(true) {
num_reported = 0;
for(i = 1; i <= nrNodes; i++) {
if(i != sink) {
- if(!isNaN(received[i])) {
+ if(received[i].split("_").length -1 <= 1) {
num_reported++;
}
}
diff --git a/regression-tests/11-ipv6/10-exp5438-unicast-fragmentation-contikimac.csc b/regression-tests/11-ipv6/010-exp5438-unicast-fragmentation-contikimac.csc
similarity index 100%
rename from regression-tests/11-ipv6/10-exp5438-unicast-fragmentation-contikimac.csc
rename to regression-tests/11-ipv6/010-exp5438-unicast-fragmentation-contikimac.csc
diff --git a/regression-tests/Makefile.simulation-test b/regression-tests/Makefile.simulation-test
index 4af001ef0..5c8b99e40 100644
--- a/regression-tests/Makefile.simulation-test
+++ b/regression-tests/Makefile.simulation-test
@@ -30,6 +30,8 @@ TESTS=$(wildcard ??-*.csc)
TESTLOGS=$(patsubst %.csc,%.testlog,$(TESTS))
LOGS=$(patsubst %.csc,%.log,$(TESTS))
FAILLOGS=$(patsubst %.csc,%.faillog,$(TESTS))
+#Set random seed to create reproduceable results.
+RANDOMSEED=1
CONTIKI=../..
@@ -54,17 +56,8 @@ else
RUNALL=false
endif
-%.testlog: %.csc cooja
- @echo -n Running test $(basename $<) ... ""
- @(java -Xshare:on -jar $(CONTIKI)/tools/cooja/dist/cooja.jar \
- -nogui=$< -contiki=$(CONTIKI) > $(basename $@).log || \
- (echo " FAIL ಠ_ಠ" | tee -a COOJA.testlog; \
- tail -50 COOJA.log; \
- mv COOJA.testlog $(basename $<).faillog; \
- $(RUNALL))) && \
- (touch COOJA.testlog; \
- mv COOJA.testlog $@; \
- echo " OK")
+%.testlog: %.csc cooja
+ @$(CONTIKI)/regression-tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" "$(RANDOMSEED)"
clean:
@rm -f $(TESTLOGS) $(LOGS) $(FAILLOGS) COOJA.log COOJA.testlog \
diff --git a/regression-tests/simexec.sh b/regression-tests/simexec.sh
new file mode 100755
index 000000000..1d1e46b7f
--- /dev/null
+++ b/regression-tests/simexec.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+RUNALL=$1
+CSC=$2
+CONTIKI=$3
+BASENAME=$4
+RANDOMSEED=$5
+
+#set -x
+
+echo -n "Running test $BASENAME "
+
+java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$CSC -contiki=$CONTIKI -random-seed=$RANDOMSEED > $BASENAME.log &
+JPID=$!
+
+# Copy the log and only print "." if it changed
+touch $BASENAME.log.prog
+while kill -0 $JPID 2> /dev/null
+do
+ sleep 1
+ diff $BASENAME.log $BASENAME.log.prog > /dev/null
+ if [ $? -ne 0 ]
+ then
+ echo -n "."
+ cp $BASENAME.log $BASENAME.log.prog
+ fi
+done
+rm $BASENAME.log.prog
+
+
+wait $JPID
+JRV=$?
+
+if [ $JRV -eq 0 ] ; then
+ touch COOJA.testlog;
+ mv COOJA.testlog $BASENAME.testlog
+ echo " OK"
+ exit 0
+fi
+
+
+
+# In case of failure
+
+echo " FAIL ಠ_ಠ" | tee -a COOJA.testlog;
+
+#Verbose output when using CI
+if [ "$CI" = "true" ]; then
+ echo "==== COOJA.log ====" ; cat COOJA.log;
+ echo "==== COOJA.testlog ====" ; cat COOJA.testlog;
+else
+ tail -50 COOJA.log ;
+fi;
+
+mv COOJA.testlog $BASENAME.faillog
+
+# We do not want Make to stop -> Return 0
+if [ "$RUNALL" = "true" ] ; then
+ touch COOJA.testlog;
+ mv COOJA.testlog $BASENAME.testlog;
+ exit 0
+fi
+
+#This is a failure
+exit 1
+
+
+
+
diff --git a/tools/cooja/apps/mspsim/build.xml b/tools/cooja/apps/mspsim/build.xml
index 32b467799..da3f2fd42 100644
--- a/tools/cooja/apps/mspsim/build.xml
+++ b/tools/cooja/apps/mspsim/build.xml
@@ -8,8 +8,8 @@
-
-
+
+
@@ -26,7 +26,8 @@
-
+
+
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index 572982b5d..400b243c4 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -76,7 +76,7 @@ import se.sics.mspsim.util.DebugInfo;
import se.sics.mspsim.util.ELF;
import se.sics.mspsim.util.MapEntry;
import se.sics.mspsim.util.MapTable;
-import se.sics.mspsim.util.SimpleProfiler;
+import se.sics.mspsim.profiler.SimpleProfiler;
/**
* @author Fredrik Osterlind
diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java
index 1883ba2da..da6b39b2b 100644
--- a/tools/cooja/java/se/sics/cooja/GUI.java
+++ b/tools/cooja/java/se/sics/cooja/GUI.java
@@ -633,7 +633,7 @@ public class GUI extends Observable {
private void doLoadConfigAsync(final boolean ask, final boolean quick, final File file) {
new Thread(new Runnable() {
public void run() {
- myGUI.doLoadConfig(ask, quick, file);
+ myGUI.doLoadConfig(ask, quick, file, null);
}
}).start();
}
@@ -1321,7 +1321,7 @@ public class GUI extends Observable {
return desktop;
}
- public static Simulation quickStartSimulationConfig(File config, boolean vis) {
+ public static Simulation quickStartSimulationConfig(File config, boolean vis, Long manualRandomSeed) {
logger.info("> Starting Cooja");
JDesktopPane desktop = createDesktopPane();
if (vis) {
@@ -1333,11 +1333,11 @@ public class GUI extends Observable {
}
if (vis) {
- gui.doLoadConfig(false, true, config);
+ gui.doLoadConfig(false, true, config, manualRandomSeed);
return gui.getSimulation();
} else {
try {
- Simulation newSim = gui.loadSimulationConfig(config, true);
+ Simulation newSim = gui.loadSimulationConfig(config, true, manualRandomSeed);
if (newSim == null) {
return null;
}
@@ -1356,7 +1356,7 @@ public class GUI extends Observable {
* @param source Contiki application file name
* @return True if simulation was created
*/
- private static boolean quickStartSimulation(String source) {
+ private static Simulation quickStartSimulation(String source) {
logger.info("> Starting Cooja");
JDesktopPane desktop = createDesktopPane();
frame = new JFrame(WINDOW_TITLE);
@@ -1364,14 +1364,14 @@ public class GUI extends Observable {
configureFrame(gui, false);
logger.info("> Creating simulation");
- Simulation simulation = new Simulation(gui);
- simulation.setTitle("Quickstarted simulation: " + source);
- boolean simOK = CreateSimDialog.showDialog(GUI.getTopParentContainer(), simulation);
+ Simulation sim = new Simulation(gui);
+ sim.setTitle("Quickstarted simulation: " + source);
+ boolean simOK = CreateSimDialog.showDialog(GUI.getTopParentContainer(), sim);
if (!simOK) {
logger.fatal("No simulation, aborting quickstart");
System.exit(1);
}
- gui.setSimulation(simulation, true);
+ gui.setSimulation(sim, true);
logger.info("> Creating mote type");
ContikiMoteType moteType = new ContikiMoteType();
@@ -1379,20 +1379,20 @@ public class GUI extends Observable {
moteType.setDescription("Cooja mote type (" + source + ")");
try {
- boolean compileOK = moteType.configureAndInit(GUI.getTopParentContainer(), simulation, true);
+ boolean compileOK = moteType.configureAndInit(GUI.getTopParentContainer(), sim, true);
if (!compileOK) {
logger.fatal("Mote type initialization failed, aborting quickstart");
- return false;
+ return null;
}
} catch (MoteTypeCreationException e1) {
logger.fatal("Mote type initialization failed, aborting quickstart");
- return false;
+ return null;
}
- simulation.addMoteType(moteType);
+ sim.addMoteType(moteType);
logger.info("> Adding motes");
gui.doAddMotes(moteType);
- return true;
+ return sim;
}
//// PROJECT CONFIG AND EXTENDABLE PARTS METHODS ////
@@ -2258,7 +2258,7 @@ public class GUI extends Observable {
* @param quick Quick-load simulation
* @param configFile Configuration file to load, if null a dialog will appear
*/
- public void doLoadConfig(boolean askForConfirmation, final boolean quick, File configFile) {
+ public void doLoadConfig(boolean askForConfirmation, final boolean quick, File configFile, Long manualRandomSeed) {
if (isVisualizedInApplet()) {
return;
}
@@ -2278,7 +2278,7 @@ public class GUI extends Observable {
if (!configFile.exists() || !configFile.canRead()) {
logger.fatal("No read access to file: " + configFile.getAbsolutePath());
/* File does not exist, open dialog */
- doLoadConfig(askForConfirmation, quick, null);
+ doLoadConfig(askForConfirmation, quick, null, manualRandomSeed);
return;
}
} else {
@@ -2394,7 +2394,7 @@ public class GUI extends Observable {
shouldRetry = false;
myGUI.doRemoveSimulation(false);
PROGRESS_WARNINGS.clear();
- newSim = loadSimulationConfig(fileToLoad, quick);
+ newSim = loadSimulationConfig(fileToLoad, quick, manualRandomSeed);
myGUI.setSimulation(newSim, false);
/* Optionally show compilation warnings */
@@ -3121,6 +3121,9 @@ public class GUI extends Observable {
*/
public static void main(String[] args) {
String logConfigFile = null;
+ Long randomSeed = null;
+
+
for (String element : args) {
if (element.startsWith("-log4j=")) {
String arg = element.substring("-log4j=".length());
@@ -3178,6 +3181,15 @@ public class GUI extends Observable {
GUI.externalToolsUserSettingsFileReadOnly = true;
}
}
+
+ if (element.startsWith("-random-seed=")) {
+ String arg = element.substring("-random-seed=".length());
+ try {
+ randomSeed = Long.valueOf(arg);
+ } catch (Exception e) {
+ logger.error("Failed to convert \"" + arg +"\" to an integer.");
+ }
+ }
}
// Check if simulator should be quick-started
@@ -3190,11 +3202,9 @@ public class GUI extends Observable {
contikiApp = contikiApp.replace("/cygdrive/" + driveCharacter + "/", driveCharacter + ":/");
}
- boolean ok = false;
+ Simulation sim = null;
if (contikiApp.endsWith(".csc")) {
-
- ok = quickStartSimulationConfig(new File(contikiApp), true) != null;
-
+ sim = quickStartSimulationConfig(new File(contikiApp), true, randomSeed);
} else {
if (contikiApp.endsWith(".cooja")) {
contikiApp = contikiApp.substring(0, contikiApp.length() - ".cooja".length());
@@ -3203,19 +3213,20 @@ public class GUI extends Observable {
contikiApp += ".c";
}
- ok = quickStartSimulation(contikiApp);
+ sim = quickStartSimulation(contikiApp);
}
- if (!ok) {
+ if (sim == null) {
System.exit(1);
}
+
} else if (args.length > 0 && args[0].startsWith("-nogui=")) {
/* Load simulation */
String config = args[0].substring("-nogui=".length());
File configFile = new File(config);
- Simulation sim = quickStartSimulationConfig(configFile, false);
+ Simulation sim = quickStartSimulationConfig(configFile, false, randomSeed);
if (sim == null) {
System.exit(1);
}
@@ -3253,6 +3264,7 @@ public class GUI extends Observable {
System.exit(1);
}
}
+
sim.setSpeedLimit(null);
sim.startSimulation();
@@ -3319,7 +3331,7 @@ public class GUI extends Observable {
* @throws UnsatisfiedLinkError
* If associated libraries could not be loaded
*/
- public Simulation loadSimulationConfig(File file, boolean quick)
+ public Simulation loadSimulationConfig(File file, boolean quick, Long manualRandomSeed)
throws UnsatisfiedLinkError, SimulationCreationException {
this.currentConfigFile = file; /* Used to generate config relative paths */
try {
@@ -3337,7 +3349,7 @@ public class GUI extends Observable {
Element root = doc.getRootElement();
in.close();
- return loadSimulationConfig(root, quick, null);
+ return loadSimulationConfig(root, quick, manualRandomSeed);
} catch (JDOMException e) {
throw (SimulationCreationException) new SimulationCreationException("Config not wellformed").initCause(e);
} catch (IOException e) {
@@ -4434,7 +4446,7 @@ public class GUI extends Observable {
final File file = getLastOpenedFile();
new Thread(new Runnable() {
public void run() {
- myGUI.doLoadConfig(true, true, file);
+ myGUI.doLoadConfig(true, true, file, null);
}
}).start();
return;
diff --git a/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java b/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
index 6ee5ab206..f1a91381e 100644
--- a/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
+++ b/tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
@@ -102,7 +102,7 @@ public class ExecuteJAR {
GUI.externalToolsUserSettingsFile = new File(
System.getProperty("user.home"),
GUI.EXTERNAL_TOOLS_USER_SETTINGS_FILENAME);
- Simulation s = GUI.quickStartSimulationConfig(config, false);
+ Simulation s = GUI.quickStartSimulationConfig(config, false, null);
if (s == null) {
throw new RuntimeException(
"Error when creating simulation"
@@ -187,7 +187,7 @@ public class ExecuteJAR {
logger.info("Starting simulation");
GUI.setLookAndFeel();
- GUI.quickStartSimulationConfig(new File(executeDir, SIMCONFIG_FILENAME), false);
+ GUI.quickStartSimulationConfig(new File(executeDir, SIMCONFIG_FILENAME), false, null);
}
/**
diff --git a/tools/mspsim b/tools/mspsim
new file mode 160000
index 000000000..58f187351
--- /dev/null
+++ b/tools/mspsim
@@ -0,0 +1 @@
+Subproject commit 58f187351f3417814aa2d0d92af9e2bb768d92ee
diff --git a/tools/mspsim/lib/jcommon-1.0.14.jar b/tools/mspsim/lib/jcommon-1.0.14.jar
deleted file mode 100644
index f7e63239b..000000000
Binary files a/tools/mspsim/lib/jcommon-1.0.14.jar and /dev/null differ
diff --git a/tools/mspsim/lib/jfreechart-1.0.11.jar b/tools/mspsim/lib/jfreechart-1.0.11.jar
deleted file mode 100644
index 39d4dc5c4..000000000
Binary files a/tools/mspsim/lib/jfreechart-1.0.11.jar and /dev/null differ
diff --git a/tools/mspsim/lib/jfreechart-licence-LGPL.txt b/tools/mspsim/lib/jfreechart-licence-LGPL.txt
deleted file mode 100644
index b1e3f5a26..000000000
--- a/tools/mspsim/lib/jfreechart-licence-LGPL.txt
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- , 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/tools/mspsim/lib/jipv6.jar b/tools/mspsim/lib/jipv6.jar
deleted file mode 100644
index 74a31b557..000000000
Binary files a/tools/mspsim/lib/jipv6.jar and /dev/null differ
diff --git a/tools/mspsim/mspsim.jar b/tools/mspsim/mspsim.jar
deleted file mode 100644
index 4a3d362e8..000000000
Binary files a/tools/mspsim/mspsim.jar and /dev/null differ
diff --git a/tools/mspsim/scripts/autorun.sc b/tools/mspsim/scripts/autorun.sc
deleted file mode 100644
index 19bcd4a4f..000000000
--- a/tools/mspsim/scripts/autorun.sc
+++ /dev/null
@@ -1,15 +0,0 @@
-# autorun script for MSPSim
-# - all commands will run after loaded firmware into MSPSim
-#log CC2420 >log.txt
-#printcalls >>log.txt
-
-# Install and activate the plugin 'ContikiChecker'
-# install ContikiChecker
-# contikichecker
-
-#start the nodegui service
-service -f controlgui start
-service -f nodegui start
-service -f serialgui start
-#service -f stackchart start
-start