From 70969c193010493e842555107fbdb5dc18f952a0 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Thu, 31 May 2007 07:19:11 +0000
Subject: [PATCH] added configurable transmission rate (default 19.2kbps)

---
 tools/cooja/config/cooja_default.config       |  1 +
 .../contikimote/interfaces/ContikiRadio.java  | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/cooja/config/cooja_default.config b/tools/cooja/config/cooja_default.config
index 340f760a0..9b9ae2db9 100644
--- a/tools/cooja/config/cooja_default.config
+++ b/tools/cooja/config/cooja_default.config
@@ -20,6 +20,7 @@ se.sics.cooja.contikimote.interfaces.ContikiPIR.EXTERNAL_INTERRUPT_bool = true
 
 se.sics.cooja.contikimote.interfaces.ContikiRadio.ACTIVE_CONSUMPTION_mA = 5
 se.sics.cooja.contikimote.interfaces.ContikiRadio.EXTERNAL_INTERRUPT_bool = true
+se.sics.cooja.contikimote.interfaces.ContikiRadio.RADIO_TRANSMISSION_RATE_kbps = 19.2
 
 se.sics.cooja.contikimote.interfaces.ContikiVib.ACTIVE_CONSUMPTION_mA = 1.58
 se.sics.cooja.contikimote.interfaces.ContikiVib.EXTERNAL_INTERRUPT_bool = true
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
index 95c4276c6..c3e36492c 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
+++ b/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.15 2007/05/30 10:52:57 fros4943 Exp $
+ * $Id: ContikiRadio.java,v 1.16 2007/05/31 07:19:11 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -91,6 +91,13 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
    */
   public final double ENERGY_CONSUMPTION_RADIO_mA;
 
+  /**
+   * Approximate transmission rate (kbps), used to calculate transmission
+   * duration of packets. Each transmission is assumed to use an encoding with
+   * an overhead nrBytesx0.25 (such as GCR), and a fixed overhead of 34 bytes.
+   */
+  public final double RADIO_TRANSMISSION_RATE_kbps;
+
   private final boolean RAISES_EXTERNAL_INTERRUPT;
 
   private double energyListeningRadioPerTick = -1;
@@ -129,7 +136,9 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
         ContikiRadio.class, "ACTIVE_CONSUMPTION_mA");
     RAISES_EXTERNAL_INTERRUPT = mote.getType().getConfig().getBooleanValue(
         ContikiRadio.class, "EXTERNAL_INTERRUPT_bool");
-
+    RADIO_TRANSMISSION_RATE_kbps = mote.getType().getConfig().getDoubleValue(
+        ContikiRadio.class, "RADIO_TRANSMISSION_RATE_kbps");
+    
     this.myMote = mote;
     this.myMoteMemory = (SectionMoteMemory) mote.getMemory();
 
@@ -361,10 +370,8 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface,
 
       isTransmitting = true;
 
-      // Assuming sending at 19.2 kbps, with GCR and 30+4 bytes overhead 
-      //  (8bit/byte, 30 bytes nonGCR overhead, 1.25 due to GCR)
-      //int duration = (int) ((double) (8*(30+1.25*(size+4))) / 19.2);
-      int duration = (int) ((double) (280 + 10*size) / 19.2); // ms
+      // Calculate transmission duration (ms)
+      int duration = (int) ((double) (280 + 10 * size) / RADIO_TRANSMISSION_RATE_kbps);
       transmissionEndTime = myMote.getSimulation().getSimulationTime()
           + Math.max(1, duration);
       lastEventTime = myMote.getSimulation().getSimulationTime();