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

72
regression-tests/06-shell/03-sky-shell-sendcmd.csc
View file

@ -9,7 +9,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>
@ -19,90 +19,90 @@
<logoutput>40000</logoutput>
</events>
<motetype>
se.sics.cooja.mspmote.SkyMoteType
org.contikios.cooja.mspmote.SkyMoteType
<identifier>sky1</identifier>
<description>Sky Mote Type #sky1</description>
<source>[CONTIKI_DIR]/examples/sky-shell/sky-checkpoint.c</source>
<commands>make clean TARGET=sky
make sky-checkpoint.sky TARGET=sky</commands>
<firmware>[CONTIKI_DIR]/examples/sky-shell/sky-checkpoint.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</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.SkyByteRadio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Position</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.SkyByteRadio</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
</motetype>
<mote>
se.sics.cooja.mspmote.SkyMote
org.contikios.cooja.mspmote.SkyMote
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>85.95630230780736</x>
<y>-3.1198604890271326</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>
<motetype_identifier>sky1</motetype_identifier>
</mote>
<mote>
se.sics.cooja.mspmote.SkyMote
org.contikios.cooja.mspmote.SkyMote
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>49.907666469432186</x>
<y>13.102030707681678</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>
<motetype_identifier>sky1</motetype_identifier>
</mote>
<mote>
se.sics.cooja.mspmote.SkyMote
org.contikios.cooja.mspmote.SkyMote
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>63.205651488651284</x>
<y>29.26179327208891</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.MspMoteID
<id>3</id>
</interface_config>
<motetype_identifier>sky1</motetype_identifier>
</mote>
<mote>
se.sics.cooja.mspmote.SkyMote
org.contikios.cooja.mspmote.SkyMote
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>30.60420340759257</x>
<y>44.54754287360952</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.MspMoteID
<id>4</id>
</interface_config>
<motetype_identifier>sky1</motetype_identifier>
</mote>
</simulation>
<plugin>
se.sics.cooja.plugins.SimControl
org.contikios.cooja.plugins.SimControl
<width>248</width>
<z>2</z>
<height>200</height>
@ -111,12 +111,12 @@ make sky-checkpoint.sky TARGET=sky</commands>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.Visualizer
org.contikios.cooja.plugins.Visualizer
<plugin_config>
<skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
<skin>se.sics.cooja.plugins.skins.LogVisualizerSkin</skin>
<skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
<skin>se.sics.cooja.plugins.skins.TrafficVisualizerSkin</skin>
<skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
<skin>org.contikios.cooja.plugins.skins.LogVisualizerSkin</skin>
<skin>org.contikios.cooja.plugins.skins.UDGMVisualizerSkin</skin>
<skin>org.contikios.cooja.plugins.skins.TrafficVisualizerSkin</skin>
<viewport>2.126765951505188 0.0 0.0 2.126765951505188 -7.584821059232853 59.46165934250099</viewport>
</plugin_config>
<width>246</width>
@ -127,7 +127,7 @@ make sky-checkpoint.sky TARGET=sky</commands>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.LogListener
org.contikios.cooja.plugins.LogListener
<plugin_config>
<filter>Sending</filter>
</plugin_config>
@ -139,7 +139,7 @@ make sky-checkpoint.sky TARGET=sky</commands>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.ScriptRunner
org.contikios.cooja.plugins.ScriptRunner
<plugin_config>
<script>TIMEOUT(150000);
@ -193,7 +193,7 @@ log.testOK(); /* Report test success and quit */</script>
<minimized>false</minimized>
</plugin>
<plugin>
se.sics.cooja.plugins.TimeLine
org.contikios.cooja.plugins.TimeLine
<plugin_config>
<mote>0</mote>
<mote>1</mote>