deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

temporarily disabled communication stacks on cooja platform, removed radio sensor

Browse source
This commit is contained in:
fros4943 2010-03-09 08:09:57 +00:00
parent bde33fa4d7
commit 0cb572bcb6
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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; package se.sics.cooja.contikimote;
@ -141,15 +141,15 @@ public class ContikiMoteType implements MoteType {
} }
public String getSourceFilenamesString() { public String getSourceFilenamesString() {
if (this == UIPV6) { // if (this == UIPV6) {
return " init-net-uipv6.c"; // return " init-net-uipv6.c";
} // }
if (this == UIP) { // if (this == UIP) {
return " init-net-uip.c"; // return " init-net-uip.c";
} // }
if (this == RIME) { // if (this == RIME) {
return " init-net-rime.c"; // return " init-net-rime.c";
} // }
return " "; 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 identifier = null;
private String description = null; private String description = null;

8
tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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; package se.sics.cooja.dialogs;
@ -223,7 +223,7 @@ public class ContikiMoteCompileDialog extends AbstractCompileDialog {
symbolsCheckBox.setToolTipText("Not implemented");*/ symbolsCheckBox.setToolTipText("Not implemented");*/
/* Communication stack */ /* Communication stack */
JLabel label = new JLabel("Communication stack"); /*JLabel label = new JLabel("Communication stack");
label.setPreferredSize(LABEL_DIMENSION); label.setPreferredSize(LABEL_DIMENSION);
commStackComboBox.setSelectedItem(((ContikiMoteType)moteType).getCommunicationStack()); commStackComboBox.setSelectedItem(((ContikiMoteType)moteType).getCommunicationStack());
commStackComboBox.setEnabled(true); commStackComboBox.setEnabled(true);
@ -240,12 +240,12 @@ public class ContikiMoteCompileDialog extends AbstractCompileDialog {
commStackBox.setAlignmentX(Component.LEFT_ALIGNMENT); commStackBox.setAlignmentX(Component.LEFT_ALIGNMENT);
commStackBox.add(label); commStackBox.add(label);
commStackBox.add(Box.createHorizontalGlue()); commStackBox.add(Box.createHorizontalGlue());
commStackBox.add(commStackComboBox); commStackBox.add(commStackComboBox);*/
/* Advanced tab */ /* Advanced tab */
Box box = Box.createVerticalBox(); Box box = Box.createVerticalBox();
/*box.add(symbolsCheckBox);*/ /*box.add(symbolsCheckBox);*/
box.add(commStackBox); /*box.add(commStackBox);*/
box.add(Box.createVerticalGlue()); box.add(Box.createVerticalGlue());
parent.addTab("Advanced", null, new JScrollPane(box), "Advanced Contiki Mote Type settings"); parent.addTab("Advanced", null, new JScrollPane(box), "Advanced Contiki Mote Type settings");
} }