From 0cb572bcb6951cdf7f3255e3d71507cca2a42ec2 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Tue, 9 Mar 2010 08:09:57 +0000
Subject: [PATCH] temporarily disabled communication stacks on cooja platform,
 removed radio sensor

---
 .../cooja/contikimote/ContikiMoteType.java    | 22 +++++++++----------
 .../dialogs/ContikiMoteCompileDialog.java     |  8 +++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
index add118768..81d61e401 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteType.java,v 1.39 2010/02/03 16:06:15 fros4943 Exp $
+ * $Id: ContikiMoteType.java,v 1.40 2010/03/09 08:09:57 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
@@ -141,15 +141,15 @@ public class ContikiMoteType implements MoteType {
     }
 
     public String getSourceFilenamesString() {
-      if (this == UIPV6) {
-        return " init-net-uipv6.c";
-      }
-      if (this == UIP) {
-        return " init-net-uip.c";
-      }
-      if (this == RIME) {
-        return " init-net-rime.c";
-      }
+//      if (this == UIPV6) {
+//        return " init-net-uipv6.c";
+//      }
+//      if (this == UIP) {
+//        return " init-net-uip.c";
+//      }
+//      if (this == RIME) {
+//        return " init-net-rime.c";
+//      }
       return " ";
     }
 
@@ -169,7 +169,7 @@ public class ContikiMoteType implements MoteType {
     }
   }
 
-  private final String[] sensors = { "button_sensor", "pir_sensor", "radio_sensor", "vib_sensor" };
+  private final String[] sensors = { "button_sensor", "pir_sensor", "vib_sensor" };
 
   private String identifier = null;
   private String description = null;
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
index 4bec680cf..e64a5b331 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteCompileDialog.java,v 1.4 2009/09/07 15:05:05 nvt-se Exp $
+ * $Id: ContikiMoteCompileDialog.java,v 1.5 2010/03/09 08:11:18 fros4943 Exp $
  */
 
 package se.sics.cooja.dialogs;
@@ -223,7 +223,7 @@ public class ContikiMoteCompileDialog extends AbstractCompileDialog {
     symbolsCheckBox.setToolTipText("Not implemented");*/
 
     /* Communication stack */
-    JLabel label = new JLabel("Communication stack");
+    /*JLabel label = new JLabel("Communication stack");
     label.setPreferredSize(LABEL_DIMENSION);
     commStackComboBox.setSelectedItem(((ContikiMoteType)moteType).getCommunicationStack());
     commStackComboBox.setEnabled(true);
@@ -240,12 +240,12 @@ public class ContikiMoteCompileDialog extends AbstractCompileDialog {
     commStackBox.setAlignmentX(Component.LEFT_ALIGNMENT);
     commStackBox.add(label);
     commStackBox.add(Box.createHorizontalGlue());
-    commStackBox.add(commStackComboBox);
+    commStackBox.add(commStackComboBox);*/
 
     /* Advanced tab */
     Box box = Box.createVerticalBox();
     /*box.add(symbolsCheckBox);*/
-    box.add(commStackBox);
+    /*box.add(commStackBox);*/
     box.add(Box.createVerticalGlue());
     parent.addTab("Advanced", null, new JScrollPane(box), "Advanced Contiki Mote Type settings");
   }