Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
Adam Dunkels 2012-06-05 08:10:19 +02:00
commit 4a4efd0c32
9 changed files with 608 additions and 440 deletions

View file

@ -214,10 +214,9 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
this.myCpu.setMonitorExec(true); this.myCpu.setMonitorExec(true);
this.myCpu.setTrace(0); /* TODO Enable */ this.myCpu.setTrace(0); /* TODO Enable */
int[] memory = myCpu.memory;
logger.info("Loading firmware from: " + fileELF.getAbsolutePath()); logger.info("Loading firmware from: " + fileELF.getAbsolutePath());
GUI.setProgressMessage("Loading " + fileELF.getName()); GUI.setProgressMessage("Loading " + fileELF.getName());
node.loadFirmware(((MspMoteType)getType()).getELF(), memory); node.loadFirmware(((MspMoteType)getType()).getELF());
/* Throw exceptions at bad memory access */ /* Throw exceptions at bad memory access */
/*myCpu.setThrowIfWarning(true);*/ /*myCpu.setThrowIfWarning(true);*/
@ -417,6 +416,10 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
} }
MoteInterface moteInterface = getInterfaces().getInterfaceOfType(moteInterfaceClass); MoteInterface moteInterface = getInterfaces().getInterfaceOfType(moteInterfaceClass);
if (moteInterface == null) {
logger.fatal("Could not find mote interface of class: " + moteInterfaceClass);
return false;
}
moteInterface.setConfigXML(element.getChildren(), visAvailable); moteInterface.setConfigXML(element.getChildren(), visAvailable);
} }
} }

View file

@ -1,113 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<simconf> <simconf>
<project>../apps/mrm</project> <simulation>
<project>../apps/mspsim</project> <title>Hello World test (Cooja motes)</title>
<project>../apps/avrora</project> <randomseed>generated</randomseed>
<project>../apps/native_gateway</project> <motedelay_us>1000000</motedelay_us>
<simulation> <radiomedium>
<title>My simulation</title> se.sics.cooja.radiomediums.UDGM
<delaytime>0</delaytime> <transmitting_range>50.0</transmitting_range>
<randomseed>generated</randomseed> <interference_range>100.0</interference_range>
<motedelay_us>1000000</motedelay_us> <success_ratio_tx>1.0</success_ratio_tx>
<radiomedium> <success_ratio_rx>1.0</success_ratio_rx>
se.sics.cooja.radiomediums.UDGM </radiomedium>
<transmitting_range>50.0</transmitting_range> <events>
<interference_range>100.0</interference_range> <logoutput>40000</logoutput>
<success_ratio_tx>1.0</success_ratio_tx> </events>
<success_ratio_rx>1.0</success_ratio_rx> <motetype>
</radiomedium> se.sics.cooja.contikimote.ContikiMoteType
<motetype> <identifier>mtype725</identifier>
se.sics.cooja.contikimote.ContikiMoteType <description>Contiki Mote Type #1</description>
<identifier>mtype82</identifier> <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<description>Contiki Mote Type #1</description> <commands>make hello-world.cooja TARGET=cooja</commands>
<contikiapp>../../../examples/hello-world/hello-world.c</contikiapp> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<commands>make hello-world.cooja TARGET=cooja</commands> <moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Battery</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface> <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface> <moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface> <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface> <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface> <symbols>false</symbols>
<symbols>false</symbols> </motetype>
<commstack>Rime</commstack> <mote>
</motetype> <interface_config>
<mote> se.sics.cooja.interfaces.Position
se.sics.cooja.contikimote.ContikiMote <x>69.64867743029201</x>
<motetype_identifier>mtype82</motetype_identifier> <y>69.2570131081022</y>
<interface_config> <z>0.0</z>
se.sics.cooja.interfaces.Position </interface_config>
<x>69.64867743029201</x> <interface_config>
<y>69.2570131081022</y> se.sics.cooja.contikimote.interfaces.ContikiMoteID
<z>0.0</z> <id>1</id>
</interface_config> </interface_config>
<interface_config> <motetype_identifier>mtype725</motetype_identifier>
se.sics.cooja.interfaces.Battery </mote>
<infinite>false</infinite> </simulation>
</interface_config> <plugin>
<interface_config> se.sics.cooja.plugins.Visualizer
se.sics.cooja.contikimote.interfaces.ContikiMoteID <plugin_config>
<id>1</id> <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
</interface_config> <skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
</mote> <viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 59.68302051791636 6.039078992634368</viewport>
</simulation> </plugin_config>
<plugin> <width>259</width>
se.sics.cooja.plugins.Visualizer <z>1</z>
<plugin_config> <height>198</height>
<skin>Mote IDs</skin> <location_x>2</location_x>
<skin>Log output: printf()'s</skin> <location_y>203</location_y>
</plugin_config> </plugin>
<width>259</width> <plugin>
<z>1</z> se.sics.cooja.plugins.LogListener
<height>198</height> <plugin_config>
<location_x>2</location_x> <filter />
<location_y>203</location_y> </plugin_config>
<minimized>false</minimized> <width>259</width>
</plugin> <z>2</z>
<plugin> <height>217</height>
se.sics.cooja.plugins.LogListener <location_x>2</location_x>
<plugin_config> <location_y>403</location_y>
<filter /> </plugin>
</plugin_config> <plugin>
<width>259</width> se.sics.cooja.plugins.SimControl
<z>2</z> <width>259</width>
<height>217</height> <z>3</z>
<location_x>2</location_x> <height>200</height>
<location_y>403</location_y> <location_x>2</location_x>
<minimized>false</minimized> <location_y>3</location_y>
</plugin> </plugin>
<plugin> <plugin>
se.sics.cooja.plugins.SimControl se.sics.cooja.plugins.ScriptRunner
<width>259</width> <plugin_config>
<z>3</z> <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
<height>200</height> <active>true</active>
<location_x>2</location_x> </plugin_config>
<location_y>3</location_y> <width>592</width>
<minimized>false</minimized> <z>0</z>
</plugin> <height>618</height>
<plugin> <location_x>318</location_x>
se.sics.cooja.plugins.ScriptRunner <location_y>61</location_y>
<plugin_config> </plugin>
<script>TIMEOUT(2000, log.log("last message: " + msg + "\n")); </simconf>
WAIT_UNTIL(msg.equals('Hello, world'));
log.testOK();</script>
<active>true</active>
</plugin_config>
<width>592</width>
<z>0</z>
<height>618</height>
<location_x>264</location_x>
<location_y>3</location_y>
<minimized>false</minimized>
</plugin>
</simconf>

