From 1c0e43296916de5fd789ec7bb0b433aded330f0f Mon Sep 17 00:00:00 2001 From: fros4943 Date: Mon, 9 Mar 2009 17:10:14 +0000 Subject: [PATCH] esb mote type should use esb mote interfaces, not sky mote interfaces --- .../sics/cooja/mspmote/ESBCompileDialog.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBCompileDialog.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBCompileDialog.java index a8b5d9124..8357ef7c6 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBCompileDialog.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBCompileDialog.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ESBCompileDialog.java,v 1.1 2009/03/09 16:04:42 fros4943 Exp $ + * $Id: ESBCompileDialog.java,v 1.2 2009/03/09 17:10:14 fros4943 Exp $ */ package se.sics.cooja.mspmote; @@ -39,14 +39,13 @@ import se.sics.cooja.Simulation; import se.sics.cooja.dialogs.AbstractCompileDialog; import se.sics.cooja.interfaces.Mote2MoteRelations; import se.sics.cooja.interfaces.Position; +import se.sics.cooja.mspmote.interfaces.ESBButton; +import se.sics.cooja.mspmote.interfaces.ESBLED; +import se.sics.cooja.mspmote.interfaces.ESBLog; import se.sics.cooja.mspmote.interfaces.MspClock; import se.sics.cooja.mspmote.interfaces.MspIPAddress; import se.sics.cooja.mspmote.interfaces.MspMoteID; -import se.sics.cooja.mspmote.interfaces.SkyButton; -import se.sics.cooja.mspmote.interfaces.SkyByteRadio; -import se.sics.cooja.mspmote.interfaces.SkyFlash; -import se.sics.cooja.mspmote.interfaces.SkyLED; -import se.sics.cooja.mspmote.interfaces.SkySerial; +import se.sics.cooja.mspmote.interfaces.TR1001Radio; public class ESBCompileDialog extends AbstractCompileDialog { private static Logger logger = Logger.getLogger(ESBCompileDialog.class); @@ -77,16 +76,16 @@ public class ESBCompileDialog extends AbstractCompileDialog { if (moteIntfBox.getComponentCount() > 0) { selected = false; } + addMoteInterface(Position.class, selected); addMoteInterface(MspIPAddress.class, selected); - addMoteInterface(Mote2MoteRelations.class, selected); + addMoteInterface(ESBLog.class, selected); addMoteInterface(MspClock.class, selected); + addMoteInterface(ESBLED.class, selected); + addMoteInterface(ESBButton.class, selected); addMoteInterface(MspMoteID.class, selected); - addMoteInterface(SkyButton.class, selected); - addMoteInterface(SkyFlash.class, selected); - addMoteInterface(SkyByteRadio.class, selected); - addMoteInterface(SkySerial.class, selected); - addMoteInterface(SkyLED.class, selected); + addMoteInterface(TR1001Radio.class, selected); + addMoteInterface(Mote2MoteRelations.class, selected); } public boolean canLoadFirmware(File file) {