dadada/ns-3-leo
dadada/ns-3-leo
1
0
Fork 0
mirror of https://gitlab.ibr.cs.tu-bs.de/tschuber/ns-3-leo.git synced 2025-06-08 10:03:58 +02:00
Code Issues Releases Wiki Activity

Set corret data rate unit

Browse source
This commit is contained in:
Tim Schubert 2020-08-19 16:42:36 +02:00
parent df97dfa3e4
commit 98468c4857
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/leo-delay-tracing-example.cc
View file

@ -69,7 +69,7 @@ int main (int argc, char *argv[])
islNet = islCh.Install (satellites); islNet = islCh.Install (satellites);
LeoChannelHelper utCh; LeoChannelHelper utCh;
utCh.SetConstellation ("TelesatUser"); utCh.SetConstellation ("StarlinkUser");
utNet = utCh.Install (satellites, stations); utNet = utCh.Install (satellites, stations);
// Install internet stack on nodes // Install internet stack on nodes
@ -101,17 +101,17 @@ int main (int argc, char *argv[])
// we want to ping terminals // we want to ping terminals
UdpServerHelper echoServer (9); UdpServerHelper echoServer (9);
ApplicationContainer serverApps = echoServer.Install (stations.Get (1)); ApplicationContainer serverApps = echoServer.Install (stations.Get (100));
// install a client on one of the terminals // install a client on one of the terminals
ApplicationContainer clientApps; ApplicationContainer clientApps;
Address remote = stations.Get (1)->GetObject<Ipv4> ()->GetAddress (1, 0).GetLocal ();//utIp.GetAddress (1, 0); Address remote = stations.Get (100)->GetObject<Ipv4> ()->GetAddress (1, 0).GetLocal ();//utIp.GetAddress (1, 0);
std::cout << "REMOTE=" << Ipv4Address::ConvertFrom (remote); std::cout << "REMOTE=" << Ipv4Address::ConvertFrom (remote);
UdpClientHelper echoClient (remote, 9); UdpClientHelper echoClient (remote, 9);
echoClient.SetAttribute ("MaxPackets", UintegerValue (60)); echoClient.SetAttribute ("MaxPackets", UintegerValue (60));
echoClient.SetAttribute ("Interval", TimeValue (Seconds (1))); echoClient.SetAttribute ("Interval", TimeValue (Seconds (1)));
echoClient.SetAttribute ("PacketSize", UintegerValue (1024)); echoClient.SetAttribute ("PacketSize", UintegerValue (1024));
clientApps.Add (echoClient.Install (stations.Get (3))); clientApps.Add (echoClient.Install (stations.Get (103)));
Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::UdpServer/Rx", Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::UdpServer/Rx",
MakeCallback (&EchoRx)); MakeCallback (&EchoRx));

6
helper/leo-channel-helper.cc
View file

@ -107,7 +107,7 @@ LeoChannelHelper::SetConstellationAttributes (double eirp,
double fspl, double fspl,
double atmosphericLoss, double atmosphericLoss,
double linkMargin, double linkMargin,
double dataRate, std::string dataRate,
double rxGain, double rxGain,
double rxLoss) double rxLoss)
{ {
@ -120,8 +120,8 @@ LeoChannelHelper::SetConstellationAttributes (double eirp,
m_satDeviceFactory.Set ("RxLoss", DoubleValue (rxLoss)); m_satDeviceFactory.Set ("RxLoss", DoubleValue (rxLoss));
m_satDeviceFactory.Set ("RxGain", DoubleValue (rxGain)); m_satDeviceFactory.Set ("RxGain", DoubleValue (rxGain));
m_gndDeviceFactory.Set ("DataRate", DataRateValue (DataRate (dataRate))); m_gndDeviceFactory.Set ("DataRate", StringValue (dataRate));
m_satDeviceFactory.Set ("DataRate", DataRateValue (DataRate (dataRate))); m_satDeviceFactory.Set ("DataRate", StringValue (dataRate));
m_propagationLossFactory.Set ("ElevationAngle", DoubleValue (elevationAngle)); m_propagationLossFactory.Set ("ElevationAngle", DoubleValue (elevationAngle));
m_propagationLossFactory.Set ("FreeSpacePathLoss", DoubleValue (fspl)); m_propagationLossFactory.Set ("FreeSpacePathLoss", DoubleValue (fspl));

2
helper/leo-channel-helper.h
View file

@ -76,7 +76,7 @@ private:
double fspl, double fspl,
double atmosphericLoss, double atmosphericLoss,
double linkMargin, double linkMargin,
double dataRate, std::string dataRate,
double rxGain, double rxGain,
double rxLoss); double rxLoss);
}; };

4
model/leo-oneweb-constants.h
View file

