F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Provide vector of center frequencies to helper functions to build PSDs for 802.11ac and later

Browse Source
This commit is contained in:
Sébastien Deronne
2023-04-10 11:02:21 +02:00
parent 8157f54c6d
commit 1f270a3ae4
7 changed files with 120 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wifi/model/he/he-phy.cc
View File

@@ -1357,7 +1357,7 @@ HePhy::GetTxPowerSpectralDensity(double txPowerW,
const auto ruWidth = HeRu::GetBandwidth(txVector.GetRu(staId).GetRuType());
channelWidth = (ruWidth < 20) ? 20 : ruWidth;
return WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity(
GetCenterFrequenciesForNonHePart(ppdu, staId).front(),
GetCenterFrequenciesForNonHePart(ppdu, staId),
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),
@@ -1370,7 +1370,7 @@ HePhy::GetTxPowerSpectralDensity(double txPowerW,
{
const auto band = GetRuBandForTx(txVector, GetStaId(ppdu)).indices;
return WifiSpectrumValueHelper::CreateHeMuOfdmTxPowerSpectralDensity(
centerFrequencies.front(),
centerFrequencies,
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),
@@ -1381,7 +1381,7 @@ HePhy::GetTxPowerSpectralDensity(double txPowerW,
if (flag == HePpdu::PSD_NON_HE_PORTION)
{
return WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity(
centerFrequencies.front(),
centerFrequencies,
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),
@@ -1393,7 +1393,7 @@ HePhy::GetTxPowerSpectralDensity(double txPowerW,
else
{
return WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity(
centerFrequencies.front(),
centerFrequencies,
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),
@@ -1407,7 +1407,7 @@ HePhy::GetTxPowerSpectralDensity(double txPowerW,
default: {
NS_ASSERT(puncturedSubchannels.empty());
return WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity(
centerFrequencies.front(),
centerFrequencies,
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),

2
src/wifi/model/ht/ht-phy.cc
View File

@@ -469,7 +469,7 @@ HtPhy::GetTxPowerSpectralDensity(double txPowerW, Ptr<const WifiPpdu> ppdu) cons
NS_LOG_FUNCTION(this << centerFrequencies.front() << channelWidth << txPowerW);
const auto& txMaskRejectionParams = GetTxMaskRejectionParams();
Ptr<SpectrumValue> v = WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity(
centerFrequencies.front(),
centerFrequencies,
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),

2
src/wifi/model/non-ht/ofdm-phy.cc
View File

@@ -377,7 +377,7 @@ OfdmPhy::GetTxPowerSpectralDensity(double txPowerW, Ptr<const WifiPpdu> ppdu) co
if (txVector.IsNonHtDuplicate())
{
v = WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity(
centerFrequencies.front(),
centerFrequencies,
channelWidth,
txPowerW,
GetGuardBandwidth(channelWidth),

84
src/wifi/model/wifi-spectrum-value-helper.cc
View File

@@ -218,7 +218,7 @@ WifiSpectrumValueHelper::CreateOfdmTxPowerSpectralDensity(uint16_t centerFrequen
Ptr<SpectrumValue>
WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity(
uint16_t centerFrequency,
const std::vector<uint16_t>& centerFrequencies,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
@@ -227,11 +227,14 @@ WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity(
double lowestPointDbr,
const std::vector<bool>& puncturedSubchannels)
{
NS_LOG_FUNCTION(centerFrequency << channelWidth << txPowerW << guardBandwidth << minInnerBandDbr
<< minOuterBandDbr << lowestPointDbr);
NS_ASSERT_MSG(centerFrequencies.size() == 1,
"There is no support for HE OFDM PSD for non-contiguous channels");
NS_LOG_FUNCTION(centerFrequencies.front()
<< channelWidth << txPowerW << guardBandwidth << minInnerBandDbr
<< minOuterBandDbr << lowestPointDbr);
uint32_t carrierSpacing = 312500;
Ptr<SpectrumValue> c = Create<SpectrumValue>(
GetSpectrumModel(centerFrequency, channelWidth, carrierSpacing, guardBandwidth));
GetSpectrumModel(centerFrequencies.front(), channelWidth, carrierSpacing, guardBandwidth));
auto nGuardBands = static_cast<uint32_t>(((2 * guardBandwidth * 1e6) / carrierSpacing) + 0.5);
auto nAllocatedBands = static_cast<uint32_t>(((channelWidth * 1e6) / carrierSpacing) + 0.5);
NS_ASSERT_MSG(c->GetSpectrumModel()->GetNumBands() == (nAllocatedBands + nGuardBands + 1),
@@ -293,19 +296,23 @@ WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity(
}
Ptr<SpectrumValue>
WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity(uint16_t centerFrequency,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
double minInnerBandDbr,
double minOuterBandDbr,
double lowestPointDbr)
WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity(
const std::vector<uint16_t>& centerFrequencies,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
double minInnerBandDbr,
double minOuterBandDbr,
double lowestPointDbr)
{
NS_LOG_FUNCTION(centerFrequency << channelWidth << txPowerW << guardBandwidth << minInnerBandDbr
<< minOuterBandDbr << lowestPointDbr);
NS_ASSERT_MSG(centerFrequencies.size() == 1,
"There is no support for HE OFDM PSD for non-contiguous channels");
NS_LOG_FUNCTION(centerFrequencies.front()
<< channelWidth << txPowerW << guardBandwidth << minInnerBandDbr
<< minOuterBandDbr << lowestPointDbr);
uint32_t carrierSpacing = 312500;
Ptr<SpectrumValue> c = Create<SpectrumValue>(
GetSpectrumModel(centerFrequency, channelWidth, carrierSpacing, guardBandwidth));
GetSpectrumModel(centerFrequencies.front(), channelWidth, carrierSpacing, guardBandwidth));
auto nGuardBands = static_cast<uint32_t>(((2 * guardBandwidth * 1e6) / carrierSpacing) + 0.5);
auto nAllocatedBands = static_cast<uint32_t>(((channelWidth * 1e6) / carrierSpacing) + 0.5);
NS_ASSERT_MSG(c->GetSpectrumModel()->GetNumBands() == (nAllocatedBands + nGuardBands + 1),
@@ -368,11 +375,35 @@ WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity(
double lowestPointDbr,
const std::vector<bool>& puncturedSubchannels)
{
NS_LOG_FUNCTION(centerFrequency << channelWidth << txPowerW << guardBandwidth << minInnerBandDbr
<< minOuterBandDbr << lowestPointDbr);
return CreateHeOfdmTxPowerSpectralDensity(std::vector<uint16_t>{centerFrequency},
channelWidth,
txPowerW,
guardBandwidth,
minInnerBandDbr,
minOuterBandDbr,
lowestPointDbr,
puncturedSubchannels);
}
Ptr<SpectrumValue>
WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity(
const std::vector<uint16_t>& centerFrequencies,
uint16_t channelWidth,
double txPowerW,
uint16_t guardBandwidth,
double minInnerBandDbr,
double minOuterBandDbr,
double lowestPointDbr,
const std::vector<bool>& puncturedSubchannels)
{
NS_ASSERT_MSG(centerFrequencies.size() == 1,
"There is no support for HE OFDM PSD for non-contiguous channels");
NS_LOG_FUNCTION(centerFrequencies.front()
<< channelWidth << txPowerW << guardBandwidth << minInnerBandDbr
<< minOuterBandDbr << lowestPointDbr);
uint32_t carrierSpacing = 78125;
Ptr<SpectrumValue> c = Create<SpectrumValue>(
GetSpectrumModel(centerFrequency, channelWidth, carrierSpacing, guardBandwidth));
GetSpectrumModel(centerFrequencies.front(), channelWidth, carrierSpacing, guardBandwidth));
auto nGuardBands = static_cast<uint32_t>(((2 * guardBandwidth * 1e6) / carrierSpacing) + 0.5);
auto nAllocatedBands = static_cast<uint32_t>(((channelWidth * 1e6) / carrierSpacing) + 0.5);
NS_ASSERT_MSG(c->GetSpectrumModel()->GetNumBands() == (nAllocatedBands + nGuardBands + 1),
@@ -492,17 +523,20 @@ WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity(
}
Ptr<SpectrumValue>
WifiSpectrumValueHelper::CreateHeMuOfdmTxPowerSpectralDensity(uint16_t centerFrequency,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
const WifiSpectrumBandIndices& ru)
WifiSpectrumValueHelper::CreateHeMuOfdmTxPowerSpectralDensity(
const std::vector<uint16_t>& centerFrequencies,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
const WifiSpectrumBandIndices& ru)
{
NS_LOG_FUNCTION(centerFrequency << channelWidth << txPowerW << guardBandwidth << ru.first
<< ru.second);
NS_ASSERT_MSG(centerFrequencies.size() == 1,
"There is no support for HE OFDM PSD for non-contiguous channels");
NS_LOG_FUNCTION(centerFrequencies.front()
<< channelWidth << txPowerW << guardBandwidth << ru.first << ru.second);
uint32_t carrierSpacing = 78125;
Ptr<SpectrumValue> c = Create<SpectrumValue>(
GetSpectrumModel(centerFrequency, channelWidth, carrierSpacing, guardBandwidth));
GetSpectrumModel(centerFrequencies.front(), channelWidth, carrierSpacing, guardBandwidth));
// Build spectrum mask
auto vit = c->ValuesBegin();

73
src/wifi/model/wifi-spectrum-value-helper.h
View File

@@ -26,6 +26,8 @@
#include <ns3/spectrum-value.h>
#include <vector>
namespace ns3
{
@@ -114,8 +116,8 @@ class WifiSpectrumValueHelper
* Create a transmit power spectral density corresponding to OFDM duplicated over multiple 20
* MHz subchannels. Channel width may vary between 20, 40, 80, and 160 MHz.
*
* \param centerFrequency center frequency (MHz)
* \param channelWidth channel width (MHz)
* \param centerFrequencies center frequency (MHz) per segment
* \param channelWidth total allocated channel width (MHz) over all segments
* \param txPowerW transmit power (W) to allocate
* \param guardBandwidth width of the guard band
* \param minInnerBandDbr the minimum relative power in the inner band (in dBr)
@@ -127,22 +129,22 @@ class WifiSpectrumValueHelper
* Transmit Power Spectral Density in W/Hz for each Band
*/
static Ptr<SpectrumValue> CreateDuplicated20MhzTxPowerSpectralDensity(
uint16_t centerFrequency,
const std::vector<uint16_t>& centerFrequencies,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
double minInnerBandDbr = -20,
double minOuterbandDbr = -28,
double lowestPointDbr = -40,
const std::vector<bool>& puncturedSubchannels = std::vector<bool>{});
const std::vector<bool>& puncturedSubchannels = {});
/**
* Create a transmit power spectral density corresponding to OFDM
* High Throughput (HT) (802.11n/ac). Channel width may vary between
* 20, 40, 80, and 160 MHz.
*
* \param centerFrequency center frequency (MHz)
* \param channelWidth channel width (MHz)
* \param centerFrequencies center frequency (MHz) per segment
* \param channelWidth total allocated channel width (MHz) over all segments
* \param txPowerW transmit power (W) to allocate
* \param guardBandwidth width of the guard band
* \param minInnerBandDbr the minimum relative power in the inner band (in dBr)
@@ -152,22 +154,23 @@ class WifiSpectrumValueHelper
* \return a pointer to a newly allocated SpectrumValue representing the HT OFDM Transmit Power
* Spectral Density in W/Hz for each Band
*/
static Ptr<SpectrumValue> CreateHtOfdmTxPowerSpectralDensity(uint16_t centerFrequency,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
double minInnerBandDbr = -20,
double minOuterbandDbr = -28,
double lowestPointDbr = -40);
static Ptr<SpectrumValue> CreateHtOfdmTxPowerSpectralDensity(
const std::vector<uint16_t>& centerFrequencies,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
double minInnerBandDbr = -20,
double minOuterbandDbr = -28,
double lowestPointDbr = -40);
/**
* Create a transmit power spectral density corresponding to OFDM
* High Efficiency (HE) (802.11ax). Channel width may vary between
* 20, 40, 80, and 160 MHz.
* High Efficiency (HE) (802.11ax) for contiguous channels.
* Channel width may vary between 20, 40, 80, and 160 MHz.
*
* \param centerFrequency center frequency (MHz)
* \param channelWidth channel width (MHz)
* \param txPowerW transmit power (W) to allocate
* \param txPowerW transmit power (W) to allocate
* \param guardBandwidth width of the guard band (MHz)
* \param minInnerBandDbr the minimum relative power in the inner band (in dBr)
* \param minOuterbandDbr the minimum relative power in the outer band (in dBr)
@@ -185,15 +188,42 @@ class WifiSpectrumValueHelper
double minInnerBandDbr = -20,
double minOuterbandDbr = -28,
double lowestPointDbr = -40,
const std::vector<bool>& puncturedSubchannels = std::vector<bool>{});
const std::vector<bool>& puncturedSubchannels = {});
/**
* Create a transmit power spectral density corresponding to OFDM
* High Efficiency (HE) (802.11ax) made of one or more frequency segment(s).
* Channel width may vary between 20, 40, 80, and 160 MHz.
*
* \param centerFrequencies center frequency (MHz) per segment
* \param channelWidth total allocated channel width (MHz) over all segments
* \param txPowerW transmit power (W) to allocate
* \param guardBandwidth width of the guard band (MHz)
* \param minInnerBandDbr the minimum relative power in the inner band (in dBr)
* \param minOuterbandDbr the minimum relative power in the outer band (in dBr)
* \param lowestPointDbr maximum relative power of the outermost subcarriers of the guard band
* (in dBr)
* \param puncturedSubchannels bitmap indicating whether a 20 MHz subchannel is punctured or not
* \return a pointer to a newly allocated SpectrumValue representing the HE OFDM Transmit Power
* Spectral Density in W/Hz for each Band
*/
static Ptr<SpectrumValue> CreateHeOfdmTxPowerSpectralDensity(
const std::vector<uint16_t>& centerFrequencies,
uint16_t channelWidth,
double txPowerW,
uint16_t guardBandwidth,
double minInnerBandDbr = -20,
double minOuterbandDbr = -28,
double lowestPointDbr = -40,
const std::vector<bool>& puncturedSubchannels = {});
/**
* Create a transmit power spectral density corresponding to the OFDMA part
* of HE TB PPDUs for a given RU.
* An ideal (i.e. rectangular) spectral mask is considered for the time being.
*
* \param centerFrequency center frequency (MHz)
* \param channelWidth channel width (MHz)
* \param centerFrequencies center frequency (MHz) per segment
* \param channelWidth total allocated channel width (MHz) over all segments
* \param txPowerW transmit power (W) to allocate
* \param guardBandwidth width of the guard band (MHz)
* \param ru the RU band used by the STA
@@ -201,7 +231,7 @@ class WifiSpectrumValueHelper
* Spectral Density on the RU used by the STA in W/Hz for each Band
*/
static Ptr<SpectrumValue> CreateHeMuOfdmTxPowerSpectralDensity(
uint16_t centerFrequency,
const std::vector<uint16_t>& centerFrequencies,
ChannelWidthMhz channelWidth,
double txPowerW,
ChannelWidthMhz guardBandwidth,
@@ -292,8 +322,7 @@ class WifiSpectrumValueHelper
double minInnerBandDbr,
double minOuterbandDbr,
double lowestPointDbr,
const std::vector<WifiSpectrumBandIndices>& puncturedSubBands =
std::vector<WifiSpectrumBandIndices>{},
const std::vector<WifiSpectrumBandIndices>& puncturedSubBands = {},
uint32_t puncturedSlopeWidth = 0);
/**

2
src/wifi/test/wifi-phy-ofdma-test.cc
View File

@@ -2465,7 +2465,7 @@ TestMultipleHeTbPreambles::RxHeTbPpdu(uint64_t uid,
ppduOfdma->SetTxPsdFlag(HePpdu::PSD_HE_PORTION);
const auto band = m_phy->GetHePhy()->GetRuBandForRx(txVector, staId);
Ptr<SpectrumValue> rxPsdOfdma =
WifiSpectrumValueHelper::CreateHeMuOfdmTxPowerSpectralDensity(DEFAULT_FREQUENCY,
WifiSpectrumValueHelper::CreateHeMuOfdmTxPowerSpectralDensity({DEFAULT_FREQUENCY},
DEFAULT_CHANNEL_WIDTH,
txPowerWatts,
DEFAULT_GUARD_WIDTH,

4
src/wifi/test/wifi-transmit-mask-test.cc
View File

@@ -198,7 +198,7 @@ WifiOfdmMaskSlopesTestCase::DoSetup()
case WIFI_STANDARD_80211n:
NS_ASSERT(m_channelWidth == 20 || m_channelWidth == 40);
m_actualSpectrum =
WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity(freq,
WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity({freq},
m_channelWidth,
refTxPowerW,
m_channelWidth,
@@ -212,7 +212,7 @@ WifiOfdmMaskSlopesTestCase::DoSetup()
NS_ASSERT(m_channelWidth == 20 || m_channelWidth == 40 || m_channelWidth == 80 ||
m_channelWidth == 160);
m_actualSpectrum =
WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity(freq,
WifiSpectrumValueHelper::CreateHtOfdmTxPowerSpectralDensity({freq},
m_channelWidth,
refTxPowerW,
m_channelWidth,