kopia lustrzana https://github.com/f4exb/sdrangel
Fixed -Wunused-variable warnings
rodzic
55eb6cc951
commit
7a6636b63a
|
@ -849,7 +849,6 @@ void ADSBDemodGUI::handleADSB(
|
||||||
step = 5.0f;
|
step = 5.0f;
|
||||||
adjust = 109;
|
adjust = 109;
|
||||||
}
|
}
|
||||||
float speed = base + (movement - adjust) * step;
|
|
||||||
aircraft->m_speedType = Aircraft::GS;
|
aircraft->m_speedType = Aircraft::GS;
|
||||||
aircraft->m_speedValid = true;
|
aircraft->m_speedValid = true;
|
||||||
aircraft->m_speedItem->setData(Qt::DisplayRole, m_settings.m_siUnits ? knotsToKPHInt(aircraft->m_speed) : (int)std::round(aircraft->m_speed));
|
aircraft->m_speedItem->setData(Qt::DisplayRole, m_settings.m_siUnits ? knotsToKPHInt(aircraft->m_speed) : (int)std::round(aircraft->m_speed));
|
||||||
|
@ -872,8 +871,6 @@ void ADSBDemodGUI::handleADSB(
|
||||||
else if (((tc >= 9) && (tc <= 18)) || ((tc >= 20) && (tc <= 22)))
|
else if (((tc >= 9) && (tc <= 18)) || ((tc >= 20) && (tc <= 22)))
|
||||||
{
|
{
|
||||||
// Airbourne position (9-18 baro, 20-22 GNSS)
|
// Airbourne position (9-18 baro, 20-22 GNSS)
|
||||||
int ss = (data[4] >> 1) & 0x3; // Surveillance status
|
|
||||||
int nicsb = data[4] & 1; // NIC supplement-B - Or single antenna flag
|
|
||||||
int alt = ((data[5] & 0xff) << 4) | ((data[6] >> 4) & 0xf); // Altitude
|
int alt = ((data[5] & 0xff) << 4) | ((data[6] >> 4) & 0xf); // Altitude
|
||||||
int n = ((alt >> 1) & 0x7f0) | (alt & 0xf);
|
int n = ((alt >> 1) & 0x7f0) | (alt & 0xf);
|
||||||
int alt_ft = n * ((alt & 0x10) ? 25 : 100) - 1000;
|
int alt_ft = n * ((alt & 0x10) ? 25 : 100) - 1000;
|
||||||
|
@ -884,7 +881,6 @@ void ADSBDemodGUI::handleADSB(
|
||||||
aircraft->m_altitudeItem->setData(Qt::DisplayRole, m_settings.m_siUnits ? feetToMetresInt(aircraft->m_altitude) : aircraft->m_altitude);
|
aircraft->m_altitudeItem->setData(Qt::DisplayRole, m_settings.m_siUnits ? feetToMetresInt(aircraft->m_altitude) : aircraft->m_altitude);
|
||||||
}
|
}
|
||||||
|
|
||||||
int t = (data[6] >> 3) & 1; // Time synchronisation to UTC
|
|
||||||
int f = (data[6] >> 2) & 1; // CPR odd/even frame - should alternate every 0.2s
|
int f = (data[6] >> 2) & 1; // CPR odd/even frame - should alternate every 0.2s
|
||||||
int lat_cpr = ((data[6] & 3) << 15) | ((data[7] & 0xff) << 7) | ((data[8] >> 1) & 0x7f);
|
int lat_cpr = ((data[6] & 3) << 15) | ((data[7] & 0xff) << 7) | ((data[8] >> 1) & 0x7f);
|
||||||
int lon_cpr = ((data[8] & 1) << 16) | ((data[9] & 0xff) << 8) | (data[10] & 0xff);
|
int lon_cpr = ((data[8] & 1) << 16) | ((data[9] & 0xff) << 8) | (data[10] & 0xff);
|
||||||
|
@ -1013,8 +1009,6 @@ void ADSBDemodGUI::handleADSB(
|
||||||
{
|
{
|
||||||
// Airbourne velocity
|
// Airbourne velocity
|
||||||
int st = data[4] & 0x7; // Subtype
|
int st = data[4] & 0x7; // Subtype
|
||||||
int ic = (data[5] >> 7) & 1; // Intent change flag
|
|
||||||
int nac = (data[5] >> 3) & 0x3; // Velocity uncertainty
|
|
||||||
if ((st == 1) || (st == 2))
|
if ((st == 1) || (st == 2))
|
||||||
{
|
{
|
||||||
// Ground speed
|
// Ground speed
|
||||||
|
@ -1069,7 +1063,6 @@ void ADSBDemodGUI::handleADSB(
|
||||||
aircraft->m_speedValid = true;
|
aircraft->m_speedValid = true;
|
||||||
aircraft->m_speedItem->setData(Qt::DisplayRole, m_settings.m_siUnits ? knotsToKPHInt(aircraft->m_speed) : aircraft->m_speed);
|
aircraft->m_speedItem->setData(Qt::DisplayRole, m_settings.m_siUnits ? knotsToKPHInt(aircraft->m_speed) : aircraft->m_speed);
|
||||||
}
|
}
|
||||||
int vrsrc = (data[8] >> 4) & 1; // Vertical rate source
|
|
||||||
int s_vr = (data[8] >> 3) & 1; // Vertical rate sign
|
int s_vr = (data[8] >> 3) & 1; // Vertical rate sign
|
||||||
int vr = ((data[8] & 0x7) << 6) | ((data[9] >> 2) & 0x3f); // Vertical rate
|
int vr = ((data[8] & 0x7) << 6) | ((data[9] >> 2) & 0x3f); // Vertical rate
|
||||||
aircraft->m_verticalRate = (vr-1)*64*(s_vr?-1:1);
|
aircraft->m_verticalRate = (vr-1)*64*(s_vr?-1:1);
|
||||||
|
@ -1078,8 +1071,6 @@ void ADSBDemodGUI::handleADSB(
|
||||||
aircraft->m_verticalRateItem->setData(Qt::DisplayRole, feetPerMinToMetresPerSecondInt(aircraft->m_verticalRate));
|
aircraft->m_verticalRateItem->setData(Qt::DisplayRole, feetPerMinToMetresPerSecondInt(aircraft->m_verticalRate));
|
||||||
else
|
else
|
||||||
aircraft->m_verticalRateItem->setData(Qt::DisplayRole, aircraft->m_verticalRate);
|
aircraft->m_verticalRateItem->setData(Qt::DisplayRole, aircraft->m_verticalRate);
|
||||||
int s_dif = (data[10] >> 7) & 1; // Diff from baro alt, sign
|
|
||||||
int dif = data[10] & 0x7f; // Diff from baro alt
|
|
||||||
}
|
}
|
||||||
else if (tc == 28)
|
else if (tc == 28)
|
||||||
{
|
{
|
||||||
|
@ -1587,8 +1578,6 @@ void ADSBDemodGUI::updateDeviceSetList()
|
||||||
for (; it != deviceUISets.end(); ++it, deviceIndex++)
|
for (; it != deviceUISets.end(); ++it, deviceIndex++)
|
||||||
{
|
{
|
||||||
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
|
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
|
||||||
DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine;
|
|
||||||
DSPDeviceMIMOEngine *deviceMIMOEngine = (*it)->m_deviceMIMOEngine;
|
|
||||||
|
|
||||||
if (deviceSourceEngine) {
|
if (deviceSourceEngine) {
|
||||||
ui->device->addItem(QString("R%1").arg(deviceIndex), deviceIndex);
|
ui->device->addItem(QString("R%1").arg(deviceIndex), deviceIndex);
|
||||||
|
|
|
@ -62,8 +62,6 @@ void ADSBDemodSinkWorker::run()
|
||||||
|
|
||||||
int readIdx = m_sink->m_samplesPerFrame - 1;
|
int readIdx = m_sink->m_samplesPerFrame - 1;
|
||||||
|
|
||||||
int cnt = 0;
|
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
int startIdx = readIdx;
|
int startIdx = readIdx;
|
||||||
|
|
|
@ -132,7 +132,6 @@ void ATVDemodSink::demod(Complex& c)
|
||||||
|
|
||||||
//********** demodulation **********
|
//********** demodulation **********
|
||||||
|
|
||||||
float fftScale = 1.0f;
|
|
||||||
const float& fltI = m_settings.m_fftFiltering ? m_DSBFilterBuffer[m_DSBFilterBufferIndex].real() : c.real();
|
const float& fltI = m_settings.m_fftFiltering ? m_DSBFilterBuffer[m_DSBFilterBufferIndex].real() : c.real();
|
||||||
const float& fltQ = m_settings.m_fftFiltering ? m_DSBFilterBuffer[m_DSBFilterBufferIndex].imag() : c.imag();
|
const float& fltQ = m_settings.m_fftFiltering ? m_DSBFilterBuffer[m_DSBFilterBufferIndex].imag() : c.imag();
|
||||||
double magSq;
|
double magSq;
|
||||||
|
|
|
@ -38,9 +38,6 @@ void ChirpChatDemodDecoderLoRa::decodeHeader(
|
||||||
// Actual header is always represented with 5 8-bit codewords : static headerCodewords = 5
|
// Actual header is always represented with 5 8-bit codewords : static headerCodewords = 5
|
||||||
// These 8-bit codewords are encoded with Hamming(4,8) FEC : static headerParityBits = 4
|
// These 8-bit codewords are encoded with Hamming(4,8) FEC : static headerParityBits = 4
|
||||||
|
|
||||||
const unsigned int numSymbols = roundUp(inSymbols.size(), 4 + nbParityBits);
|
|
||||||
const unsigned int numCodewords = (numSymbols / (4 + nbParityBits))*nbSymbolBits;
|
|
||||||
|
|
||||||
std::vector<uint16_t> symbols(headerSymbols);
|
std::vector<uint16_t> symbols(headerSymbols);
|
||||||
std::copy(inSymbols.begin(), inSymbols.begin() + headerSymbols, symbols.begin());
|
std::copy(inSymbols.begin(), inSymbols.begin() + headerSymbols, symbols.begin());
|
||||||
|
|
||||||
|
@ -364,4 +361,4 @@ void ChirpChatDemodDecoderLoRa::getCodingMetrics(
|
||||||
{
|
{
|
||||||
numCodewords = roundUp((packetLength + (hasCRC ? 2 : 0))*2 + (hasHeader ? headerCodewords : 0), nbSymbolBits); // uses payload + CRC for encoding size
|
numCodewords = roundUp((packetLength + (hasCRC ? 2 : 0))*2 + (hasHeader ? headerCodewords : 0), nbSymbolBits); // uses payload + CRC for encoding size
|
||||||
numSymbols = headerSymbols + (numCodewords / nbSymbolBits - 1) * (4 + nbParityBits); // header is always coded with 8 bits and yields exactly 8 symbols (headerSymbols)
|
numSymbols = headerSymbols + (numCodewords / nbSymbolBits - 1) * (4 + nbParityBits); // header is always coded with 8 bits and yields exactly 8 symbols (headerSymbols)
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,7 +132,6 @@ void ChirpChatDemodSink::initSF(unsigned int sf, unsigned int deBits, FFTWindow:
|
||||||
|
|
||||||
void ChirpChatDemodSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
|
void ChirpChatDemodSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
|
||||||
{
|
{
|
||||||
int newangle;
|
|
||||||
Complex ci;
|
Complex ci;
|
||||||
|
|
||||||
for (SampleVector::const_iterator it = begin; it < end; ++it)
|
for (SampleVector::const_iterator it = begin; it < end; ++it)
|
||||||
|
|
|
@ -969,8 +969,6 @@ void DATVDemodSink::InitDATVS2Framework()
|
||||||
**/
|
**/
|
||||||
// FILTERING
|
// FILTERING
|
||||||
|
|
||||||
int decim = 1;
|
|
||||||
|
|
||||||
//******** -> if ( m_objCfg.resample )
|
//******** -> if ( m_objCfg.resample )
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -919,7 +919,6 @@ struct s2_frame_receiver : runnable
|
||||||
if (psymbols)
|
if (psymbols)
|
||||||
*psymbols++ = p * scale_symbols;
|
*psymbols++ = p * scale_symbols;
|
||||||
#endif
|
#endif
|
||||||
uint8_t symb = track_symbol(&ss, p, qpsk, 1);
|
|
||||||
if (psampled_pls)
|
if (psampled_pls)
|
||||||
*psampled_pls++ = p;
|
*psampled_pls++ = p;
|
||||||
int bit = (p.im < 0); // suboptimal
|
int bit = (p.im < 0); // suboptimal
|
||||||
|
@ -1173,7 +1172,6 @@ struct s2_frame_receiver : runnable
|
||||||
for (int i = c->nsymbols; i--;)
|
for (int i = c->nsymbols; i--;)
|
||||||
{
|
{
|
||||||
complex<int8_t> p = c->symbols[i];
|
complex<int8_t> p = c->symbols[i];
|
||||||
float re = p.re * cosf(angle) - p.im * sinf(angle);
|
|
||||||
float im = p.re * sinf(angle) + p.im * cosf(angle);
|
float im = p.re * sinf(angle) + p.im * cosf(angle);
|
||||||
int bit;
|
int bit;
|
||||||
if (im > 1)
|
if (im > 1)
|
||||||
|
@ -1424,7 +1422,6 @@ struct s2_interleaver : runnable
|
||||||
// so we need tos split bytes at boundaries.
|
// so we need tos split bytes at boundaries.
|
||||||
for (; nslots; nslots -= 4)
|
for (; nslots; nslots -= 4)
|
||||||
{
|
{
|
||||||
const hard_sb *pi;
|
|
||||||
hard_sb accs[BPS]; // One accumulator per column
|
hard_sb accs[BPS]; // One accumulator per column
|
||||||
hard_ss *ps;
|
hard_ss *ps;
|
||||||
// Slot 0 (mod 4): 88+2
|
// Slot 0 (mod 4): 88+2
|
||||||
|
@ -1506,8 +1503,6 @@ struct s2_interleaver : runnable
|
||||||
static void interleave4050(const hard_sb *pin, int nslots,
|
static void interleave4050(const hard_sb *pin, int nslots,
|
||||||
plslot<hard_ss> *pout)
|
plslot<hard_ss> *pout)
|
||||||
{
|
{
|
||||||
const hard_sb *pin0 = pin;
|
|
||||||
int rows = 4050;
|
|
||||||
hard_sb accs[4]; // One accumulator per column
|
hard_sb accs[4]; // One accumulator per column
|
||||||
int nacc = 0; // Bits in each column accumulator
|
int nacc = 0; // Bits in each column accumulator
|
||||||
for (; nslots; --nslots, ++pout)
|
for (; nslots; --nslots, ++pout)
|
||||||
|
@ -2048,8 +2043,6 @@ struct s2_fecenc : runnable
|
||||||
{
|
{
|
||||||
while (in.readable() >= 1 && out.writable() >= 1)
|
while (in.readable() >= 1 && out.writable() >= 1)
|
||||||
{
|
{
|
||||||
bbframe *pin = in.rd();
|
|
||||||
fecframe<hard_sb> *pout = out.wr();
|
|
||||||
run_frame(in.rd(), out.wr());
|
run_frame(in.rd(), out.wr());
|
||||||
in.read(1);
|
in.read(1);
|
||||||
out.written(1);
|
out.written(1);
|
||||||
|
@ -2066,7 +2059,6 @@ struct s2_fecenc : runnable
|
||||||
bbscrambling.transform(pin->bytes, fi->Kbch / 8, pbytes);
|
bbscrambling.transform(pin->bytes, fi->Kbch / 8, pbytes);
|
||||||
{ // BCH
|
{ // BCH
|
||||||
size_t msgbytes = fi->Kbch / 8;
|
size_t msgbytes = fi->Kbch / 8;
|
||||||
size_t cwbytes = fi->kldpc / 8;
|
|
||||||
bch_interface *bch = s2bch.bchs[pin->pls.sf][mcinfo->rate];
|
bch_interface *bch = s2bch.bchs[pin->pls.sf][mcinfo->rate];
|
||||||
bch->encode(pbytes, msgbytes, pbytes + msgbytes);
|
bch->encode(pbytes, msgbytes, pbytes + msgbytes);
|
||||||
}
|
}
|
||||||
|
@ -2120,7 +2112,6 @@ struct s2_fecdec : runnable
|
||||||
// LDPC decode
|
// LDPC decode
|
||||||
size_t cwbits = pin->pls.framebits();
|
size_t cwbits = pin->pls.framebits();
|
||||||
size_t msgbits = fi->kldpc;
|
size_t msgbits = fi->kldpc;
|
||||||
size_t chkbits = cwbits - msgbits;
|
|
||||||
s2_ldpc_engine *ldpc = s2ldpc.ldpcs[pin->pls.sf][mcinfo->rate];
|
s2_ldpc_engine *ldpc = s2ldpc.ldpcs[pin->pls.sf][mcinfo->rate];
|
||||||
int ncorr = ldpc->decode_bitflip(fi->ldpc, pin->bytes, msgbits, cwbits, bitflips);
|
int ncorr = ldpc->decode_bitflip(fi->ldpc, pin->bytes, msgbits, cwbits, bitflips);
|
||||||
if (sch->debug2)
|
if (sch->debug2)
|
||||||
|
@ -2131,8 +2122,6 @@ struct s2_fecdec : runnable
|
||||||
{
|
{
|
||||||
// BCH decode
|
// BCH decode
|
||||||
size_t cwbytes = fi->kldpc / 8;
|
size_t cwbytes = fi->kldpc / 8;
|
||||||
size_t msgbytes = fi->Kbch / 8;
|
|
||||||
size_t chkbytes = cwbytes - msgbytes;
|
|
||||||
// Decode with suitable BCH decoder for this MODCOD
|
// Decode with suitable BCH decoder for this MODCOD
|
||||||
bch_interface *bch = s2bch.bchs[pin->pls.sf][mcinfo->rate];
|
bch_interface *bch = s2bch.bchs[pin->pls.sf][mcinfo->rate];
|
||||||
int ncorr = bch->decode(hardbytes, cwbytes);
|
int ncorr = bch->decode(hardbytes, cwbytes);
|
||||||
|
|
|
@ -185,11 +185,6 @@ void FreeDVDemodSink::feed(const SampleVector::const_iterator& begin, const Samp
|
||||||
}
|
}
|
||||||
|
|
||||||
Complex ci;
|
Complex ci;
|
||||||
fftfilt::cmplx *sideband;
|
|
||||||
int n_out;
|
|
||||||
|
|
||||||
int decim = 1<<(m_spanLog2 - 1);
|
|
||||||
unsigned char decim_mask = decim - 1; // counter LSB bit mask for decimation by 2^(m_scaleLog2 - 1)
|
|
||||||
|
|
||||||
for(SampleVector::const_iterator it = begin; it < end; ++it)
|
for(SampleVector::const_iterator it = begin; it < end; ++it)
|
||||||
{
|
{
|
||||||
|
|
|
@ -191,8 +191,6 @@ void FreqTracker::applySettings(const FreqTrackerSettings& settings, bool force)
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<QString> reverseAPIKeys;
|
QList<QString> reverseAPIKeys;
|
||||||
bool updateChannelizer = false;
|
|
||||||
bool updateInterpolator = false;
|
|
||||||
|
|
||||||
if ((m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset) || force) {
|
if ((m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset) || force) {
|
||||||
reverseAPIKeys.append("inputFrequencyOffset");
|
reverseAPIKeys.append("inputFrequencyOffset");
|
||||||
|
|
|
@ -561,7 +561,6 @@ void IEEE_802_15_4_ModSource::addTXFrame(QString data)
|
||||||
uint8_t *pLength;
|
uint8_t *pLength;
|
||||||
crc16itut crc;
|
crc16itut crc;
|
||||||
uint16_t crcValue;
|
uint16_t crcValue;
|
||||||
int len;
|
|
||||||
|
|
||||||
// Create PHY frame
|
// Create PHY frame
|
||||||
p = m_bits;
|
p = m_bits;
|
||||||
|
|
|
@ -200,6 +200,7 @@ bool ATVMod::handleMessage(const Message& cmd)
|
||||||
ATVModBaseband::MsgConfigureCameraData *rep = ATVModBaseband::MsgConfigureCameraData::create(
|
ATVModBaseband::MsgConfigureCameraData *rep = ATVModBaseband::MsgConfigureCameraData::create(
|
||||||
cfg.getIndex(), cfg.getManualFPS(), cfg.getManualFPSEnable()
|
cfg.getIndex(), cfg.getManualFPS(), cfg.getManualFPSEnable()
|
||||||
);
|
);
|
||||||
|
m_basebandSource->getInputMessageQueue()->push(rep);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,6 @@ void ChirpChatModSource::initSF(unsigned int sf)
|
||||||
|
|
||||||
float halfAngle = M_PI/ChirpChatModSettings::oversampling;
|
float halfAngle = M_PI/ChirpChatModSettings::oversampling;
|
||||||
float phase = -halfAngle;
|
float phase = -halfAngle;
|
||||||
double accumulator = 0;
|
|
||||||
|
|
||||||
if (m_phaseIncrements) {
|
if (m_phaseIncrements) {
|
||||||
delete[] m_phaseIncrements;
|
delete[] m_phaseIncrements;
|
||||||
|
|
|
@ -114,7 +114,6 @@ void PacketModSource::modulateSample()
|
||||||
{
|
{
|
||||||
Real audioMod;
|
Real audioMod;
|
||||||
Real linearRampGain;
|
Real linearRampGain;
|
||||||
Real emphasis;
|
|
||||||
|
|
||||||
if ((m_state == idle) || (m_state == wait))
|
if ((m_state == idle) || (m_state == wait))
|
||||||
{
|
{
|
||||||
|
|
|
@ -168,7 +168,6 @@ void RemoteSource::applySettings(const RemoteSourceSettings& settings, bool forc
|
||||||
<< " m_reverseAPIPort: " << settings.m_reverseAPIPort
|
<< " m_reverseAPIPort: " << settings.m_reverseAPIPort
|
||||||
<< " force: " << force;
|
<< " force: " << force;
|
||||||
|
|
||||||
bool change = false;
|
|
||||||
QList<QString> reverseAPIKeys;
|
QList<QString> reverseAPIKeys;
|
||||||
|
|
||||||
if ((m_settings.m_dataAddress != settings.m_dataAddress) || force) {
|
if ((m_settings.m_dataAddress != settings.m_dataAddress) || force) {
|
||||||
|
|
|
@ -82,7 +82,6 @@ bool AFCGUI::handleMessage(const Message& message)
|
||||||
else if (AFCReport::MsgUpdateTarget::match(message))
|
else if (AFCReport::MsgUpdateTarget::match(message))
|
||||||
{
|
{
|
||||||
const AFCReport::MsgUpdateTarget& cfg = (AFCReport::MsgUpdateTarget&) message;
|
const AFCReport::MsgUpdateTarget& cfg = (AFCReport::MsgUpdateTarget&) message;
|
||||||
bool frequencyChanged = cfg.getFrequencyChanged();
|
|
||||||
|
|
||||||
if (cfg.getFrequencyChanged()) {
|
if (cfg.getFrequencyChanged()) {
|
||||||
ui->statusIndicator->setStyleSheet("QLabel { background-color: rgb(232, 85, 85); border-radius: 8px; }"); // red
|
ui->statusIndicator->setStyleSheet("QLabel { background-color: rgb(232, 85, 85); border-radius: 8px; }"); // red
|
||||||
|
|
|
@ -80,7 +80,6 @@ bool AFCSettings::deserialize(const QByteArray& data)
|
||||||
if(d.getVersion() == 1)
|
if(d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
qint32 tmp;
|
|
||||||
uint32_t utmp;
|
uint32_t utmp;
|
||||||
QString strtmp;
|
QString strtmp;
|
||||||
|
|
||||||
|
|
|
@ -212,8 +212,6 @@ void GS232ControllerGUI::updateDeviceSetList()
|
||||||
for (; it != deviceUISets.end(); ++it, deviceIndex++)
|
for (; it != deviceUISets.end(); ++it, deviceIndex++)
|
||||||
{
|
{
|
||||||
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
|
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
|
||||||
DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine;
|
|
||||||
DSPDeviceMIMOEngine *deviceMIMOEngine = (*it)->m_deviceMIMOEngine;
|
|
||||||
|
|
||||||
if (deviceSourceEngine) {
|
if (deviceSourceEngine) {
|
||||||
ui->device->addItem(QString("R%1").arg(deviceIndex), deviceIndex);
|
ui->device->addItem(QString("R%1").arg(deviceIndex), deviceIndex);
|
||||||
|
|
|
@ -83,7 +83,6 @@ bool GS232ControllerSettings::deserialize(const QByteArray& data)
|
||||||
if (d.getVersion() == 1)
|
if (d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
qint32 tmp;
|
|
||||||
uint32_t utmp;
|
uint32_t utmp;
|
||||||
QString strtmp;
|
QString strtmp;
|
||||||
|
|
||||||
|
|
|
@ -177,8 +177,6 @@ void RigCtlServerGUI::updateDeviceSetList()
|
||||||
for (; it != deviceSets.end(); ++it, deviceIndex++)
|
for (; it != deviceSets.end(); ++it, deviceIndex++)
|
||||||
{
|
{
|
||||||
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
|
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
|
||||||
DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine;
|
|
||||||
DSPDeviceMIMOEngine *deviceMIMOEngine = (*it)->m_deviceMIMOEngine;
|
|
||||||
|
|
||||||
if (deviceSourceEngine) {
|
if (deviceSourceEngine) {
|
||||||
ui->device->addItem(QString("R%1").arg(deviceIndex), deviceIndex);
|
ui->device->addItem(QString("R%1").arg(deviceIndex), deviceIndex);
|
||||||
|
|
|
@ -77,7 +77,6 @@ bool RigCtlServerSettings::deserialize(const QByteArray& data)
|
||||||
if (d.getVersion() == 1)
|
if (d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
qint32 tmp;
|
|
||||||
uint32_t utmp;
|
uint32_t utmp;
|
||||||
QString strtmp;
|
QString strtmp;
|
||||||
|
|
||||||
|
|
|
@ -647,11 +647,6 @@ bool RigCtlServerWorker::changeModem(const char *newMode, const char *newModemId
|
||||||
channelSettingsKeys.append("inputFrequencyOffset");
|
channelSettingsKeys.append("inputFrequencyOffset");
|
||||||
QString jsonSettingsStr = tr("\"inputFrequencyOffset\":%1").arg(currentOffset);
|
QString jsonSettingsStr = tr("\"inputFrequencyOffset\":%1").arg(currentOffset);
|
||||||
|
|
||||||
if (!strncmp(newMode, "LSB", 3))
|
|
||||||
{
|
|
||||||
int bw = newModemBw < 0 ? -3000 : -newModemBw;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lsb || (newModemBw >= 0))
|
if (lsb || (newModemBw >= 0))
|
||||||
{
|
{
|
||||||
int bw = lsb ? (newModemBw < 0 ? -3000 : -newModemBw) : newModemBw;
|
int bw = lsb ? (newModemBw < 0 ? -3000 : -newModemBw) : newModemBw;
|
||||||
|
|
|
@ -74,7 +74,6 @@ bool SimplePTTSettings::deserialize(const QByteArray& data)
|
||||||
if(d.getVersion() == 1)
|
if(d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
qint32 tmp;
|
|
||||||
uint32_t utmp;
|
uint32_t utmp;
|
||||||
QString strtmp;
|
QString strtmp;
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,6 @@ bool MetisMISOSettings::deserialize(const QByteArray& data)
|
||||||
|
|
||||||
if (d.getVersion() == 1)
|
if (d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
int intval;
|
|
||||||
uint32_t utmp;
|
uint32_t utmp;
|
||||||
|
|
||||||
d.readU32(1, &m_nbReceivers, 1);
|
d.readU32(1, &m_nbReceivers, 1);
|
||||||
|
@ -184,4 +183,4 @@ int MetisMISOSettings::getSampleRateFromIndex(unsigned int index)
|
||||||
} else {
|
} else {
|
||||||
return 48000;
|
return 48000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -388,7 +388,7 @@ void MetisMISOUDPHandler::fillBuffer(unsigned char *buffer, int& bufferIndex, in
|
||||||
|
|
||||||
int MetisMISOUDPHandler::getCommandValue(int commandIndex)
|
int MetisMISOUDPHandler::getCommandValue(int commandIndex)
|
||||||
{
|
{
|
||||||
int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
|
int c1 = 0, c3 = 0, c4 = 0;
|
||||||
|
|
||||||
if (commandIndex == 0)
|
if (commandIndex == 0)
|
||||||
{
|
{
|
||||||
|
@ -483,7 +483,6 @@ bool MetisMISOUDPHandler::getRxIQInversion(int index)
|
||||||
void MetisMISOUDPHandler::processIQBuffer(unsigned char* buffer)
|
void MetisMISOUDPHandler::processIQBuffer(unsigned char* buffer)
|
||||||
{
|
{
|
||||||
int b = 0;
|
int b = 0;
|
||||||
int b_max;
|
|
||||||
int r;
|
int r;
|
||||||
int sampleI, sampleQ, sampleMic;
|
int sampleI, sampleQ, sampleMic;
|
||||||
|
|
||||||
|
@ -656,4 +655,4 @@ void MetisMISOUDPHandler::processIQBuffer(unsigned char* buffer)
|
||||||
}
|
}
|
||||||
|
|
||||||
m_rxFrame++;
|
m_rxFrame++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -433,8 +433,6 @@ bool XTRXMIMO::handleMessage(const Message& message)
|
||||||
bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force)
|
bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force)
|
||||||
{
|
{
|
||||||
QList<QString> reverseAPIKeys;
|
QList<QString> reverseAPIKeys;
|
||||||
bool rxThreadWasRunning = false;
|
|
||||||
bool txThreadWasRunning = false;
|
|
||||||
bool doRxLPCalibration = false;
|
bool doRxLPCalibration = false;
|
||||||
bool doRxChangeSampleRate = false;
|
bool doRxChangeSampleRate = false;
|
||||||
bool doRxChangeFreq = false;
|
bool doRxChangeFreq = false;
|
||||||
|
@ -1077,7 +1075,7 @@ bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force)
|
||||||
if (m_deviceShared.m_dev->getDevice())
|
if (m_deviceShared.m_dev->getDevice())
|
||||||
{
|
{
|
||||||
qint64 deviceCenterFrequency = DeviceSampleSink::calculateDeviceCenterFrequency(
|
qint64 deviceCenterFrequency = DeviceSampleSink::calculateDeviceCenterFrequency(
|
||||||
settings.m_txCenterFrequency,
|
txXlatedDeviceCenterFrequency,
|
||||||
0,
|
0,
|
||||||
settings.m_log2SoftInterp,
|
settings.m_log2SoftInterp,
|
||||||
DeviceSampleSink::FC_POS_CENTER,
|
DeviceSampleSink::FC_POS_CENTER,
|
||||||
|
|
|
@ -616,7 +616,6 @@ bool USRPOutput::applySettings(const USRPOutputSettings& settings, bool preGetSt
|
||||||
bool forwardChangeTxDSP = false;
|
bool forwardChangeTxDSP = false;
|
||||||
bool forwardChangeAllDSP = false;
|
bool forwardChangeAllDSP = false;
|
||||||
bool forwardClockSource = false;
|
bool forwardClockSource = false;
|
||||||
bool ownThreadWasRunning = false;
|
|
||||||
bool checkRates = false;
|
bool checkRates = false;
|
||||||
QList<QString> reverseAPIKeys;
|
QList<QString> reverseAPIKeys;
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,6 @@ bool USRPOutputSettings::deserialize(const QByteArray& data)
|
||||||
|
|
||||||
if (d.getVersion() == 1)
|
if (d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
int intval;
|
|
||||||
uint32_t uintval;
|
uint32_t uintval;
|
||||||
|
|
||||||
d.readS32(1, &m_devSampleRate, 5000000);
|
d.readS32(1, &m_devSampleRate, 5000000);
|
||||||
|
|
|
@ -747,7 +747,6 @@ bool XTRXOutput::applySettings(const XTRXOutputSettings& settings, bool force, b
|
||||||
bool forwardChangeTxDSP = false;
|
bool forwardChangeTxDSP = false;
|
||||||
bool forwardChangeAllDSP = false;
|
bool forwardChangeAllDSP = false;
|
||||||
bool forwardClockSource = false;
|
bool forwardClockSource = false;
|
||||||
bool txThreadWasRunning = false;
|
|
||||||
bool doLPCalibration = false;
|
bool doLPCalibration = false;
|
||||||
bool doChangeSampleRate = false;
|
bool doChangeSampleRate = false;
|
||||||
bool doChangeFreq = false;
|
bool doChangeFreq = false;
|
||||||
|
|
|
@ -651,7 +651,6 @@ bool USRPInput::applySettings(const USRPInputSettings& settings, bool preGetStre
|
||||||
bool forwardChangeRxDSP = false;
|
bool forwardChangeRxDSP = false;
|
||||||
bool forwardChangeAllDSP = false;
|
bool forwardChangeAllDSP = false;
|
||||||
bool forwardClockSource = false;
|
bool forwardClockSource = false;
|
||||||
bool ownThreadWasRunning = false;
|
|
||||||
bool reapplySomeSettings = false;
|
bool reapplySomeSettings = false;
|
||||||
bool checkRates = false;
|
bool checkRates = false;
|
||||||
QList<QString> reverseAPIKeys;
|
QList<QString> reverseAPIKeys;
|
||||||
|
@ -1156,7 +1155,6 @@ int USRPInput::webapiRun(
|
||||||
void USRPInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
|
void USRPInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
|
||||||
{
|
{
|
||||||
bool success = false;
|
bool success = false;
|
||||||
double temp = 0.0;
|
|
||||||
bool active = false;
|
bool active = false;
|
||||||
quint32 overflows = 0;
|
quint32 overflows = 0;
|
||||||
quint32 timeouts = 0;
|
quint32 timeouts = 0;
|
||||||
|
|
|
@ -819,7 +819,6 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
|
||||||
bool forwardChangeRxDSP = false;
|
bool forwardChangeRxDSP = false;
|
||||||
bool forwardChangeAllDSP = false;
|
bool forwardChangeAllDSP = false;
|
||||||
bool forwardClockSource = false;
|
bool forwardClockSource = false;
|
||||||
bool rxThreadWasRunning = false;
|
|
||||||
bool doLPCalibration = false;
|
bool doLPCalibration = false;
|
||||||
bool doChangeSampleRate = false;
|
bool doChangeSampleRate = false;
|
||||||
bool doChangeFreq = false;
|
bool doChangeFreq = false;
|
||||||
|
|
|
@ -110,7 +110,6 @@ void AudioCompressorSnd::CompressorState::sf_advancecomp(
|
||||||
float dry = 1.0f - wet;
|
float dry = 1.0f - wet;
|
||||||
|
|
||||||
// metering values (not used in core algorithm, but used to output a meter if desired)
|
// metering values (not used in core algorithm, but used to output a meter if desired)
|
||||||
float metergain = 1.0f; // gets overwritten immediately because gain will always be negative
|
|
||||||
float meterfalloff = 0.325f; // seconds
|
float meterfalloff = 0.325f; // seconds
|
||||||
float meterrelease = 1.0f - expf(-1.0f / ((float)rate * meterfalloff));
|
float meterrelease = 1.0f - expf(-1.0f / ((float)rate * meterfalloff));
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ AudioOpus::~AudioOpus()
|
||||||
void AudioOpus::setEncoder(int32_t fs, int nChannels)
|
void AudioOpus::setEncoder(int32_t fs, int nChannels)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
bool newInstance = true;
|
|
||||||
QMutexLocker mutexLocker(&m_mutex);
|
QMutexLocker mutexLocker(&m_mutex);
|
||||||
|
|
||||||
if (m_encoderState) {
|
if (m_encoderState) {
|
||||||
|
|
|
@ -40,7 +40,6 @@ void DeviceEnumerator::addNonDiscoverableDevices(PluginManager *pluginManager, c
|
||||||
QList<DeviceUserArgs::Args>::const_iterator argsIt = args.begin();
|
QList<DeviceUserArgs::Args>::const_iterator argsIt = args.begin();
|
||||||
unsigned int rxIndex = m_rxEnumeration.size();
|
unsigned int rxIndex = m_rxEnumeration.size();
|
||||||
unsigned int txIndex = m_txEnumeration.size();
|
unsigned int txIndex = m_txEnumeration.size();
|
||||||
unsigned int mimoIndex = m_mimoEnumeration.size();
|
|
||||||
|
|
||||||
for (; argsIt != args.end(); ++argsIt)
|
for (; argsIt != args.end(); ++argsIt)
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,9 +66,6 @@ bool FeatureSetPreset::deserialize(const QByteArray& data)
|
||||||
|
|
||||||
if (d.getVersion() == 1)
|
if (d.getVersion() == 1)
|
||||||
{
|
{
|
||||||
bool tmpBool;
|
|
||||||
int tmp;
|
|
||||||
|
|
||||||
d.readString(1, &m_group, "default");
|
d.readString(1, &m_group, "default");
|
||||||
d.readString(2, &m_description, "no name");
|
d.readString(2, &m_description, "no name");
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ void AzEl::calcAzimuth()
|
||||||
double aCos = std::cos(aLat);
|
double aCos = std::cos(aLat);
|
||||||
double aSin = std::sin(aLat);
|
double aSin = std::sin(aLat);
|
||||||
|
|
||||||
double bx = (bRot.m_cart.m_x * aCos) - (bRot.m_cart.m_z * aSin);
|
//double bx = (bRot.m_cart.m_x * aCos) - (bRot.m_cart.m_z * aSin);
|
||||||
double by = bRot.m_cart.m_y;
|
double by = bRot.m_cart.m_y;
|
||||||
double bz = (bRot.m_cart.m_x * aSin) + (bRot.m_cart.m_z * aCos);
|
double bz = (bRot.m_cart.m_x * aSin) + (bRot.m_cart.m_z * aCos);
|
||||||
|
|
||||||
|
|
|
@ -2844,8 +2844,6 @@ int WebAPIAdapter::featuresetFeaturePost(
|
||||||
{
|
{
|
||||||
if ((featureSetIndex >= 0) && (featureSetIndex < (int) m_mainCore->m_featureSets.size()))
|
if ((featureSetIndex >= 0) && (featureSetIndex < (int) m_mainCore->m_featureSets.size()))
|
||||||
{
|
{
|
||||||
FeatureSet *featureSet = m_mainCore->m_featureSets[featureSetIndex];
|
|
||||||
|
|
||||||
PluginAPI::FeatureRegistrations *featureRegistrations = m_mainCore->m_pluginManager->getFeatureRegistrations();
|
PluginAPI::FeatureRegistrations *featureRegistrations = m_mainCore->m_pluginManager->getFeatureRegistrations();
|
||||||
int nbRegistrations = featureRegistrations->size();
|
int nbRegistrations = featureRegistrations->size();
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
|
@ -169,7 +169,6 @@ void WSSpectrum::newSpectrum(
|
||||||
|
|
||||||
qint64 elapsed = m_timer.restart();
|
qint64 elapsed = m_timer.restart();
|
||||||
uint64_t nowMs = TimeUtil::nowms();
|
uint64_t nowMs = TimeUtil::nowms();
|
||||||
QWebSocket *pSender = qobject_cast<QWebSocket *>(sender());
|
|
||||||
QByteArray payload;
|
QByteArray payload;
|
||||||
|
|
||||||
buildPayload(
|
buildPayload(
|
||||||
|
|
|
@ -1978,8 +1978,6 @@ void GLSpectrum::mouseMoveEvent(QMouseEvent* event)
|
||||||
void GLSpectrum::mousePressEvent(QMouseEvent* event)
|
void GLSpectrum::mousePressEvent(QMouseEvent* event)
|
||||||
{
|
{
|
||||||
const QPointF& ep = event->localPos();
|
const QPointF& ep = event->localPos();
|
||||||
float waterfallShiftY = m_topMargin + m_frequencyScaleHeight + (m_waterfallHeight == 0 ? 0 : m_waterfallHeight + m_bottomMargin);
|
|
||||||
float histogramShiftY = m_topMargin + m_frequencyScaleHeight + (m_histogramHeight == 0 ? 0 : m_histogramHeight + m_bottomMargin);
|
|
||||||
|
|
||||||
if (event->button() == Qt::RightButton)
|
if (event->button() == Qt::RightButton)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1066,7 +1066,6 @@ bool MainWindow::handleMessage(const Message& cmd)
|
||||||
{
|
{
|
||||||
MainCore::MsgSetDevice& notif = (MainCore::MsgSetDevice&) cmd;
|
MainCore::MsgSetDevice& notif = (MainCore::MsgSetDevice&) cmd;
|
||||||
ui->tabInputsView->setCurrentIndex(notif.getDeviceSetIndex());
|
ui->tabInputsView->setCurrentIndex(notif.getDeviceSetIndex());
|
||||||
DeviceUISet *deviceUI = m_deviceUIs[notif.getDeviceSetIndex()];
|
|
||||||
ui->inputViewDock->setSelectedDeviceIndex(notif.getDeviceSetIndex(), notif.getDeviceIndex());
|
ui->inputViewDock->setSelectedDeviceIndex(notif.getDeviceSetIndex(), notif.getDeviceIndex());
|
||||||
samplingDeviceChanged(notif.getDeviceType(), notif.getDeviceSetIndex(), notif.getDeviceIndex());
|
samplingDeviceChanged(notif.getDeviceType(), notif.getDeviceSetIndex(), notif.getDeviceIndex());
|
||||||
|
|
||||||
|
@ -1752,7 +1751,6 @@ void MainWindow::samplingDeviceChanged(int deviceType, int tabIndex, int newDevi
|
||||||
{
|
{
|
||||||
qDebug("MainWindow::samplingDeviceChanged: deviceType: %d tabIndex: %d newDeviceIndex: %d",
|
qDebug("MainWindow::samplingDeviceChanged: deviceType: %d tabIndex: %d newDeviceIndex: %d",
|
||||||
deviceType, tabIndex, newDeviceIndex);
|
deviceType, tabIndex, newDeviceIndex);
|
||||||
const PluginInterface::SamplingDevice *samplingDevice;
|
|
||||||
|
|
||||||
if (deviceType == 0) {
|
if (deviceType == 0) {
|
||||||
sampleSourceChanged(tabIndex, newDeviceIndex);
|
sampleSourceChanged(tabIndex, newDeviceIndex);
|
||||||
|
|
Ładowanie…
Reference in New Issue