Permalink
Browse files

Added new radio type to simulation. Modified omnetpp accordingly.

  • Loading branch information...
mnobrega
mnobrega committed Oct 29, 2012
1 parent 6c647d9 commit 795d85bae1ad6cdab88a33d373d57da9a5685f11
View
View
@@ -19,8 +19,7 @@ load-libs=/home/mnobrega/workspace/mixim/src/modules/miximmodules /home/mnobrega
## CONNECTION ##
**.connectionManager.sendDirect = false
**.connectionManager.pMax = 1.1mW
-#**.connectionManager.sat = -100dBm
-**.connectionManager.sat = -61dBm #test value to get only the closest nodes connected
+**.connectionManager.sat = -100dBm
**.connectionManager.alpha = 2.0
**.connectionManager.carrierFrequency = 2.4E+9Hz
@@ -30,15 +29,21 @@ load-libs=/home/mnobrega/workspace/mixim/src/modules/miximmodules /home/mnobrega
## NODES ##
***.app.debug = true
***.net.debug = true
-***.netwType = "AODVRoute"
-***.net.headerLength = 24 bit
+
+#NICs config
***.nic.phy.usePropagationDelay = true
-#***.nic.phy.sensitivity = -100dBm
-***.nic.phy.sensitivity = -61dBm
-***.nic.phy.maxTXPower = 1.1mW
***.nic.phy.useThermalNoise = true
-***.nic.phy.analogueModels = xmldoc("xml_config_files/config.nic.phy.xml")
-***.nic.phy.decider = xmldoc("xml_config_files/config.nic.phy.xml")
+***.nic.phy.analogueModels = xmldoc("xml_config_files/config.nic.xml")
+***.nic.phy.decider = xmldoc("xml_config_files/config.nic.xml")
+**.mobileNode[*].nic.phy.maxTXPower = 1 mW #XBEE
+**.staticNode[*].nic.phy.maxTXPower = 1.1 mW #CC2420
+**.baseStation[*].nic.phy.maxTXPower = 1 mW #XBEE
+**.mobileNode[*].nic.phy.sensitivity = -92dBm #XBEE
+**.staticNode[*].nic.phy.sensitivity = -95dBm #CC2420
+**.baseStation[*].nic.phy.sensitivity = -92dBm #XBEE
+
+***.netwType = "AODVRoute"
+***.net.headerLength = 24 bit
***.mobility.z = 0
**.mobileNode[*].arp.offset = 10 #max base stations = 9
**.staticNode[*].arp.offset = 1000 #max mobile nodes = 989
@@ -19,11 +19,9 @@
</AnalogueModel>
<!-- we add obstacle shadowing on top of the log-normal shadowing effect -->
<AnalogueModel type="SimpleObstacleShadowing">
- <parameter name="carrierFrequency" type="double" value="2.412e+9"/>
+ <parameter name="carrierFrequency" type="double" value="2.4E+9"/>
</AnalogueModel>
</AnalogueModels>
-
- <!-- DECIDER -->
<Decider type="Decider802154Narrow">
<!--Length of Start Frame Delimiter (used to compute probability of successful synchronization)-->
<parameter name="sfdLength" type="long" value="8"/>
@@ -32,9 +30,6 @@
<parameter name="berLowerBound" type="double" value="1e-8"/>
<!--modulation type-->
- <parameter name="modulation" type="string" value="msk"/>
-
- <!-- SNR threshold as fraction [NOT dB]-->
- <parameter name="threshold" type="double" value="0.12589254117942"/>
+ <parameter name="modulation" type="string" value="oqpsk16"/>
</Decider>
-</root>
+</root>
@@ -36,15 +36,17 @@ module Nic802154_TI_CC2420 extends WirelessNicBattery
macType = default("CSMA802154");
// power consumption from boards (at 3.3V)
- sleepCurrent = 0.000021mA; // 0.021 µA
+ sleepCurrent = 0.00002mA; // 0.02 µA
rxCurrent = 18.8 mA;
- decodingCurrentDelta = 0 mA;
txCurrent = 17.4 mA;
+ rxTxCurrent = 18.8 mA; // Upper bound
+ txRxCurrent = 17.4 mA; // idem
+
+ decodingCurrentDelta = 0 mA;
setupRxCurrent = 0.6391mA; // 0.002109 W = (ESetupPower+ESetupXtal+ETxCalibrate)/TSetupTx
setupTxCurrent = 0.6845mA; // 0.002259 W = (ESetupPower+ESetupXtal+ERxCalibrate)/TSetupRx
- rxTxCurrent = 18.8 mA; // Upper bound
- txRxCurrent = 18.8 mA; // idem
-
+
+
phy.decider = default(xmldoc("Nic802154_TI_CC2420_Decider.xml"));
//publishRSSIAlways = false;
phy.headerLength = 48 bit; // ieee 802.15.4
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<root>
<Decider type="Decider802154Narrow">
- <!--Length of Start Frame Delimiter (used to compute probability of successful
- synchronization)-->
+ <!--Length of Start Frame Delimiter (used to compute probability of successful synchronization)-->
<parameter name="sfdLength" type="long" value="8"/>
<!--minimum possible bit error rate (BER floor)-->
@@ -0,0 +1,65 @@
+//***************************************************************************
+// * file: Nic802154_TI_CC2420.ned
+// *
+// * author: Jerome Rousselot, Marc Loebbers
+// *
+// * copyright: (C) 2008-2010 CSEM SA, Neuchatel, Switzerland.
+// * (C) 2004 Telecommunication Networks Group (TKN) at
+// * Technische Universitaet Berlin, Germany.
+// *
+// * This program is free software; you can redistribute it
+// * and/or modify it under the terms of the GNU General Public
+// * License as published by the Free Software Foundation; either
+// * version 2 of the License, or (at your option) any later
+// * version.
+// * For further information see file COPYING
+// * in the top level directory
+// *
+// * Funding: This work was partially financed by the European Commission under the
+// * Framework 6 IST Project "Wirelessly Accessible Sensor Populations"
+// * (WASP) under contract IST-034963.
+// **************************************************************************/
+
+package org.mixim.modules.nic;
+
+//
+// This NIC implements a Texas Instruments CC 2420 802.15.4 network interface card
+// using the CSMA protocol as specified in IEEE 802.15.4-2006.
+//
+//Note: To be able to use this Nic in your simulation you have to copy the file
+//"Nic802154_TI_CC2420_Decider.xml" from "modules/nic/" to your simulation directory.
+// @author Jerome Rousselot
+//
+module Nic802154_XBee extends WirelessNicBattery
+{
+ parameters:
+ macType = default("CSMA802154");
+
+ // power consumption from boards (at 3.3V)
+ sleepCurrent = 0.00010mA; // 0.02 µA
+ rxCurrent = 50 mA;
+ txCurrent = 45 mA;
+ rxTxCurrent = 45 mA; // Upper bound
+ txRxCurrent = 50 mA; // idem
+
+ decodingCurrentDelta = 0 mA;
+ setupRxCurrent = 0.6391mA; // 0.002109 W = (ESetupPower+ESetupXtal+ETxCalibrate)/TSetupTx
+ setupTxCurrent = 0.6845mA; // 0.002259 W = (ESetupPower+ESetupXtal+ERxCalibrate)/TSetupRx
+
+
+ phy.decider = default(xmldoc("Nic802154_TI_CC2420_Decider.xml"));
+ //publishRSSIAlways = false;
+ phy.headerLength = 48 bit; // ieee 802.15.4
+ phy.thermalNoise = -110 dBm;
+ // From TI CC1100 datasheet rev. C
+ phy.timeSleepToRX = 0.001792 s;
+ phy.timeSleepToTX = 0.001792 s;
+ phy.timeRXToTX = 0.000192 s;
+ phy.timeTXToRX = 0.000192 s;
+ phy.timeRXToSleep = 0 s;
+ phy.timeTXToSleep = 0 s;
+
+ mac.rxSetupTime = 0.001792 s;
+ mac.txPower = default(1 mW);
+}
+
@@ -5,7 +5,7 @@ import org.mixim.base.modules.BaseWorldUtility;
import org.mixim.base.modules.IBaseNetwLayer;
import org.mixim.modules.application.EMoS.BaseStationAppLayerEMoS;
import org.mixim.modules.netw.ArpHost;
-import org.mixim.modules.nic.Nic802154_TI_CC2420;
+import org.mixim.modules.nic.Nic802154_XBee;
import org.mixim.modules.power.battery.BatteryStats;
import org.mixim.modules.power.battery.SimpleBattery;
import org.mixim.modules.transport.Aggregation;
@@ -64,7 +64,7 @@ module Host802154_2400MHz_EMoS_base
parameters:
@display("p=292,120;i=block/cogwheel");
}
- nic: Nic802154_TI_CC2420 {
+ nic: Nic802154_XBee {
parameters:
@display("b=32,30;p=86,265;i=block/ifcard");
}
@@ -5,7 +5,7 @@ import org.mixim.base.modules.BaseWorldUtility;
import org.mixim.base.modules.IBaseNetwLayer;
import org.mixim.modules.application.EMoS.StaticNodeAppLayerEMoS;
import org.mixim.modules.netw.ArpHost;
-import org.mixim.modules.nic.Nic802154_TI_CC2420;
+import org.mixim.modules.nic.Nic802154_XBee;
import org.mixim.modules.power.battery.BatteryStats;
import org.mixim.modules.power.battery.SimpleBattery;
import org.mixim.modules.transport.Aggregation;
@@ -64,7 +64,7 @@ module Host802154_2400MHz_EMoS_static
parameters:
@display("p=292,120;i=block/cogwheel");
}
- nic: Nic802154_TI_CC2420 {
+ nic: Nic802154_XBee {
parameters:
@display("b=32,30;p=86,265;i=block/ifcard");
}

0 comments on commit 795d85b

Please sign in to comment.