added new mote type method that returns the by-default used mote inte…

…rfaces, as opposed to all compatible mote interfaces this allows the user to override default settings in the create-new-mote-type dialogs
contiki-os · Aug 14, 2013 · 8e264ba · 8e264ba
1 parent f590403
commit 8e264ba
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 22 deletions.
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZCompileDialog.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZCompileDialog.java
@@ -64,6 +64,9 @@ private MicaZCompileDialog(Container parent, Simulation simulation, MoteType mot
     super(parent, simulation, moteType);
   }
 
+  public Class<? extends MoteInterface>[] getAllMoteInterfaces() {
+	  return ((MicaZMoteType)moteType).getAllMoteInterfaceClasses();
+  }
   public Class<? extends MoteInterface>[] getDefaultMoteInterfaces() {
     return ((MicaZMoteType)moteType).getAllMoteInterfaceClasses();
   }

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
@@ -198,6 +198,9 @@ public boolean configureAndInit(Container parentContainer, Simulation simulation
     return true;
   }
 
+  public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+	  return getAllMoteInterfaceClasses();
+  }
   public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
     return new Class[] {
         Position.class,

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java
@@ -179,6 +179,22 @@ public Icon getMoteTypeIcon() {
     return null;
   }
 
+  public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+	    return new Class[] {
+	            Position.class,
+	            RimeAddress.class,
+	            IPAddress.class,
+	            Mote2MoteRelations.class,
+	            MoteAttributes.class,
+	            MspClock.class,
+	            MspMoteID.class,
+	            Msp802154Radio.class,
+	            UsciA1Serial.class,
+	            Exp5438LED.class,
+	            /*Exp5438LCD.class,*/ /* TODO */
+	            MspDebugOutput.class
+	        };
+  }
   public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
     return new Class[] {
         Position.class,
@@ -189,6 +205,8 @@ public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
         MspClock.class,
         MspMoteID.class,
         Msp802154Radio.class,
+        CC1101Radio.class,
+        CC1120Radio.class,
         UsciA1Serial.class,
         Exp5438LED.class,
         /*Exp5438LCD.class,*/ /* TODO */

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/JCreateMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/JCreateMoteType.java
@@ -71,6 +71,9 @@ protected MspMote createMote(Simulation simulation) {
     }
 
     @Override
+    public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+  	  return getAllMoteInterfaceClasses();
+    }
     public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
         @SuppressWarnings("unchecked")
         Class<? extends MoteInterface>[] list = createMoteInterfaceList(

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspCompileDialog.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspCompileDialog.java
@@ -71,8 +71,11 @@ private MspCompileDialog(Container parent, Simulation simulation, MspMoteType mo
     addCompilationTipsTab(tabbedPane);
   }
 
+  public Class<? extends MoteInterface>[] getAllMoteInterfaces() {
+	  return ((MspMoteType)moteType).getAllMoteInterfaceClasses();
+  }
   public Class<? extends MoteInterface>[] getDefaultMoteInterfaces() {
-    return ((MspMoteType)moteType).getAllMoteInterfaceClasses();
+	  return ((MspMoteType)moteType).getDefaultMoteInterfaceClasses();
   }
 
   private void addCompilationTipsTab(JTabbedPane parent) {

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
@@ -320,6 +320,7 @@ public boolean setConfigXML(Simulation simulation,
   }
 
   public abstract Class<? extends MoteInterface>[] getAllMoteInterfaceClasses();
+  public abstract Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses();
   public abstract File getExpectedFirmwareFile(File source);
 
   private static ELF loadELF(String filepath) throws IOException {

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SentillaUSBMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SentillaUSBMoteType.java
@@ -69,7 +69,9 @@ protected MspMote createMote(Simulation simulation) {
         return new SentillaUSBMote(this, simulation);
     }
 
-    @Override
+    public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+  	  return getAllMoteInterfaceClasses();
+    }
     public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
         @SuppressWarnings("unchecked")
         Class<? extends MoteInterface>[] list = createMoteInterfaceList(

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
@@ -202,6 +202,9 @@ public Icon getMoteTypeIcon() {
     return null;
   }
 
+  public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+	  return getAllMoteInterfaceClasses();
+  }
   public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
     return new Class[] {
         Position.class,

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java
@@ -179,6 +179,9 @@ public Icon getMoteTypeIcon() {
     return null;
   }
 
+  public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+	  return getAllMoteInterfaceClasses();
+  }
   public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
     return new Class[] {
         Position.class,

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java
@@ -69,7 +69,9 @@ protected MspMote createMote(Simulation simulation) {
         return new WismoteMote(this, simulation);
     }
 
-    @Override
+    public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+  	  return getAllMoteInterfaceClasses();
+    }
     public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
         @SuppressWarnings("unchecked")
         Class<? extends MoteInterface>[] list = createMoteInterfaceList(

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java
@@ -70,7 +70,10 @@ protected MspMote createMote(Simulation simulation) {
         return new Z1Mote(this, simulation);
     }
 
-    @Override
+    public Class<? extends MoteInterface>[] getDefaultMoteInterfaceClasses() {
+  	  return getAllMoteInterfaceClasses();
+    }
+
     public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
         @SuppressWarnings("unchecked")
         Class<? extends MoteInterface>[] list = createMoteInterfaceList(

diff --git a/tools/cooja/java/se/sics/cooja/dialogs/AbstractCompileDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/AbstractCompileDialog.java
@@ -372,14 +372,17 @@ public void windowClosing(WindowEvent e) {
         ((JCheckBox) c).setSelected(false);
       }
       if (moteType.getMoteInterfaceClasses() != null) {
-        for (Class<? extends MoteInterface> intfClass: getDefaultMoteInterfaces()) {
+        for (Class<? extends MoteInterface> intfClass: getAllMoteInterfaces()) {
           addMoteInterface(intfClass, false);
         }
         for (Class<? extends MoteInterface> intf: moteType.getMoteInterfaceClasses()) {
           addMoteInterface(intf, true);
         }
       } else {
         /* Select default mote interfaces */
+        for (Class<? extends MoteInterface> intfClass: getAllMoteInterfaces()) {
+          addMoteInterface(intfClass, false);
+        }
         for (Class<? extends MoteInterface> intfClass: getDefaultMoteInterfaces()) {
           addMoteInterface(intfClass, true);
         }
@@ -714,6 +717,7 @@ public void actionPerformed(ActionEvent e) {
   };
 
   public abstract Class<? extends MoteInterface>[] getDefaultMoteInterfaces();
+  public abstract Class<? extends MoteInterface>[] getAllMoteInterfaces();
 
   /**
    * @return Currently selected mote interface classes

diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
@@ -199,24 +199,27 @@ public File getExpectedFirmwareFile(File source) {
     return ContikiMoteType.getExpectedFirmwareFile(source);
   }
 
+  public Class<? extends MoteInterface>[] getAllMoteInterfaces() {
+	  ProjectConfig projectConfig = moteType.getConfig();
+	  String[] intfNames = projectConfig.getStringArrayValue(ContikiMoteType.class, "MOTE_INTERFACES");
+	  ArrayList<Class<? extends MoteInterface>> classes = new ArrayList<Class<? extends MoteInterface>>();
+
+	  /* Load mote interface classes */
+	  for (String intfName : intfNames) {
+		  Class<? extends MoteInterface> intfClass =
+				  gui.tryLoadClass(this, MoteInterface.class, intfName);
+
+		  if (intfClass == null) {
+			  logger.warn("Failed to load mote interface class: " + intfName);
+			  continue;
+		  }
+
+		  classes.add(intfClass);
+	  }
+	  return classes.toArray(new Class[0]);
+  }
   public Class<? extends MoteInterface>[] getDefaultMoteInterfaces() {
-    ProjectConfig projectConfig = moteType.getConfig();
-    String[] intfNames = projectConfig.getStringArrayValue(ContikiMoteType.class, "MOTE_INTERFACES");
-    ArrayList<Class<? extends MoteInterface>> classes = new ArrayList<Class<? extends MoteInterface>>();
-
-    /* Load mote interface classes */
-    for (String intfName : intfNames) {
-      Class<? extends MoteInterface> intfClass =
-        gui.tryLoadClass(this, MoteInterface.class, intfName);
-
-      if (intfClass == null) {
-        logger.warn("Failed to load mote interface class: " + intfName);
-        continue;
-      }
-
-      classes.add(intfClass);
-    }
-    return classes.toArray(new Class[0]);
+	  return getAllMoteInterfaces();
   }
 
   private void addAdvancedTab(JTabbedPane parent) {