View file

@ -1,125 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<simconf> <simconf>
<project>[CONTIKI_DIR]/tools/cooja/apps/mrm</project> <simulation>
<project>[CONTIKI_DIR]/tools/cooja/apps/mspsim</project> <title>Hello World (ESB)</title>
<project>[CONTIKI_DIR]/tools/cooja/apps/avrora</project> <randomseed>generated</randomseed>
<simulation> <motedelay_us>1000000</motedelay_us>
<title>My simulation</title> <radiomedium>
<delaytime>0</delaytime> se.sics.cooja.radiomediums.UDGM
<randomseed>generated</randomseed> <transmitting_range>50.0</transmitting_range>
<motedelay_us>1000000</motedelay_us> <interference_range>100.0</interference_range>
<radiomedium> <success_ratio_tx>1.0</success_ratio_tx>
se.sics.cooja.radiomediums.UDGM <success_ratio_rx>1.0</success_ratio_rx>
<transmitting_range>50.0</transmitting_range> </radiomedium>
<interference_range>100.0</interference_range> <events>
<success_ratio_tx>1.0</success_ratio_tx> <logoutput>40000</logoutput>
<success_ratio_rx>1.0</success_ratio_rx> </events>
</radiomedium> <motetype>
<events> se.sics.cooja.mspmote.ESBMoteType
<logoutput>40000</logoutput> <identifier>esb1</identifier>
</events> <description>ESB Mote Type #esb1</description>
<motetype> <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
se.sics.cooja.mspmote.ESBMoteType <commands EXPORT="discard">make hello-world.esb TARGET=esb</commands>
<identifier>esb1</identifier> <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.esb</firmware>
<description>ESB Mote Type #esb1</description> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source> <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<commands>make clean TARGET=esb <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
make hello-world.esb TARGET=esb</commands> <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
<firmware>[CONTIKI_DIR]/examples/hello-world/hello-world.esb</firmware> <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.ESBLED</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.ESBButton</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.TR1001Radio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface> <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.ESBLED</moteinterface> <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.ESBButton</moteinterface> </motetype>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface> <mote>
<moteinterface>se.sics.cooja.mspmote.interfaces.TR1001Radio</moteinterface> <breakpoints />
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface> <interface_config>
</motetype> se.sics.cooja.interfaces.Position
<mote> <x>57.296459690977144</x>
se.sics.cooja.mspmote.ESBMote <y>73.20759478605089</y>
<breakpoints /> <z>0.0</z>
<interface_config> </interface_config>
se.sics.cooja.interfaces.Position <interface_config>
<x>57.296459690977144</x> se.sics.cooja.mspmote.interfaces.MspMoteID
<y>73.20759478605089</y> <id>1</id>
<z>0.0</z> </interface_config>
</interface_config> <motetype_identifier>esb1</motetype_identifier>
<interface_config> </mote>
se.sics.cooja.mspmote.interfaces.MspMoteID </simulation>
<id>1</id> <plugin>
</interface_config> se.sics.cooja.plugins.LogListener
<motetype_identifier>esb1</motetype_identifier> <plugin_config>
</mote> <filter />
</simulation> </plugin_config>
<plugin> <width>623</width>
se.sics.cooja.plugins.SimControl <z>1</z>
<width>259</width> <height>270</height>
<z>6</z> <location_x>29</location_x>
<height>184</height> <location_y>256</location_y>
<location_x>60</location_x> </plugin>
<location_y>60</location_y> <plugin>
<minimized>false</minimized> se.sics.cooja.plugins.ScriptRunner
</plugin> <plugin_config>
<plugin> <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
se.sics.cooja.plugins.Visualizer <active>true</active>
<plugin_config> </plugin_config>
<skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin> <width>600</width>
<skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin> <z>0</z>
<viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 91.91230937183896 53.4476411035901</viewport> <height>453</height>
</plugin_config> <location_x>337</location_x>
<width>300</width> <location_y>25</location_y>
<z>3</z> </plugin>
<height>300</height> <plugin>
<location_x>945</location_x> se.sics.cooja.plugins.SimControl
<location_y>0</location_y> <width>280</width>
<minimized>false</minimized> <z>2</z>
</plugin> <height>160</height>
<plugin> <location_x>20</location_x>
se.sics.cooja.plugins.LogListener <location_y>23</location_y>
<plugin_config> </plugin>
<filter /> </simconf>
</plugin_config>
<width>1245</width>
<z>5</z>
<height>150</height>
<location_x>0</location_x>
<location_y>530</location_y>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.TimeLine
<plugin_config>
<mote>0</mote>
<showRadioRXTX />
<showRadioHW />
<showLEDs />
<split>109</split>
<zoom>9</zoom>
</plugin_config>
<width>1245</width>
<z>1</z>
<height>150</height>
<location_x>0</location_x>
<location_y>680</location_y>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
<plugin_config>
<script>TIMEOUT(5000, log.log("last message: " + msg + "\n"));
WAIT_UNTIL(msg.equals('Hello, world'));
log.testOK();</script>
<active>true</active>
</plugin_config>
<width>600</width>
<z>0</z>
<height>453</height>
<location_x>337</location_x>
<location_y>25</location_y>
<minimized>false</minimized>
</plugin>
</simconf>

