From 470b93c79f744bf6b2becae4ba820ba89f183bc2 Mon Sep 17 00:00:00 2001 From: joxe Date: Thu, 18 Feb 2010 11:13:20 +0000 Subject: [PATCH] added mote attributes to various types of motes --- .../src/se/sics/cooja/avrmote/MicaZMoteType.java | 8 ++++++-- .../src/se/sics/cooja/mspmote/ESBMoteType.java | 6 ++++-- .../src/se/sics/cooja/mspmote/SkyMoteType.java | 4 +++- tools/cooja/build.xml | 14 ++++++++++++++ tools/cooja/config/cooja_default.config | 2 +- .../cooja/motes/AbstractApplicationMoteType.java | 8 ++++++-- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java index b5654de90..c5eac986e 100644 --- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java +++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MicaZMoteType.java,v 1.7 2009/10/30 09:42:50 fros4943 Exp $ + * $Id: MicaZMoteType.java,v 1.8 2010/02/18 11:13:20 joxe Exp $ */ package se.sics.cooja.avrmote; @@ -66,6 +66,8 @@ import se.sics.cooja.avrmote.interfaces.MicaZRadio; import se.sics.cooja.dialogs.CompileContiki; import se.sics.cooja.dialogs.MessageList; import se.sics.cooja.dialogs.MessageList.MessageContainer; +import se.sics.cooja.interfaces.Mote2MoteRelations; +import se.sics.cooja.interfaces.MoteAttributes; import se.sics.cooja.interfaces.Position; /** @@ -419,7 +421,9 @@ public class MicaZMoteType implements MoteType { MicaZLED.class, MicaZRadio.class, MicaClock.class, - MicaSerial.class + MicaSerial.class, + Mote2MoteRelations.class, + MoteAttributes.class }; } diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java index aee64e90d..286805ec3 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ESBMoteType.java,v 1.12 2009/12/02 17:12:32 fros4943 Exp $ + * $Id: ESBMoteType.java,v 1.13 2010/02/18 11:13:21 joxe Exp $ */ package se.sics.cooja.mspmote; @@ -43,6 +43,7 @@ import se.sics.cooja.dialogs.MessageList; import se.sics.cooja.dialogs.MessageList.MessageContainer; import se.sics.cooja.interfaces.IPAddress; import se.sics.cooja.interfaces.Mote2MoteRelations; +import se.sics.cooja.interfaces.MoteAttributes; import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.RimeAddress; import se.sics.cooja.mspmote.interfaces.ESBButton; @@ -198,7 +199,8 @@ public class ESBMoteType extends MspMoteType { ESBButton.class, MspMoteID.class, TR1001Radio.class, - Mote2MoteRelations.class + Mote2MoteRelations.class, + MoteAttributes.class }; } diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java index 85b670e85..3ca2a6c5d 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SkyMoteType.java,v 1.15 2010/02/12 09:34:49 fros4943 Exp $ + * $Id: SkyMoteType.java,v 1.16 2010/02/18 11:13:21 joxe Exp $ */ package se.sics.cooja.mspmote; @@ -55,6 +55,7 @@ import se.sics.cooja.dialogs.MessageList; import se.sics.cooja.dialogs.MessageList.MessageContainer; import se.sics.cooja.interfaces.IPAddress; import se.sics.cooja.interfaces.Mote2MoteRelations; +import se.sics.cooja.interfaces.MoteAttributes; import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.RimeAddress; import se.sics.cooja.mspmote.interfaces.MspClock; @@ -208,6 +209,7 @@ public class SkyMoteType extends MspMoteType { RimeAddress.class, IPAddress.class, Mote2MoteRelations.class, + MoteAttributes.class, MspClock.class, MspMoteID.class, SkyButton.class, diff --git a/tools/cooja/build.xml b/tools/cooja/build.xml index 81178c48e..47fc78853 100644 --- a/tools/cooja/build.xml +++ b/tools/cooja/build.xml @@ -117,6 +117,20 @@ The COOJA Simulator + + + + + + + + + + + + + + diff --git a/tools/cooja/config/cooja_default.config b/tools/cooja/config/cooja_default.config index 75ea9b87b..bd57c6a85 100644 --- a/tools/cooja/config/cooja_default.config +++ b/tools/cooja/config/cooja_default.config @@ -1,6 +1,6 @@ se.sics.cooja.contikimote.interfaces.ContikiRadio.RADIO_TRANSMISSION_RATE_kbps = 250 -se.sics.cooja.contikimote.ContikiMoteType.MOTE_INTERFACES = se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.Battery se.sics.cooja.contikimote.interfaces.ContikiVib se.sics.cooja.contikimote.interfaces.ContikiMoteID se.sics.cooja.contikimote.interfaces.ContikiRS232 se.sics.cooja.contikimote.interfaces.ContikiBeeper se.sics.cooja.interfaces.RimeAddress se.sics.cooja.contikimote.interfaces.ContikiIPAddress se.sics.cooja.contikimote.interfaces.ContikiRadio se.sics.cooja.contikimote.interfaces.ContikiButton se.sics.cooja.contikimote.interfaces.ContikiPIR se.sics.cooja.contikimote.interfaces.ContikiClock se.sics.cooja.contikimote.interfaces.ContikiLED se.sics.cooja.contikimote.interfaces.ContikiCFS se.sics.cooja.interfaces.Mote2MoteRelations +se.sics.cooja.contikimote.ContikiMoteType.MOTE_INTERFACES = se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.Battery se.sics.cooja.contikimote.interfaces.ContikiVib se.sics.cooja.contikimote.interfaces.ContikiMoteID se.sics.cooja.contikimote.interfaces.ContikiRS232 se.sics.cooja.contikimote.interfaces.ContikiBeeper se.sics.cooja.interfaces.RimeAddress se.sics.cooja.contikimote.interfaces.ContikiIPAddress se.sics.cooja.contikimote.interfaces.ContikiRadio se.sics.cooja.contikimote.interfaces.ContikiButton se.sics.cooja.contikimote.interfaces.ContikiPIR se.sics.cooja.contikimote.interfaces.ContikiClock se.sics.cooja.contikimote.interfaces.ContikiLED se.sics.cooja.contikimote.interfaces.ContikiCFS se.sics.cooja.interfaces.Mote2MoteRelations se.sics.cooja.interfaces.MoteAttributes se.sics.cooja.contikimote.ContikiMoteType.C_SOURCES = se.sics.cooja.GUI.MOTETYPES = se.sics.cooja.motes.ImportAppMoteType se.sics.cooja.motes.DisturberMoteType se.sics.cooja.contikimote.ContikiMoteType se.sics.cooja.GUI.PLUGINS = se.sics.cooja.plugins.Visualizer se.sics.cooja.plugins.LogListener se.sics.cooja.plugins.TimeLine se.sics.cooja.plugins.MoteInformation se.sics.cooja.plugins.MoteInterfaceViewer se.sics.cooja.plugins.VariableWatcher se.sics.cooja.plugins.EventListener se.sics.cooja.plugins.RadioLogger se.sics.cooja.plugins.ScriptRunner diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.java b/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.java index 35f497d87..8ac139bd5 100644 --- a/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.java +++ b/tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.java @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: AbstractApplicationMoteType.java,v 1.9 2010/02/05 09:08:07 fros4943 Exp $ + * $Id: AbstractApplicationMoteType.java,v 1.10 2010/02/18 11:13:21 joxe Exp $ */ package se.sics.cooja.motes; @@ -54,6 +54,8 @@ import se.sics.cooja.Simulation; import se.sics.cooja.interfaces.ApplicationLED; import se.sics.cooja.interfaces.ApplicationRadio; import se.sics.cooja.interfaces.ApplicationSerialPort; +import se.sics.cooja.interfaces.Mote2MoteRelations; +import se.sics.cooja.interfaces.MoteAttributes; import se.sics.cooja.interfaces.MoteID; import se.sics.cooja.interfaces.Position; @@ -71,7 +73,9 @@ public abstract class AbstractApplicationMoteType implements MoteType { Position.class, ApplicationSerialPort.class, ApplicationRadio.class, - ApplicationLED.class + ApplicationLED.class, + Mote2MoteRelations.class, + MoteAttributes.class }; public AbstractApplicationMoteType() {