added method for checking if radio is on/off. the method is currently only used by contikradio:s.

changed UDGM coloring:
dead/non-existing radios are black.
turned off radios are gray.

tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiRadio.java,v 1.16 2007/05/31 07:19:11 fros4943 Exp $
+ * $Id: ContikiRadio.java,v 1.17 2008/02/23 10:10:42 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -143,9 +143,10 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
     this.myMoteMemory = (SectionMoteMemory) mote.getMemory();
 
     // Calculate energy consumption of a listening radio
-    if (energyListeningRadioPerTick < 0)
+    if (energyListeningRadioPerTick < 0) {
       energyListeningRadioPerTick = ENERGY_CONSUMPTION_RADIO_mA
           * mote.getSimulation().getTickTimeInSeconds();
+    }
 
     radioOn = myMoteMemory.getByteValueOf("simRadioHWOn") == 1;
   }
@@ -169,13 +170,18 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
   }
 
   /* General radio support */
+  public boolean isOn() {
+    return radioOn;
+  }
+
   public boolean isTransmitting() {
     return isTransmitting;
   }
 
   public boolean isReceiving() {
-    if (isLockedAtReceiving())
+    if (isLockedAtReceiving()) {
       return true;
+    }
 
     return myMoteMemory.getIntValueOf("simInSize") != 0;
   }
@@ -252,7 +258,7 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
   }
 
   public int getCurrentOutputPowerIndicator() {
-    return (int) myMoteMemory.getByteValueOf("simPower");
+    return myMoteMemory.getByteValueOf("simPower");
   }
 
   public double getCurrentSignalStrength() {
@@ -290,11 +296,13 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
   private void lockInReceivingMode() {
     // If mote is inactive, try to wake it up
     if (myMote.getState() != Mote.State.ACTIVE) {
-      if (RAISES_EXTERNAL_INTERRUPT)
+      if (RAISES_EXTERNAL_INTERRUPT) {
         myMote.setState(Mote.State.ACTIVE);
-      if (myMote.getState() != Mote.State.ACTIVE)
+      }
+      if (myMote.getState() != Mote.State.ACTIVE) {
         return;
       }
+    }
 
     // Lock core radio in receiving loop
     myMoteMemory.setByteValueOf("simReceiving", (byte) 1);
@@ -317,8 +325,9 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
         myMoteMemory.setIntValueOf("simOutSize", 0);
         isTransmitting = false;
         lastEvent = RadioEvent.HW_OFF;
-      } else
+      } else {
         lastEvent = RadioEvent.HW_ON;
+      }
 
       lastEventTime = myMote.getSimulation().getSimulationTime();
       this.setChanged();
@@ -371,7 +380,7 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
       isTransmitting = true;
 
       // Calculate transmission duration (ms)
-      int duration = (int) ((double) (280 + 10 * size) / RADIO_TRANSMISSION_RATE_kbps);
+      int duration = (int) ((280 + 10 * size) / RADIO_TRANSMISSION_RATE_kbps);
       transmissionEndTime = myMote.getSimulation().getSimulationTime()
           + Math.max(1, duration);
       lastEventTime = myMote.getSimulation().getSimulationTime();
@@ -414,14 +423,15 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
     Observer observer;
     this.addObserver(observer = new Observer() {
       public void update(Observable obs, Object obj) {
-        if (isTransmitting())
+        if (isTransmitting()) {
           statusLabel.setText("Transmitting packet now!");
-        else if (isReceiving())
+        } else if (isReceiving()) {
           statusLabel.setText("Receiving packet now!");
-        else if (radioOn)
+        } else if (radioOn) {
           statusLabel.setText("Listening...");
-        else
+        } else {
           statusLabel.setText("HW turned off");
+        }
 
         lastEventLabel.setText("Last event (time=" + lastEventTime + "): "
             + lastEvent);

tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: UDGM.java,v 1.13 2008/02/12 15:31:22 fros4943 Exp $
+ * $Id: UDGM.java,v 1.14 2008/02/23 10:10:42 fros4943 Exp $
  */
 
 package se.sics.cooja.radiomediums;
@@ -40,6 +40,7 @@ import org.jdom.Element;
 import org.apache.log4j.Logger;
 
 import se.sics.cooja.*;
+import se.sics.cooja.contikimote.interfaces.ContikiRadio;
 import se.sics.cooja.interfaces.*;
 import se.sics.cooja.plugins.Visualizer2D;
 
@@ -315,17 +316,21 @@ public class UDGM extends AbstractRadioMedium {
     public Color[] getColorOf(Mote mote) {
       Radio moteRadio = mote.getInterfaces().getRadio();
       if (moteRadio == null) {
-        return new Color[] { Color.GRAY };
+        return new Color[] { Color.BLACK };
       }
 
       if (mote.getState() == Mote.State.DEAD) {
-        return new Color[] { Color.GRAY };
+        return new Color[] { Color.BLACK };
       }
 
       if (selectedMote != null && mote == selectedMote) {
         return new Color[] { Color.CYAN };
       }
 
+      if (moteRadio instanceof ContikiRadio && !((ContikiRadio) moteRadio).isOn()) {
+        return new Color[] { Color.GRAY };
+      }
+
       if (moteRadio.isTransmitting()) {
         return new Color[] { Color.BLUE };
       }