View file

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<simconf>
<simulation>
<title>Hello World (Exp5438)</title>
<randomseed>generated</randomseed>
<motedelay_us>1000000</motedelay_us>
<radiomedium>
se.sics.cooja.radiomediums.UDGM
<transmitting_range>50.0</transmitting_range>
<interference_range>100.0</interference_range>
<success_ratio_tx>1.0</success_ratio_tx>
<success_ratio_rx>1.0</success_ratio_rx>
</radiomedium>
<events>
<logoutput>40000</logoutput>
</events>
<motetype>
se.sics.cooja.mspmote.Exp5438MoteType
<identifier>exp5438#1</identifier>
<description>Exp5438 Mote Type exp5438#1</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<commands EXPORT="discard">make hello-world.exp5438 TARGET=exp5438</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.exp5438</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.UsciA1Serial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.Exp5438LED</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
</motetype>
<mote>
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
<x>26.321738050614275</x>
<y>34.93092009073432</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
<id>1</id>
</interface_config>
<motetype_identifier>exp5438#1</motetype_identifier>
</mote>
</simulation>
<plugin>
se.sics.cooja.plugins.SimControl
<width>280</width>
<z>2</z>
<height>160</height>
<location_x>38</location_x>
<location_y>49</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.LogListener
<plugin_config>
<filter />
</plugin_config>
<width>680</width>
<z>1</z>
<height>240</height>
<location_x>86</location_x>
<location_y>384</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
<plugin_config>
<scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
<active>true</active>
</plugin_config>
<width>600</width>
<z>0</z>
<height>700</height>
<location_x>347</location_x>
<location_y>21</location_y>
</plugin>
</simconf>

