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

activated compiler warnings

Browse Source
This commit is contained in:
f4exb
2017-05-25 20:13:34 +02:00
parent d6f62a69dd
commit 3a3d8e3dcb
157 changed files with 655 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspygui.cpp
+3 -3
View File
@@ -122,7 +122,7 @@ bool AirspyGui::deserialize(const QByteArray& data)
}
}
bool AirspyGui::handleMessage(const Message& message)
bool AirspyGui::handleMessage(const Message& message __attribute__((unused)))
{
return false;
// if (AirspyInput::MsgReportAirspy::match(message))
@@ -214,14 +214,14 @@ void AirspyGui::displaySettings()
void AirspyGui::displaySampleRates()
{
int savedIndex = m_settings.m_devSampleRateIndex;
unsigned int savedIndex = m_settings.m_devSampleRateIndex;
ui->sampleRate->blockSignals(true);
if (m_rates.size() > 0)
{
ui->sampleRate->clear();
for (int i = 0; i < m_rates.size(); i++)
for (unsigned int i = 0; i < m_rates.size(); i++)
{
ui->sampleRate->addItem(QString("%1").arg(QString::number(m_rates[i]/1000000.0, 'f', 1)));
}
plugins/samplesource/airspy/airspyinput.cpp
+4 -8
View File
@@ -99,7 +99,7 @@ bool AirspyInput::openDevice()
m_sampleRates.clear();
for (int i=0; i<nbSampleRates; i++)
for (unsigned int i=0; i<nbSampleRates; i++)
{
m_sampleRates.push_back(sampleRates[i]);
qDebug("AirspyInput::start: sampleRates[%d] = %u Hz", i, sampleRates[i]);
@@ -248,7 +248,7 @@ bool AirspyInput::applySettings(const AirspySettings& settings, bool force)
QMutexLocker mutexLocker(&m_mutex);
bool forwardChange = false;
airspy_error rc;
airspy_error rc = AIRSPY_ERROR_OTHER;
qDebug() << "AirspyInput::applySettings";
@@ -486,12 +486,8 @@ bool AirspyInput::applySettings(const AirspySettings& settings, bool force)
struct airspy_device *AirspyInput::open_airspy_from_sequence(int sequence)
{
airspy_read_partid_serialno_t read_partid_serialno;
struct airspy_device *devinfo, *retdev = 0;
uint32_t serial_msb = 0;
uint32_t serial_lsb = 0;
airspy_error rc;
int i;
struct airspy_device *devinfo;
airspy_error rc = AIRSPY_ERROR_OTHER;
for (int i = 0; i < AIRSPY_MAX_DEVICE; i++)
{
plugins/samplesource/airspy/airspyplugin.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
serial_lsb = read_partid_serialno.serial_no[3];
QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16);
uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb;
//uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb;
QString displayedName(QString("Airspy[%1] %2").arg(i).arg(serial_str));
result.append(SamplingDevice(displayedName,
plugins/samplesource/bladerfinput/bladerfinput.cpp
-1
View File
@@ -300,7 +300,6 @@ bool BladerfInput::applySettings(const BladeRFInputSettings& settings, bool forc
if (m_deviceAPI->getSinkBuddies().size() > 0)
{
DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0];
DeviceBladeRFParams *buddySharedParams = (DeviceBladeRFParams *) buddy->getBuddySharedPtr();
if (buddy->getDeviceSinkEngine()->state() == DSPDeviceSinkEngine::StRunning) // Tx side running
{
plugins/samplesource/bladerfinput/bladerfinputgui.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
ui->sampleRate->setValueRange(8, 330000U, BLADERF_SAMPLERATE_REC_MAX);
ui->bandwidth->clear();
for (int i = 0; i < BladerfBandwidths::getNbBandwidths(); i++)
for (unsigned int i = 0; i < BladerfBandwidths::getNbBandwidths(); i++)
{
ui->bandwidth->addItem(QString::number(BladerfBandwidths::getBandwidth(i)));
}
@@ -128,7 +128,7 @@ bool BladerfInputGui::deserialize(const QByteArray& data)
}
}
bool BladerfInputGui::handleMessage(const Message& message)
bool BladerfInputGui::handleMessage(const Message& message __attribute__((unused)))
{
return false;
}
plugins/samplesource/fcdpro/fcdprogui.cpp
+2 -2
View File
@@ -213,7 +213,7 @@ bool FCDProGui::deserialize(const QByteArray& data)
}
}
bool FCDProGui::handleMessage(const Message& message)
bool FCDProGui::handleMessage(const Message& message __attribute__((unused)))
{
return false;
}
@@ -400,7 +400,7 @@ void FCDProGui::on_gain6_currentIndexChanged(int index)
sendSettings();
}
void FCDProGui::on_setDefaults_clicked(bool checked)
void FCDProGui::on_setDefaults_clicked(bool checked __attribute__((unused)))
{
m_settings.m_lnaGainIndex = 8; // +15 dB
//m_settings.rfFilterIndex = 0;
plugins/samplesource/fcdpro/fcdproinput.cpp
+2 -2
View File
@@ -387,9 +387,9 @@ void FCDProInput::set_center_freq(double freq)
}
void FCDProInput::set_bias_t(bool on)
void FCDProInput::set_bias_t(bool on __attribute__((unused)))
{
quint8 cmd = on ? 1 : 0;
//quint8 cmd = on ? 1 : 0;
// TODO: use FCD Pro controls
//fcdAppSetParam(m_dev, FCD_CMD_APP_SET_BIAS_TEE, &cmd, 1);
plugins/samplesource/fcdpro/fcdprosettings.cpp
-2
View File
@@ -86,8 +86,6 @@ bool FCDProSettings::deserialize(const QByteArray& data)
if (d.getVersion() == 1)
{
int intval;
d.readBool(1, &m_dcBlock, false);
d.readBool(2, &m_iqCorrection, false);
d.readS32(3, &m_LOppmTenths, 0);
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ bool FCDProPlusGui::deserialize(const QByteArray& data)
}
}
bool FCDProPlusGui::handleMessage(const Message& message)
bool FCDProPlusGui::handleMessage(const Message& message __attribute__((unused)))
{
return false;
}
plugins/samplesource/fcdproplus/fcdproplussettings.cpp
-2
View File
@@ -66,8 +66,6 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data)
if (d.getVersion() == 1)
{
int intval;
d.readBool(1, &m_biasT, false);
d.readBool(2, &m_rangeLow, false);
d.readBool(3, &m_mixGain, true);
plugins/samplesource/filesource/filesourcegui.cpp
+2 -2
View File
@@ -209,7 +209,7 @@ void FileSourceGui::sendSettings()
{
}
void FileSourceGui::on_playLoop_toggled(bool checked)
void FileSourceGui::on_playLoop_toggled(bool checked __attribute__((unused)))
{
// TODO: do something about it!
}
@@ -281,7 +281,7 @@ void FileSourceGui::on_navTimeSlider_valueChanged(int value)
}
}
void FileSourceGui::on_showFileDialog_clicked(bool checked)
void FileSourceGui::on_showFileDialog_clicked(bool checked __attribute__((unused)))
{
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open I/Q record file"), ".", tr("SDR I/Q Files (*.sdriq)"));
plugins/samplesource/filesource/filesourceinput.cpp
-1
View File
@@ -64,7 +64,6 @@ bool FileSourceInput::Settings::deserialize(const QByteArray& data)
}
if(d.getVersion() == 1) {
int intval;
d.readString(1, &m_fileName, "./test.sdriq");
return true;
} else {
plugins/samplesource/filesource/filesourcethread.cpp
-2
View File
@@ -125,8 +125,6 @@ void FileSourceThread::setBuffer(std::size_t chunksize)
void FileSourceThread::run()
{
int res;
m_running = true;
m_startWaiter.wakeAll();
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+2 -2
View File
@@ -202,11 +202,11 @@ void HackRFInputGui::displaySettings()
void HackRFInputGui::displayBandwidths()
{
int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000);
unsigned int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000);
ui->bbFilter->blockSignals(true);
ui->bbFilter->clear();
for (int i = 0; i < HackRFBandwidths::m_nb_bw; i++)
for (unsigned int i = 0; i < HackRFBandwidths::m_nb_bw; i++)
{
ui->bbFilter->addItem(QString("%1M").arg(QString::number(HackRFBandwidths::m_bw_k[i]/1000.0, 'f', 2)));
}
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
uint32_t serial_lsb = read_partid_serialno.serial_no[3];
QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16);
uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb;
//uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb;
QString displayedName(QString("HackRF[%1] %2").arg(i).arg(serial_str));
result.append(SamplingDevice(displayedName,
plugins/samplesource/limesdrinput/limesdrinput.cpp
+5 -5
View File
@@ -104,7 +104,7 @@ bool LimeSDRInput::openDevice()
char *busyChannels = new char[deviceParams->m_nbRxChannels];
memset(busyChannels, 0, deviceParams->m_nbRxChannels);
for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++)
for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++)
{
DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i];
DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr();
@@ -197,7 +197,7 @@ void LimeSDRInput::suspendBuddies()
{
// suspend Rx buddy's threads
for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++)
for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++)
{
DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i];
DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr();
@@ -209,7 +209,7 @@ void LimeSDRInput::suspendBuddies()
// suspend Tx buddy's threads
for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++)
for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++)
{
DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i];
DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr();
@@ -224,7 +224,7 @@ void LimeSDRInput::resumeBuddies()
{
// resume Rx buddy's threads
for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++)
for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++)
{
DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i];
DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr();
@@ -236,7 +236,7 @@ void LimeSDRInput::resumeBuddies()
// resume Tx buddy's threads
for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++)
for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++)
{
DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i];
DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr();
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+2 -2
View File
@@ -144,7 +144,7 @@ bool LimeSDRInputGUI::deserialize(const QByteArray& data)
}
}
bool LimeSDRInputGUI::handleMessage(const Message& message) // TODO: does not seem to be really useful in any of the source (+sink?) plugins
bool LimeSDRInputGUI::handleMessage(const Message& message __attribute__((unused))) // TODO: does not seem to be really useful in any of the source (+sink?) plugins
{
return false;
}
@@ -393,7 +393,7 @@ void LimeSDRInputGUI::on_ncoEnable_toggled(bool checked)
sendSettings();
}
void LimeSDRInputGUI::on_ncoReset_clicked(bool checked)
void LimeSDRInputGUI::on_ncoReset_clicked(bool checked __attribute__((unused)))
{
m_settings.m_ncoFrequency = 0;
ui->ncoFrequency->setValue(m_settings.m_centerFrequency/1000);
plugins/samplesource/limesdrinput/limesdrinputthread.h
+1 -1
View File
@@ -39,7 +39,7 @@ public:
virtual void startWork();
virtual void stopWork();
virtual void setDeviceSampleRate(int sampleRate) {}
virtual void setDeviceSampleRate(int sampleRate __attribute__((unused))) {}
void setLog2Decimation(unsigned int log2_decim);
void setFcPos(int fcPos);
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ void RTLSDRGui::on_gain_valueChanged(int value)
sendSettings();
}
void RTLSDRGui::on_sampleRate_currentIndexChanged(int index)
void RTLSDRGui::on_sampleRate_currentIndexChanged(int index __attribute__((unused)))
{
}
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ bool RTLSDRInput::handleMessage(const Message& message)
}
else if (MsgQueryRTLSDR::match(message))
{
MsgQueryRTLSDR& conf = (MsgQueryRTLSDR&) message;
//MsgQueryRTLSDR& conf = (MsgQueryRTLSDR&) message;
qDebug() << "RTLSDRInput::handleMessage: MsgQueryRTLSDR";
MsgReportRTLSDR *message = MsgReportRTLSDR::create(m_gains);
plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp
+5 -6
View File
@@ -95,7 +95,7 @@ SDRdaemonBuffer::~SDRdaemonBuffer()
void SDRdaemonBuffer::updateBufferSize(uint32_t sampleRate)
{
uint32_t rawSize = sampleRate * m_iqSampleSize * m_rawBufferLengthSeconds; // store worth of this seconds of samples at this sample rate
int rawSize = sampleRate * m_iqSampleSize * m_rawBufferLengthSeconds; // store worth of this seconds of samples at this sample rate
if ((m_frameSize > 0) && (rawSize / m_frameSize < m_rawBufferMinNbFrames))
{
@@ -148,9 +148,8 @@ void SDRdaemonBuffer::updateReadBufferSize(uint32_t length)
m_readBuffer = new uint8_t[length];
}
bool SDRdaemonBuffer::readMeta(char *array, uint32_t length)
bool SDRdaemonBuffer::readMeta(char *array)
{
assert(length >= sizeof(MetaData) + 8);
MetaData *metaData = (MetaData *) array;
if (m_crc64.calculate_crc((uint8_t *) array, sizeof(MetaData) - 8) == metaData->m_crc)
@@ -183,7 +182,7 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length)
{
m_sampleBytes = metaData->m_sampleBytes & 0x0F;
uint32_t frameSize = m_iqSampleSize * metaData->m_nbSamples * metaData->m_nbBlocks;
int sampleRate = metaData->m_sampleRate;
uint32_t sampleRate = metaData->m_sampleRate;
if (sampleRate != m_sampleRateStream) // change of nominal stream sample rate
{
@@ -337,7 +336,7 @@ uint8_t *SDRdaemonBuffer::readData(int32_t length)
}
}
void SDRdaemonBuffer::writeDataLZ4(const char *array, uint32_t length)
void SDRdaemonBuffer::writeDataLZ4(const char *array, int length)
{
if (m_lz4InCount + length < m_lz4InSize)
{
@@ -394,7 +393,7 @@ void SDRdaemonBuffer::writeToRawBufferLZ4()
}
}
void SDRdaemonBuffer::writeToRawBufferUncompressed(const char *array, uint32_t length)
void SDRdaemonBuffer::writeToRawBufferUncompressed(const char *array, int length)
{
// TODO: handle the 1 byte per I or Q sample
if (m_writeIndex + length < m_rawSize)
plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h
+7 -7
View File
@@ -63,7 +63,7 @@ public:
SDRdaemonBuffer(uint32_t throttlems);
~SDRdaemonBuffer();
bool readMeta(char *array, uint32_t length); //!< Attempt to read meta. Returns true if meta block
bool readMeta(char *array); //!< Attempt to read meta. Returns true if meta block
void writeData(char *array, uint32_t length); //!< Write data into buffer.
uint8_t *readData(int32_t length);
void updateBlockCounts(uint32_t nbBytesReceived);
@@ -118,15 +118,15 @@ private:
void updateBufferSize(uint32_t sampleRate);
void updateLZ4Sizes(uint32_t frameSize);
void updateReadBufferSize(uint32_t length);
void writeDataLZ4(const char *array, uint32_t length);
void writeDataLZ4(const char *array, int length);
void writeToRawBufferLZ4();
void writeToRawBufferUncompressed(const char *array, uint32_t length);
void writeToRawBufferUncompressed(const char *array, int length);
void resetIndexes();
static void printMeta(const QString& header, MetaData *metaData);
uint32_t m_throttlemsNominal; //!< Initial throttle in ms
uint32_t m_rawSize; //!< Size of the raw samples buffer in bytes
int m_rawSize; //!< Size of the raw samples buffer in bytes
uint8_t *m_rawBuffer; //!< Buffer for raw samples obtained from UDP (I/Q not in a formal I/Q structure)
uint32_t m_sampleRateStream; //!< Current sample rate from the stream meta data
uint32_t m_sampleRate; //!< Current actual sample rate in Hz
@@ -142,8 +142,8 @@ private:
uint32_t m_bytesInBlock; //!< Number of bytes received in the current UDP block
uint64_t m_dataCRC; //!< CRC64 of the data block
uint32_t m_inCount; //!< Current position of uncompressed input
uint32_t m_lz4InCount; //!< Current position in LZ4 input buffer
uint32_t m_lz4InSize; //!< Size in bytes of the LZ4 input data
int m_lz4InCount; //!< Current position in LZ4 input buffer
int m_lz4InSize; //!< Size in bytes of the LZ4 input data
uint8_t *m_lz4InBuffer; //!< Buffer for LZ4 compressed input
uint8_t *m_lz4OutBuffer; //!< Buffer for LZ4 uncompressed output
uint32_t m_frameSize; //!< Size in bytes of one uncompressed frame
@@ -156,7 +156,7 @@ private:
int32_t m_writeIndex; //!< Current write position in the raw samples buffer
int32_t m_readIndex; //!< Current read position in the raw samples buffer
uint32_t m_readSize; //!< Read buffer size
int m_readSize; //!< Read buffer size
uint8_t *m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer
bool m_autoFollowRate; //!< Auto follow stream sample rate else stick with meta data sample rate
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+12 -13
View File
@@ -75,7 +75,7 @@ SDRdaemonGui::SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_sender = nn_socket(AF_SP, NN_PAIR);
assert(m_sender != -1);
int millis = 500;
int rc = nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
assert (rc == 0);
m_startingTimeStamp.tv_sec = 0;
@@ -189,7 +189,6 @@ bool SDRdaemonGui::deserialize(const QByteArray& data)
{
SimpleDeserializer d(data);
QString address;
uint32_t uintval;
quint16 dataPort;
bool dcBlock;
bool iqCorrection;
@@ -401,7 +400,7 @@ void SDRdaemonGui::displayConfigurationParameters(uint32_t freq,
ui->specificParms->setCursorPosition(0);
}
void SDRdaemonGui::on_applyButton_clicked(bool checked)
void SDRdaemonGui::on_applyButton_clicked(bool checked __attribute__((unused)))
{
bool dataOk, ctlOk;
QString udpAddress = ui->address->text();
@@ -432,7 +431,7 @@ void SDRdaemonGui::on_applyButton_clicked(bool checked)
ui->applyButton->setEnabled(false);
}
void SDRdaemonGui::on_sendButton_clicked(bool checked)
void SDRdaemonGui::on_sendButton_clicked(bool checked __attribute__((unused)))
{
sendConfiguration();
ui->specificParms->setCursorPosition(0);
@@ -500,19 +499,19 @@ void SDRdaemonGui::sendConfiguration()
}
}
void SDRdaemonGui::on_address_textEdited(const QString& arg1)
void SDRdaemonGui::on_address_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
m_addressEdited = true;
}
void SDRdaemonGui::on_dataPort_textEdited(const QString& arg1)
void SDRdaemonGui::on_dataPort_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
m_dataPortEdited = true;
}
void SDRdaemonGui::on_controlPort_textEdited(const QString& arg1)
void SDRdaemonGui::on_controlPort_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
}
@@ -551,33 +550,33 @@ void SDRdaemonGui::on_autoCorrBuffer_toggled(bool checked)
}
}
void SDRdaemonGui::on_resetIndexes_clicked(bool checked)
void SDRdaemonGui::on_resetIndexes_clicked(bool checked __attribute__((unused)))
{
SDRdaemonInput::MsgConfigureSDRdaemonResetIndexes* message = SDRdaemonInput::MsgConfigureSDRdaemonResetIndexes::create();
m_sampleSource->getInputMessageQueue()->push(message);
}
void SDRdaemonGui::on_freq_textEdited(const QString& arg1)
void SDRdaemonGui::on_freq_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_sampleRate_textEdited(const QString& arg1)
void SDRdaemonGui::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_specificParms_textEdited(const QString& arg1)
void SDRdaemonGui::on_specificParms_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_decim_currentIndexChanged(int index)
void SDRdaemonGui::on_decim_currentIndexChanged(int index __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_fcPos_currentIndexChanged(int index)
void SDRdaemonGui::on_fcPos_currentIndexChanged(int index __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ void SDRdaemonUDPHandler::processData()
{
m_sdrDaemonBuffer.updateBlockCounts(m_udpReadBytes);
if (m_sdrDaemonBuffer.readMeta(m_udpBuf, m_udpReadBytes))
if (m_sdrDaemonBuffer.readMeta(m_udpBuf))
{
const SDRdaemonBuffer::MetaData& metaData = m_sdrDaemonBuffer.getCurrentMeta();
bool change = false;
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h
+1 -1
View File
@@ -74,7 +74,7 @@ private:
uint32_t m_readLengthSamples;
uint32_t m_readLength;
bool m_throttleToggle;
int m_rateDivider;
uint32_t m_rateDivider;
bool m_autoCorrBuffer;
void setSamplerate(uint32_t samplerate);
plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp
+10 -12
View File
@@ -29,24 +29,24 @@ const int SDRdaemonFECBuffer::m_sampleSize = 2;
const int SDRdaemonFECBuffer::m_iqSampleSize = 2 * m_sampleSize;
SDRdaemonFECBuffer::SDRdaemonFECBuffer(uint32_t throttlems) :
m_frameHead(0),
m_decoderIndexHead(nbDecoderSlots/2),
m_frameHead(0),
m_curNbBlocks(0),
m_minNbBlocks(256),
m_curOriginalBlocks(0),
m_minOriginalBlocks(128),
m_curNbRecovery(0),
m_maxNbRecovery(0),
m_framesDecoded(true),
m_throttlemsNominal(throttlems),
m_readIndex(0),
m_throttlemsNominal(throttlems),
m_readBuffer(0),
m_readSize(0),
m_bufferLenSec(0.0f),
m_nbReads(0),
m_nbWrites(0),
m_balCorrection(0),
m_balCorrLimit(0),
m_curOriginalBlocks(0)
m_nbReads(0),
m_nbWrites(0),
m_balCorrection(0),
m_balCorrLimit(0)
{
m_currentMeta.init();
m_framesNbBytes = nbDecoderSlots * sizeof(BufferFrame);
@@ -141,7 +141,7 @@ void SDRdaemonFECBuffer::rwCorrectionEstimate(int slotIndex)
int dBytes;
int rwDelta = (m_nbReads * m_readNbBytes) - (m_nbWrites * sizeof(BufferFrame));
if (normalizedReadIndex < (nbDecoderSlots/ 2) * sizeof(BufferFrame)) // read leads
if (normalizedReadIndex < (nbDecoderSlots/ 2) * (int) sizeof(BufferFrame)) // read leads
{
dBytes = - normalizedReadIndex - rwDelta;
}
@@ -158,8 +158,6 @@ void SDRdaemonFECBuffer::rwCorrectionEstimate(int slotIndex)
m_balCorrection = m_balCorrLimit;
}
float rwRatio = (float) (m_nbWrites * sizeof(BufferFrame)) / (float) (m_nbReads * m_readNbBytes);
m_nbReads = 0;
m_nbWrites = 0;
}
@@ -190,7 +188,7 @@ void SDRdaemonFECBuffer::checkSlotData(int slotIndex)
}
}
void SDRdaemonFECBuffer::writeData(char *array, uint32_t length)
void SDRdaemonFECBuffer::writeData(char *array)
{
SuperBlock *superBlock = (SuperBlock *) array;
int frameIndex = superBlock->header.frameIndex;
@@ -323,7 +321,7 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length)
} // decode
}
void SDRdaemonFECBuffer::writeData0(char *array, uint32_t length)
void SDRdaemonFECBuffer::writeData0(char *array __attribute__((unused)), uint32_t length __attribute__((unused)))
{
// Kept as comments for the out of sync blocks algorithms
// assert(length == m_udpPayloadSize);
plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h
+2 -3
View File
@@ -87,7 +87,7 @@ public:
~SDRdaemonFECBuffer();
// R/W operations
void writeData(char *array, uint32_t length); //!< Write data into buffer.
void writeData(char *array); //!< Write data into buffer.
void writeData0(char *array, uint32_t length); //!< Write data into buffer.
uint8_t *readData(int32_t length); //!< Read data from buffer
@@ -148,7 +148,6 @@ public:
{
int32_t val = (m_wrDeltaEstimate * 100) / (int32_t) m_framesNbBytes;
int32_t ret = val < 0 ? -val - 50 : 50 -val;
int32_t rp = (m_readIndex * 100) / (int32_t) m_framesNbBytes;
return ret;
}
else
@@ -210,7 +209,7 @@ private:
uint32_t m_throttlemsNominal; //!< Initial throttle in ms
uint8_t* m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer
uint32_t m_readSize; //!< Read buffer size
int m_readSize; //!< Read buffer size
float m_bufferLenSec;
plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp
+22 -23
View File
@@ -54,23 +54,23 @@ SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_framesDecodingStatus(0),
m_bufferLengthInSecs(0.0),
m_bufferGauge(-50),
m_samplesCount(0),
m_tickCount(0),
m_address("127.0.0.1"),
m_dataPort(9090),
m_controlPort(9091),
m_addressEdited(false),
m_dataPortEdited(false),
m_initSendConfiguration(false),
m_dcBlock(false),
m_iqCorrection(false),
m_nbOriginalBlocks(128),
m_nbFECBlocks(0)
m_nbFECBlocks(0),
m_samplesCount(0),
m_tickCount(0),
m_address("127.0.0.1"),
m_dataPort(9090),
m_controlPort(9091),
m_addressEdited(false),
m_dataPortEdited(false),
m_initSendConfiguration(false),
m_dcBlock(false),
m_iqCorrection(false)
{
m_sender = nn_socket(AF_SP, NN_PAIR);
assert(m_sender != -1);
int millis = 500;
int rc = nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
assert (rc == 0);
m_paletteGreenText.setColor(QPalette::WindowText, Qt::green);
@@ -185,7 +185,6 @@ bool SDRdaemonFECGui::deserialize(const QByteArray& data)
{
SimpleDeserializer d(data);
QString address;
uint32_t uintval;
quint16 dataPort;
bool dcBlock;
bool iqCorrection;
@@ -381,7 +380,7 @@ void SDRdaemonFECGui::displayConfigurationParameters(uint32_t freq,
ui->specificParms->setCursorPosition(0);
}
void SDRdaemonFECGui::on_applyButton_clicked(bool checked)
void SDRdaemonFECGui::on_applyButton_clicked(bool checked __attribute__((unused)))
{
bool dataOk, ctlOk;
QString udpAddress = ui->address->text();
@@ -412,7 +411,7 @@ void SDRdaemonFECGui::on_applyButton_clicked(bool checked)
ui->applyButton->setEnabled(false);
}
void SDRdaemonFECGui::on_sendButton_clicked(bool checked)
void SDRdaemonFECGui::on_sendButton_clicked(bool checked __attribute__((unused)))
{
sendConfiguration();
ui->specificParms->setCursorPosition(0);
@@ -481,19 +480,19 @@ void SDRdaemonFECGui::sendConfiguration()
}
}
void SDRdaemonFECGui::on_address_textEdited(const QString& arg1)
void SDRdaemonFECGui::on_address_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
m_addressEdited = true;
}
void SDRdaemonFECGui::on_dataPort_textEdited(const QString& arg1)
void SDRdaemonFECGui::on_dataPort_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
m_dataPortEdited = true;
}
void SDRdaemonFECGui::on_controlPort_textEdited(const QString& arg1)
void SDRdaemonFECGui::on_controlPort_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
}
@@ -516,27 +515,27 @@ void SDRdaemonFECGui::on_iqImbalance_toggled(bool checked)
}
}
void SDRdaemonFECGui::on_freq_textEdited(const QString& arg1)
void SDRdaemonFECGui::on_freq_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonFECGui::on_sampleRate_textEdited(const QString& arg1)
void SDRdaemonFECGui::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonFECGui::on_specificParms_textEdited(const QString& arg1)
void SDRdaemonFECGui::on_specificParms_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonFECGui::on_decim_currentIndexChanged(int index)
void SDRdaemonFECGui::on_decim_currentIndexChanged(int index __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonFECGui::on_fcPos_currentIndexChanged(int index)
void SDRdaemonFECGui::on_fcPos_currentIndexChanged(int index __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ void SDRdaemonFECUDPHandler::dataReadyRead()
void SDRdaemonFECUDPHandler::processData()
{
m_sdrDaemonBuffer.writeData(m_udpBuf, m_udpReadBytes);
m_sdrDaemonBuffer.writeData(m_udpBuf);
const SDRdaemonFECBuffer::MetaDataFEC& metaData = m_sdrDaemonBuffer.getCurrentMeta();
bool change = false;
plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h
+1 -1
View File
@@ -72,7 +72,7 @@ private:
uint32_t m_readLengthSamples;
uint32_t m_readLength;
bool m_throttleToggle;
int m_rateDivider;
uint32_t m_rateDivider;
bool m_autoCorrBuffer;
void processData();
plugins/samplesource/sdrplay/sdrplaygui.cpp
+4 -4
View File
@@ -42,25 +42,25 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
ui->centerFrequency->setValueRange(7, 10U, 12000U);
ui->fBand->clear();
for (int i = 0; i < SDRPlayBands::getNbBands(); i++)
for (unsigned int i = 0; i < SDRPlayBands::getNbBands(); i++)
{
ui->fBand->addItem(SDRPlayBands::getBandName(i));
}
ui->ifFrequency->clear();
for (int i = 0; i < SDRPlayIF::getNbIFs(); i++)
for (unsigned int i = 0; i < SDRPlayIF::getNbIFs(); i++)
{
ui->ifFrequency->addItem(QString::number(SDRPlayIF::getIF(i)/1000));
}
ui->samplerate->clear();
for (int i = 0; i < SDRPlaySampleRates::getNbRates(); i++)
for (unsigned int i = 0; i < SDRPlaySampleRates::getNbRates(); i++)
{
ui->samplerate->addItem(QString::number(SDRPlaySampleRates::getRate(i)/1000));
}
ui->bandwidth->clear();
for (int i = 0; i < SDRPlayBandwidths::getNbBandwidths(); i++)
for (unsigned int i = 0; i < SDRPlayBandwidths::getNbBandwidths(); i++)
{
ui->bandwidth->addItem(QString::number(SDRPlayBandwidths::getBandwidth(i)/1000));
}
plugins/samplesource/sdrplay/sdrplayinput.cpp
+1 -1
View File
@@ -382,7 +382,7 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh
}
else
{
mirisdr_get_lna_gain(m_dev);
lnaGain = mirisdr_get_lna_gain(m_dev);
}
MsgReportSDRPlayGains *message = MsgReportSDRPlayGains::create(