VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 23:43:43 -04:00
Code Issues Projects Releases Wiki Activity

LoRa modulator: added extra bandwidth and DE bits - small enhancements

Browse Source
This commit is contained in:
f4exb
2020-02-11 08:43:02 +01:00
parent 315b8b68c1
commit a5dc668376
5 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/demodlora/lorademodsink.h
+1 -1
View File
@@ -63,7 +63,7 @@ private:
int m_chirp;
int m_chirp0;
static const unsigned int m_requiredPreambleChirps = 3; //!< Number of chirps required to estimate preamble
static const unsigned int m_requiredPreambleChirps = 4; //!< Number of chirps required to estimate preamble
static const unsigned int m_maxSFDSearchChirps = 8; //!< Maximum number of chirps when looking for SFD after preamble detection
static const unsigned int m_sfdFourths = 5; //!< Number of SFD chip period fourths to skip until payload
static const unsigned int m_fftInterpolation = 1; //!< FFT interpolation factor (usually a power of 2)
plugins/channeltx/modlora/loramodgui.ui
+1 -1
View File
@@ -223,7 +223,7 @@
<number>0</number>
</property>
<property name="maximum">
<number>2</number>
<number>4</number>
</property>
<property name="pageStep">
<number>1</number>
plugins/channeltx/modlora/loramodsettings.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include "settings/serializable.h"
#include "loramodsettings.h"
const int LoRaModSettings::bandwidths[] = {7813, 10417, 15625, 20833, 31250, 41667, 62500, 125000, 250000, 500000};
const int LoRaModSettings::nbBandwidths = 10;
const int LoRaModSettings::bandwidths[] = {2500, 7813, 10417, 15625, 20833, 31250, 41667, 62500, 125000, 250000, 500000};
const int LoRaModSettings::nbBandwidths = 11;
const int LoRaModSettings::oversampling = 4;
LoRaModSettings::LoRaModSettings() :
plugins/channeltx/modlora/loramodsource.cpp
+45 -14
View File
@@ -35,6 +35,7 @@ LoRaModSource::LoRaModSource() :
m_magsq = 0.0;
initSF(m_settings.m_spreadFactor);
initTest(m_settings.m_spreadFactor, m_settings.m_deBits);
reset();
applySettings(m_settings, true);
applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
@@ -61,13 +62,6 @@ void LoRaModSource::initSF(unsigned int sf)
m_quarterSamples = (m_fftLength/4)*LoRaModSettings::oversampling;
m_downChirps = new Complex[2*m_fftLength*LoRaModSettings::oversampling]; // Each table is 2 chirps long to allow use from arbitrary offsets.
m_upChirps = new Complex[2*m_fftLength*LoRaModSettings::oversampling];
m_symbols.clear();
for (unsigned int symbol = m_fftLength/4; symbol < m_fftLength; symbol += m_fftLength/4)
{
m_symbols.push_back(symbol);
m_symbols.push_back(symbol+1);
}
float halfAngle = M_PI/LoRaModSettings::oversampling;
float phase = -halfAngle;
@@ -89,11 +83,32 @@ void LoRaModSource::initSF(unsigned int sf)
m_phaseIncrements = new double[2*m_fftLength*LoRaModSettings::oversampling];
phase = -halfAngle;
for (int i = 0; i < 2*m_fftLength*LoRaModSettings::oversampling; i++)
for (int i = 0; i < m_fftLength*LoRaModSettings::oversampling; i++)
{
m_phaseIncrements[i] = phase;
phase += (2*halfAngle) / (m_fftLength*LoRaModSettings::oversampling);
phase = phase > halfAngle ? -halfAngle : phase;
}
std::copy(
m_phaseIncrements,
m_phaseIncrements+m_fftLength*LoRaModSettings::oversampling,
m_phaseIncrements+m_fftLength*LoRaModSettings::oversampling
);
}
void LoRaModSource::initTest(unsigned int sf, unsigned int deBits)
{
unsigned int fftLength = 1<<sf;
unsigned int symbolRange = fftLength/(1<<deBits);
m_symbols.clear();
for (unsigned int seq = 0; seq < 1; seq++)
{
for (unsigned int symbol = 0; symbol < symbolRange; symbol += symbolRange/4)
{
m_symbols.push_back(symbol);
m_symbols.push_back(symbol+1);
}
}
}
@@ -225,8 +240,9 @@ void LoRaModSource::modulateSample()
else if (m_state == LoRaStateSFD)
{
// m_modSample = m_downChirps[m_chirp];
m_modSample = Complex(std::conj(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor)));
m_modPhasor += m_phaseIncrements[m_chirp];
m_modSample = Complex(std::polar(0.891235351562 * SDR_TX_SCALED, m_modPhasor));
int chirpIndex = m_fftLength*LoRaModSettings::oversampling - 1 - m_chirp;
m_modPhasor += m_phaseIncrements[chirpIndex];
m_fftCounter++;
m_sampleCounter++;
@@ -247,7 +263,7 @@ void LoRaModSource::modulateSample()
{
m_fftCounter = 0;
m_chirpCount = 0;
m_chirp0 = m_symbols[m_chirpCount];
m_chirp0 = encodeSymbol(m_symbols[m_chirpCount]);
m_chirp = (m_chirp0 + m_fftLength)*LoRaModSettings::oversampling - 1;
m_state = LoRaStatePayload;
}
@@ -270,7 +286,7 @@ void LoRaModSource::modulateSample()
}
else
{
m_chirp0 = m_symbols[m_chirpCount];
m_chirp0 = encodeSymbol(m_symbols[m_chirpCount]);
m_chirp = (m_chirp0 + m_fftLength)*LoRaModSettings::oversampling - 1;
m_fftCounter = 0;
}
@@ -289,6 +305,18 @@ void LoRaModSource::modulateSample()
}
}
unsigned int LoRaModSource::encodeSymbol(unsigned int symbol)
{
if (m_settings.m_deBits == 0) {
return symbol;
}
unsigned int deWidth = 1<<m_settings.m_deBits;
unsigned int baseSymbol = symbol % (m_fftLength/deWidth); // symbols range control
return deWidth*baseSymbol;
// return deWidth*baseSymbol + (deWidth/2) - 1;
}
void LoRaModSource::processOneSample(Complex& ci)
{
}
@@ -313,9 +341,12 @@ void LoRaModSource::calculateLevel(Real& sample)
void LoRaModSource::applySettings(const LoRaModSettings& settings, bool force)
{
if ((settings.m_spreadFactor != m_settings.m_spreadFactor) || force)
if ((settings.m_spreadFactor != m_settings.m_spreadFactor)
|| (settings.m_deBits != m_settings.m_deBits)
|| (settings.m_preambleChirps != m_settings.m_preambleChirps)|| force)
{
initSF(settings.m_spreadFactor);
initTest(settings.m_spreadFactor, settings.m_deBits);
reset();
}
plugins/channeltx/modlora/loramodsource.h
+2
View File
@@ -107,10 +107,12 @@ private:
static const int m_levelNbSamples;
void initSF(unsigned int sf); //!< Init tables, FFTs, depending on spread factor
void initTest(unsigned int sf, unsigned int deBits);
void reset();
void processOneSample(Complex& ci);
void calculateLevel(Real& sample);
void modulateSample();
unsigned int encodeSymbol(unsigned int symbol); //!< Encodes symbol with possible DE bits spacing
};
#endif // INCLUDE_LORAMODSOURCE_H