View file

@ -0,0 +1,9 @@
TIMEOUT(5000);
while(true) {
log.log("> " + msg + "\n");
if (msg.equals('Hello, world')) {
log.testOK();
}
YIELD();
}

View file

@ -1,120 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<simconf> <simconf>
<project>../apps/mrm</project> <simulation>
<project>../apps/mspsim</project> <title>Hello World (MicaZ)</title>
<project>../apps/avrora</project> <randomseed>generated</randomseed>
<simulation> <motedelay_us>1000000</motedelay_us>
<title>My simulation</title> <radiomedium>
<delaytime>0</delaytime> se.sics.cooja.radiomediums.UDGM
<randomseed>generated</randomseed> <transmitting_range>50.0</transmitting_range>
<motedelay_us>1000000</motedelay_us> <interference_range>100.0</interference_range>
<radiomedium> <success_ratio_tx>1.0</success_ratio_tx>
se.sics.cooja.radiomediums.UDGM <success_ratio_rx>1.0</success_ratio_rx>
<transmitting_range>50.0</transmitting_range> </radiomedium>
<interference_range>100.0</interference_range> <events>
<success_ratio_tx>1.0</success_ratio_tx> <logoutput>40000</logoutput>
<success_ratio_rx>1.0</success_ratio_rx> </events>
</radiomedium> <motetype>
<events> se.sics.cooja.avrmote.MicaZMoteType
<logoutput>40000</logoutput> <identifier>micaz1</identifier>
</events> <description>MicaZ Mote Type #micaz1</description>
<motetype> <source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
se.sics.cooja.avrmote.MicaZMoteType <commands>make hello-world.elf TARGET=micaz</commands>
<identifier>micaz1</identifier> <firmware>[CONTIKI_DIR]/examples/hello-world/hello-world.elf</firmware>
<description>MicaZ Mote Type #micaz1</description> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<source>../../../examples/hello-world/hello-world.c</source> <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZID</moteinterface>
<commands>make clean TARGET=micaz <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZLED</moteinterface>
make hello-world.elf TARGET=micaz</commands> <moteinterface>se.sics.cooja.avrmote.interfaces.MicaZRadio</moteinterface>
<firmware>../../../examples/hello-world/hello-world.elf</firmware> <moteinterface>se.sics.cooja.avrmote.interfaces.MicaClock</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.avrmote.interfaces.MicaSerial</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaZID</moteinterface> <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaZLED</moteinterface> <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaZRadio</moteinterface> </motetype>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaClock</moteinterface> <mote>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaSerial</moteinterface> <interface_config>
</motetype> se.sics.cooja.interfaces.Position
<mote> <x>36.478849033811386</x>
se.sics.cooja.avrmote.MicaZMote <y>97.17795415366507</y>
<motetype_identifier>micaz1</motetype_identifier> <z>0.0</z>
<interface_config> </interface_config>
se.sics.cooja.interfaces.Position <interface_config>
<x>68.44103812985554</x> se.sics.cooja.avrmote.interfaces.MicaZID
<y>35.6791174319418</y> <id>1</id>
<z>0.0</z> </interface_config>
</interface_config> <motetype_identifier>micaz1</motetype_identifier>
<interface_config> </mote>
se.sics.cooja.avrmote.interfaces.MicaZID </simulation>
<id>1</id> <plugin>
</interface_config> se.sics.cooja.plugins.SimControl
</mote> <width>280</width>
</simulation> <z>2</z>
<plugin> <height>160</height>
se.sics.cooja.plugins.SimControl <location_x>17</location_x>
<width>259</width> <location_y>16</location_y>
<z>4</z> </plugin>
<height>184</height> <plugin>
<location_x>0</location_x> se.sics.cooja.plugins.LogListener
<location_y>0</location_y> <plugin_config>
<minimized>false</minimized> <filter />
</plugin> </plugin_config>
<plugin> <width>680</width>
se.sics.cooja.plugins.Visualizer <z>1</z>
<plugin_config> <height>240</height>
<skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin> <location_x>20</location_x>
<skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin> <location_y>285</location_y>
<viewport>0.9090909090909091 0.0 0.0 0.9090909090909091 81.78087442740406 87.56443869823474</viewport> </plugin>
</plugin_config> <plugin>
<width>300</width> se.sics.cooja.plugins.ScriptRunner
<z>1</z> <plugin_config>
<height>300</height> <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
<location_x>456</location_x> <active>true</active>
<location_y>0</location_y> </plugin_config>
<minimized>false</minimized> <width>600</width>
</plugin> <z>0</z>
<plugin> <height>535</height>
se.sics.cooja.plugins.LogListener <location_x>403</location_x>
<plugin_config> <location_y>23</location_y>
<filter /> </plugin>
</plugin_config> </simconf>
<width>756</width>
<z>2</z>
<height>150</height>
<location_x>0</location_x>
<location_y>286</location_y>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.TimeLine
<plugin_config>
<mote>0</mote>
<showRadioRXTX />
<showRadioHW />
<showLEDs />
<split>109</split>
<zoom>9</zoom>
</plugin_config>
<width>756</width>
<z>3</z>
<height>150</height>
<location_x>0</location_x>
<location_y>436</location_y>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
<plugin_config>
<script>TIMEOUT(2000, log.log("last message: " + msg + "\n"));
WAIT_UNTIL(msg.startsWith('Hello, world'));
log.testOK();</script>
<active>true</active>
</plugin_config>
<width>600</width>
<z>0</z>
<height>305</height>
<location_x>89</location_x>
<location_y>211</location_y>
<minimized>false</minimized>
</plugin>
</simconf>