@ -44,7 +44,7 @@ namespace ns3 {
#define LEO_ONEWEB_GATEWAY_RX_EB_N0_I0 13.3 // dB #define LEO_ONEWEB_GATEWAY_RX_EB_N0_I0 13.3 // dB
#define LEO_ONEWEB_GATEWAY_REQ_EB_N0 12.3 // dB #define LEO_ONEWEB_GATEWAY_REQ_EB_N0 12.3 // dB
#define LEO_ONEWEB_GATEWAY_LINK_MARGIN 1.03 // dB #define LEO_ONEWEB_GATEWAY_LINK_MARGIN 1.03 // dB
#define LEO_ONEWEB_GATEWAY_DATA_RATE 1341.1 // Mbps #define LEO_ONEWEB_GATEWAY_DATA_RATE "1341.1Mbps" // Mbps
#define LEO_ONEWEB_GATEWAY_SHANNON_LIMIT 1.06 // dB #define LEO_ONEWEB_GATEWAY_SHANNON_LIMIT 1.06 // dB
// user uplink // user uplink
@ -68,7 +68,7 @@ namespace ns3 {
#define LEO_ONEWEB_USER_RX_EB_N0_I0 5.5 // dB #define LEO_ONEWEB_USER_RX_EB_N0_I0 5.5 // dB
#define LEO_ONEWEB_USER_REQ_EB_N0 4.6 // dB #define LEO_ONEWEB_USER_REQ_EB_N0 4.6 // dB
#define LEO_ONEWEB_USER_LINK_MARGIN 0.85 // dB #define LEO_ONEWEB_USER_LINK_MARGIN 0.85 // dB
#define LEO_ONEWEB_USER_DATA_RATE 558.7 // Mbps #define LEO_ONEWEB_USER_DATA_RATE "558.7Mbps" // Mbps
#define LEO_ONEWEB_USER_SHANNON_LIMIT 1.49 // dB #define LEO_ONEWEB_USER_SHANNON_LIMIT 1.49 // dB
}; };

4
model/leo-starlink-constants.h
View file

@ -44,7 +44,7 @@ namespace ns3 {
#define LEO_STARLINK_GATEWAY_RX_EB_N0_I0 13.3 // dB #define LEO_STARLINK_GATEWAY_RX_EB_N0_I0 13.3 // dB
#define LEO_STARLINK_GATEWAY_REQ_EB_N0 12.3 // dB #define LEO_STARLINK_GATEWAY_REQ_EB_N0 12.3 // dB
#define LEO_STARLINK_GATEWAY_LINK_MARGIN 1.02 // dB #define LEO_STARLINK_GATEWAY_LINK_MARGIN 1.02 // dB
#define LEO_STARLINK_GATEWAY_DATA_RATE 2682.1 // Mbps #define LEO_STARLINK_GATEWAY_DATA_RATE "2682.1Mbps" // Mbps
#define LEO_STARLINK_GATEWAY_SHANNON_LIMIT 1.06 // dB #define LEO_STARLINK_GATEWAY_SHANNON_LIMIT 1.06 // dB
// user uplink // user uplink
@ -68,7 +68,7 @@ namespace ns3 {
#define LEO_STARLINK_USER_RX_EB_N0_I0 6.7 // dB #define LEO_STARLINK_USER_RX_EB_N0_I0 6.7 // dB
#define LEO_STARLINK_USER_REQ_EB_N0 5.9 // dB #define LEO_STARLINK_USER_REQ_EB_N0 5.9 // dB
#define LEO_STARLINK_USER_LINK_MARGIN 0.82 // dB #define LEO_STARLINK_USER_LINK_MARGIN 0.82 // dB
#define LEO_STARLINK_USER_DATA_RATE 674.3 // Mbps #define LEO_STARLINK_USER_DATA_RATE "674.3Mbps" // Mbps
#define LEO_STARLINK_USER_SHANNON_LIMIT 1.46 // dB #define LEO_STARLINK_USER_SHANNON_LIMIT 1.46 // dB
}; };

4
model/leo-telesat-constants.h
View file

@ -44,7 +44,7 @@ namespace ns3 {
#define LEO_TELESAT_GATEWAY_RX_EB_N0_I0 11.4 // dB #define LEO_TELESAT_GATEWAY_RX_EB_N0_I0 11.4 // dB
#define LEO_TELESAT_GATEWAY_REQ_EB_N0 11.0 // dB #define LEO_TELESAT_GATEWAY_REQ_EB_N0 11.0 // dB
#define LEO_TELESAT_GATEWAY_LINK_MARGIN 0.36 // dB #define LEO_TELESAT_GATEWAY_LINK_MARGIN 0.36 // dB
#define LEO_TELESAT_GATEWAY_DATA_RATE 9857.1 // Mbps #define LEO_TELESAT_GATEWAY_DATA_RATE "9857.1Mbps" // Mbps
#define LEO_TELESAT_GATEWAY_SHANNON_LIMIT 1.09 // dB #define LEO_TELESAT_GATEWAY_SHANNON_LIMIT 1.09 // dB
// user uplink // user uplink
@ -68,7 +68,7 @@ namespace ns3 {
#define LEO_TELESAT_USER_RX_EB_N0_I0 5.9 // dB #define LEO_TELESAT_USER_RX_EB_N0_I0 5.9 // dB
#define LEO_TELESAT_USER_REQ_EB_N0 5.2 // dB #define LEO_TELESAT_USER_REQ_EB_N0 5.2 // dB
#define LEO_TELESAT_USER_LINK_MARGIN 0.76 // dB #define LEO_TELESAT_USER_LINK_MARGIN 0.76 // dB
#define LEO_TELESAT_USER_DATA_RATE 599.4 // Mbps #define LEO_TELESAT_USER_DATA_RATE "599.4Mbps" // Mbps
#define LEO_TELESAT_USER_SHANNON_LIMIT 1.49 // dB #define LEO_TELESAT_USER_SHANNON_LIMIT 1.49 // dB
}; };