Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1869 from nfi/cooja-export-simulations-with-wismote-and-z1

Browse Source 
Added support in Cooja to include Wismote and Z1 motes when exporting simulations
This commit is contained in:
Antonio Lignan 2016-09-22 12:26:11 +02:00 committed by GitHub
commit 6aa5890e73
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/cooja/java/org/contikios/cooja/util/ExecuteJAR.java
View File

@ -222,13 +222,20 @@ public class ExecuteJAR {
/* Check dependencies: mote type */ /* Check dependencies: mote type */
for (MoteType t: simulation.getMoteTypes()) { for (MoteType t: simulation.getMoteTypes()) {
if (!t.getClass().getName().contains("SkyMoteType")) {
throw new RuntimeException(
"You simulation contains the mote type: " + Cooja.getDescriptionOf(t.getClass()) + "\n" +
"Only the Sky Mote Type is currently supported.\n"
);
}
logger.info("Checking mote types: '" + Cooja.getDescriptionOf(t.getClass()) + "'"); logger.info("Checking mote types: '" + Cooja.getDescriptionOf(t.getClass()) + "'");
if (t.getClass().getName().endsWith("SkyMoteType")) {
continue;
}
if (t.getClass().getName().endsWith("WismoteMoteType")) {
continue;
}
if (t.getClass().getName().endsWith("Z1MoteType")) {
continue;
}
throw new RuntimeException(
"Your simulation contains the mote type: " + Cooja.getDescriptionOf(t.getClass()) + "\n" +
"Only the Sky, Wismote, and Z1 mote types are currently supported.\n"
);
} }
/* Check dependencies: Contiki Control Plugin */ /* Check dependencies: Contiki Control Plugin */