View file

@ -1,80 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<simconf> <simconf>
<project>../apps/mrm</project> <simulation>
<project>../apps/mspsim</project> <title>Hello World test (Sky)</title>
<project>../apps/avrora</project> <randomseed>generated</randomseed>
<project>../apps/native_gateway</project> <motedelay_us>1000000</motedelay_us>
<simulation> <radiomedium>
<title>Hello World (Sky)</title> se.sics.cooja.radiomediums.UDGM
<delaytime>0</delaytime> <transmitting_range>50.0</transmitting_range>
<randomseed>generated</randomseed> <interference_range>100.0</interference_range>
<motedelay_us>1000000</motedelay_us> <success_ratio_tx>1.0</success_ratio_tx>
<radiomedium> <success_ratio_rx>1.0</success_ratio_rx>
se.sics.cooja.radiomediums.UDGM </radiomedium>
<transmitting_range>50.0</transmitting_range> <events>
<interference_range>100.0</interference_range> <logoutput>40000</logoutput>
<success_ratio_tx>1.0</success_ratio_tx> </events>
<success_ratio_rx>1.0</success_ratio_rx> <motetype>
</radiomedium> se.sics.cooja.mspmote.SkyMoteType
<motetype> <identifier>sky1</identifier>
se.sics.cooja.mspmote.SkyMoteType <description>Sky Mote Type #1</description>
<identifier>sky1</identifier> <source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<description>Sky Mote Type #1</description> <commands EXPORT="discard">make hello-world.sky TARGET=sky</commands>
<source>../../../examples/hello-world/hello-world.c</source> <firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.sky</firmware>
<commands>make clean TARGET=sky <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
make hello-world.sky TARGET=sky</commands> <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
<firmware>../../../examples/hello-world/hello-world.sky</firmware> <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface> </motetype>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface> <mote>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface> <breakpoints />
</motetype> <interface_config>
<mote> se.sics.cooja.interfaces.Position
se.sics.cooja.mspmote.SkyMote <x>64.11203103628397</x>
<motetype_identifier>sky1</motetype_identifier> <y>93.06735634828134</y>
<breakpoints /> <z>0.0</z>
<interface_config> </interface_config>
se.sics.cooja.interfaces.Position <interface_config>
<x>64.11203103628397</x> se.sics.cooja.mspmote.interfaces.MspMoteID
<y>93.06735634828134</y> <id>1</id>
<z>0.0</z> </interface_config>
</interface_config> <motetype_identifier>sky1</motetype_identifier>
<interface_config> </mote>
se.sics.cooja.mspmote.interfaces.MspMoteID </simulation>
<id>1</id> <plugin>
</interface_config> se.sics.cooja.plugins.ScriptRunner
</mote> <plugin_config>
</simulation> <scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
<plugin> <active>true</active>
se.sics.cooja.plugins.SimControl </plugin_config>
<width>248</width> <width>541</width>
<z>1</z> <z>0</z>
<height>200</height> <height>448</height>
<location_x>0</location_x> <location_x>299</location_x>
<location_y>0</location_y> <location_y>7</location_y>
<minimized>false</minimized> </plugin>
</plugin> <plugin>
<plugin> se.sics.cooja.plugins.SimControl
se.sics.cooja.plugins.ScriptRunner <width>280</width>
<plugin_config> <z>2</z>
<script>TIMEOUT(2000, log.log("last message: " + msg + "\n")); <height>160</height>
<location_x>7</location_x>
WAIT_UNTIL(msg.equals('Hello, world')); <location_y>10</location_y>
log.testOK();</script> </plugin>
<active>true</active> <plugin>
</plugin_config> se.sics.cooja.plugins.LogListener
<width>541</width> <plugin_config>
<z>0</z> <filter />
<height>448</height> </plugin_config>
<location_x>248</location_x> <width>680</width>
<location_y>-1</location_y> <z>1</z>
<minimized>false</minimized> <height>240</height>
</plugin> <location_x>51</location_x>
</simconf> <location_y>288</location_y>
</plugin>
</simconf>

