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

70
examples/hello-world/hello-world-example.csc
View file

@ -14,7 +14,7 @@
<randomseed>123456</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>
@ -24,74 +24,74 @@
<logoutput>40000</logoutput>
</events>
<motetype>
se.sics.cooja.mspmote.SkyMoteType
org.contikios.cooja.mspmote.SkyMoteType
<identifier>sky1</identifier>
<description>Hello world sky</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<commands EXPORT="discard">make hello-world.sky TARGET=sky</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/hello-world/hello-world.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.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.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.MspSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</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.interfaces.MoteAttributes</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.MspSerial</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
<moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
</motetype>
<motetype>
se.sics.cooja.avrmote.MicaZMoteType
org.contikios.cooja.avrmote.MicaZMoteType
<identifier>micaz1</identifier>
<description>Hello world micaz</description>
<source>[CONTIKI_DIR]/examples/hello-world/hello-world.c</source>
<commands>make hello-world.elf TARGET=micaz</commands>
<firmware>[CONTIKI_DIR]/examples/hello-world/hello-world.elf</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaZID</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaZLED</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaZRadio</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaClock</moteinterface>
<moteinterface>se.sics.cooja.avrmote.interfaces.MicaSerial</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
<moteinterface>org.contikios.cooja.avrmote.interfaces.MicaZID</moteinterface>
<moteinterface>org.contikios.cooja.avrmote.interfaces.MicaZLED</moteinterface>
<moteinterface>org.contikios.cooja.avrmote.interfaces.MicaZRadio</moteinterface>
<moteinterface>org.contikios.cooja.avrmote.interfaces.MicaClock</moteinterface>
<moteinterface>org.contikios.cooja.avrmote.interfaces.MicaSerial</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
<moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
</motetype>
<mote>
<breakpoints />
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>93.1576842462532</x>
<y>12.110654409141041</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>
<interface_config>
se.sics.cooja.interfaces.Position
org.contikios.cooja.interfaces.Position
<x>24.27184344020801</x>
<y>51.304686914739605</y>
<z>0.0</z>
</interface_config>
<interface_config>
se.sics.cooja.avrmote.interfaces.MicaZID
org.contikios.cooja.avrmote.interfaces.MicaZID
<id>2</id>
</interface_config>
<motetype_identifier>micaz1</motetype_identifier>
</mote>
</simulation>
<plugin>
se.sics.cooja.plugins.SimControl
org.contikios.cooja.plugins.SimControl
<width>318</width>
<z>0</z>
<height>192</height>
@ -99,10 +99,10 @@
<location_y>0</location_y>
</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.MoteTypeVisualizerSkin</skin>
<skin>org.contikios.cooja.plugins.skins.IDVisualizerSkin</skin>
<skin>org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
<viewport>3.8271488095595365 0.0 0.0 3.8271488095595365 -79.7101385461893 -0.34997402775074654</viewport>
</plugin_config>
<width>300</width>
@ -112,7 +112,7 @@
<location_y>4</location_y>
</plugin>
<plugin>
se.sics.cooja.plugins.LogListener
org.contikios.cooja.plugins.LogListener
<plugin_config>
<filter />
</plugin_config>