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

spectrum: Do not allocate power to subcarriers that belongs to an inactive 20 MHz subchannel

Browse Source
This commit is contained in:
Sebastien Deronne
2022-07-17 08:48:55 +02:00
parent 33807b6e46
commit 83db8b2c36
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,8 @@ WifiSpectrumValueHelper::CreateOfdmTxPowerSpectralDensity (uint32_t centerFreque
Ptr<SpectrumValue>
WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity (uint32_t centerFrequency, uint16_t channelWidth, double txPowerW, uint16_t guardBandwidth,
double minInnerBandDbr, double minOuterBandDbr, double lowestPointDbr)
double minInnerBandDbr, double minOuterBandDbr, double lowestPointDbr,
const std::vector<bool>& puncturedSubchannels)
{
NS_LOG_FUNCTION (centerFrequency << channelWidth << txPowerW << guardBandwidth << minInnerBandDbr << minOuterBandDbr << lowestPointDbr);
uint32_t bandBandwidth = 312500;
@@ -223,6 +224,7 @@ WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity (uint32_t c
NS_ASSERT_MSG (c->GetSpectrumModel ()->GetNumBands () == (nAllocatedBands + nGuardBands + 1), "Unexpected number of bands " << c->GetSpectrumModel ()->GetNumBands ());
std::size_t num20MhzBands = channelWidth / 20;
std::size_t numAllocatedSubcarriersPer20MHz = 52;
NS_ASSERT (puncturedSubchannels.empty () || (puncturedSubchannels.size () == num20MhzBands));
double txPowerPerBandW = (txPowerW / numAllocatedSubcarriersPer20MHz) / num20MhzBands;
NS_LOG_DEBUG ("Power per band " << txPowerPerBandW << "W");
@@ -232,8 +234,16 @@ WifiSpectrumValueHelper::CreateDuplicated20MhzTxPowerSpectralDensity (uint32_t c
subBands.resize (num20MhzBands * 2); //the center subcarrier is skipped, hence 2 subbands per 20 MHz subchannel
uint32_t start = (nGuardBands / 2) + (numUnallocatedSubcarriersPer20MHz / 2);
uint32_t stop;
uint8_t index = 0;
for (auto it = subBands.begin (); it != subBands.end (); )
{
if (!puncturedSubchannels.empty () && puncturedSubchannels.at (index++))
{
//if subchannel is punctured, skip it and go the next one
NS_LOG_DEBUG ("20 MHz subchannel " << +index << " is punctured");
it += 2;
continue;
}
stop = start + (numAllocatedSubcarriersPer20MHz / 2) - 1;
*it = std::make_pair (start, stop);
++it;

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

@@ -107,10 +107,13 @@ public:
* \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 duplicated 20 MHz OFDM Transmit Power Spectral Density in W/Hz for each Band
*/
static Ptr<SpectrumValue> CreateDuplicated20MhzTxPowerSpectralDensity (uint32_t centerFrequency, uint16_t channelWidth, double txPowerW, uint16_t guardBandwidth,
double minInnerBandDbr = -20, double minOuterbandDbr = -28, double lowestPointDbr = -40);
static Ptr<SpectrumValue> CreateDuplicated20MhzTxPowerSpectralDensity (uint32_t centerFrequency, uint16_t channelWidth,
double txPowerW, uint16_t guardBandwidth,
double minInnerBandDbr = -20, double minOuterbandDbr = -28, double lowestPointDbr = -40,
const std::vector<bool>& puncturedSubchannels = std::vector<bool> {});
/**
* Create a transmit power spectral density corresponding to OFDM