View file

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<simconf>
<simulation>
<title>Hello World (Wismote)</title>
<randomseed>generated</randomseed>
<motedelay_us>1000000</motedelay_us>
<radiomedium>
se.sics.cooja.radiomediums.UDGM
<transmitting_range>50.0</transmitting_range>
<interference_range>100.0</interference_range>
<success_ratio_tx>1.0</success_ratio_tx>
<success_ratio_rx>1.0</success_ratio_rx>
</radiomedium>
<events>
<logoutput>40000</logoutput>
</events>
<motetype>
se.sics.cooja.mspmote.WismoteMoteType
<identifier>wismote1</identifier>
<description>Wismote Mote Type #wismote1</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<commands EXPORT="discard">make hello-world.wismote TARGET=wismote</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.wismote</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspButton</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDefaultSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspLED</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
</motetype>
<mote>
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
<x>36.76551518369201</x>
<y>29.330591009779383</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
<id>1</id>
</interface_config>
<motetype_identifier>wismote1</motetype_identifier>
</mote>
</simulation>
<plugin>
se.sics.cooja.plugins.SimControl
<width>280</width>
<z>2</z>
<height>160</height>
<location_x>22</location_x>
<location_y>14</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.LogListener
<plugin_config>
<filter />
</plugin_config>
<width>680</width>
<z>1</z>
<height>240</height>
<location_x>84</location_x>
<location_y>408</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
<plugin_config>
<scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
<active>true</active>
</plugin_config>
<width>600</width>
<z>0</z>
<height>548</height>
<location_x>335</location_x>
<location_y>22</location_y>
</plugin>
</simconf>

View file

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<simconf>
<simulation>
<title>Hello World (Z1)</title>
<randomseed>generated</randomseed>
<motedelay_us>1000000</motedelay_us>
<radiomedium>
se.sics.cooja.radiomediums.UDGM
<transmitting_range>50.0</transmitting_range>
<interference_range>100.0</interference_range>
<success_ratio_tx>1.0</success_ratio_tx>
<success_ratio_rx>1.0</success_ratio_rx>
</radiomedium>
<events>
<logoutput>40000</logoutput>
</events>
<motetype>
se.sics.cooja.mspmote.Z1MoteType
<identifier>z11</identifier>
<description>Z1 Mote Type #z11</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<commands EXPORT="discard">make hello-world.z1 TARGET=z1</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.z1</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDefaultSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspLED</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
</motetype>
<mote>
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
<x>94.96401380574989</x>
<y>21.247662337471553</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
<id>1</id>
</interface_config>
<motetype_identifier>z11</motetype_identifier>
</mote>
</simulation>
<plugin>
se.sics.cooja.plugins.SimControl
<width>280</width>
<z>2</z>
<height>160</height>
<location_x>38</location_x>
<location_y>13</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.LogListener
<plugin_config>
<filter />
</plugin_config>
<width>680</width>
<z>1</z>
<height>240</height>
<location_x>109</location_x>
<location_y>377</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
<plugin_config>
<scriptfile>[CONFIG_DIR]/hello-world.js</scriptfile>
<active>true</active>
</plugin_config>
<width>600</width>
<z>0</z>
<height>700</height>
<location_x>330</location_x>
<location_y>24</location_y>
</plugin>
</simconf>