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

Renamed Java packages to match our contiki-os.org domain. Note that this commit does not affect external dependencies

Browse source 
like /tools/mspsim.

This is a very simple modification that affects a very large number of files in Contiki: Cooja,
/platform/cooja, Collect-view, Coffe-manager, and Cooja simulation files (.csc).

I've gone through Contiki to update all references I could find. Nevertheless, this commit will likely
break external dependencies, like saved Cooja simulation files.
This commit is contained in:
Fredrik Osterlind 2013-11-19 12:17:37 +01:00
parent 2a9283884c
commit b5c94910ac
400 changed files with 8446 additions and 8458 deletions
Download patch file Download diff file Expand all files Collapse all files

48
regression-tests/05-netperf/03-sky-netperf-cxmac.csc
View file

@ -10,7 +10,7 @@
<randomseed>generated</randomseed>
<motedelay_us>1000000</motedelay_us>
<radiomedium>
se.sics.cooja.radiomediums.UDGM
org.contikios.cooja.radiomediums.UDGM
<transmitting_range>50.0</transmitting_range>
<interference_range>100.0</interference_range>
<success_ratio_tx>1.0</success_ratio_tx>
@ -20,59 +20,59 @@
<logoutput>40000</logoutput>
</events>
<motetype>
se.sics.cooja.mspmote.SkyMoteType
org.contikios.cooja.mspmote.SkyMoteType
<identifier>sky1</identifier>
<description>netperf shell</description>
<source>[CONTIKI_DIR]/examples/netperf/netperf-shell.c</source>
<commands>make clean TARGET=sky
make DEFINES=NETSTACK_RDC=cxmac_driver netperf-shell.sky TARGET=sky</commands>
<firmware>[CONTIKI_DIR]/examples/netperf/netperf-shell.sky</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.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkySerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkySerial</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
</motetype>
<mote>
se.sics.cooja.mspmote.SkyMote
org.contikios.cooja.mspmote.SkyMote
<motetype_identifier>sky1</motetype_identifier>
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>49.48292285385544</x>
<y>97.67000744426045</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.MspMoteID
<id>1</id>
</interface_config>
</mote>
<mote>
se.sics.cooja.mspmote.SkyMote
org.contikios.cooja.mspmote.SkyMote
<motetype_identifier>sky1</motetype_identifier>
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>80.21380569499377</x>
<y>98.51039574575084</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.MspMoteID
<id>2</id>
</interface_config>
</mote>
</simulation>
<plugin>
se.sics.cooja.plugins.SimControl
org.contikios.cooja.plugins.SimControl
<width>290</width>
<z>2</z>
<height>172</height>
@ -81,7 +81,7 @@ make DEFINES=NETSTACK_RDC=cxmac_driver netperf-shell.sky TARGET=sky</commands>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.LogListener
org.contikios.cooja.plugins.LogListener
<plugin_config>
<filter />
</plugin_config>
@ -93,7 +93,7 @@ make DEFINES=NETSTACK_RDC=cxmac_driver netperf-shell.sky TARGET=sky</commands>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.TimeLine
org.contikios.cooja.plugins.TimeLine
<plugin_config>
<mote>0</mote>
<mote>1</mote>
@ -111,7 +111,7 @@ make DEFINES=NETSTACK_RDC=cxmac_driver netperf-shell.sky TARGET=sky</commands>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
org.contikios.cooja.plugins.ScriptRunner
<plugin_config>
<script>TIMEOUT(100000);
started = 0;