Fixed -Wunused-parameter warnings

pull/714/head
f4exb 2020-11-14 11:13:32 +01:00
rodzic f668863aed
commit 55eb6cc951
157 zmienionych plików z 290 dodań i 237 usunięć

Wyświetl plik

@ -76,6 +76,8 @@ ChannelGUI* BeamSteeringCWModPlugin::createMIMOChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
MIMOChannel *mimoChannel) const MIMOChannel *mimoChannel) const
{ {
(void) deviceUISet;
(void) mimoChannel;
return nullptr; return nullptr;
} }
#else #else

Wyświetl plik

@ -28,7 +28,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples) {} // prefetching of samples is not implemented virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; } // prefetching of samples is not implemented
void reset(); void reset();
void setPhase(float phase); void setPhase(float phase);

Wyświetl plik

@ -43,6 +43,7 @@ int BeamSteeringCWModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
BeamSteeringCWMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); BeamSteeringCWMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -38,14 +38,17 @@ std::complex<float> s2cNorm(const Sample& s)
} }
Sample sFirst(const Sample& a, const Sample& b) { Sample sFirst(const Sample& a, const Sample& b) {
(void) b;
return a; return a;
} }
Sample sSecond(const Sample& a, const Sample& b) { Sample sSecond(const Sample& a, const Sample& b) {
(void) a;
return b; return b;
} }
Sample sSecondInv(const Sample& a, const Sample& b) { Sample sSecondInv(const Sample& a, const Sample& b) {
(void) a;
return Sample{-b.real(), -b.imag()}; return Sample{-b.real(), -b.imag()};
} }
@ -719,4 +722,4 @@ void InterferometerCorrelator::setPhase(int phase)
m_sin = d_sin; m_sin = d_sin;
m_cos = d_cos; m_cos = d_cos;
} }
} }

Wyświetl plik

@ -140,7 +140,7 @@ int InterferometerWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; (void) force; // no action
(void) errorMessage; (void) errorMessage;
webapiUpdateChannelSettings(m_settings, m_glScopeSettings, m_glSpectrumSettings, channelSettingsKeys, response); webapiUpdateChannelSettings(m_settings, m_glScopeSettings, m_glSpectrumSettings, channelSettingsKeys, response);
return 200; return 200;
@ -384,4 +384,4 @@ QColor InterferometerWebAPIAdapter::intToQColor(int intColor)
int g = bg % 256; int g = bg % 256;
int b = bg / 256; int b = bg / 256;
return QColor(r, g, b); return QColor(r, g, b);
} }

Wyświetl plik

@ -56,7 +56,7 @@ void ADSBDemodDisplayDialog::accept()
QDialog::accept(); QDialog::accept();
} }
void ADSBDemodDisplayDialog::on_font_clicked(bool checked) void ADSBDemodDisplayDialog::on_font_clicked()
{ {
bool ok; bool ok;
QFont font = QFontDialog::getFont(&ok, QFont(m_fontName, m_fontSize), this); QFont font = QFontDialog::getFont(&ok, QFont(m_fontName, m_fontSize), this);

Wyświetl plik

@ -25,24 +25,24 @@ class ADSBDemodDisplayDialog : public QDialog {
Q_OBJECT Q_OBJECT
public: public:
explicit ADSBDemodDisplayDialog(int removeTimeout, float airportRange, ADSBDemodSettings::AirportType airportMinimumSize, explicit ADSBDemodDisplayDialog(int removeTimeout, float airportRange, ADSBDemodSettings::AirportType airportMinimumSize,
bool displayHeliports, bool siUnits, QString fontName, int fontSize, bool displayDemodStats, bool displayHeliports, bool siUnits, QString fontName, int fontSize, bool displayDemodStats,
bool autoResizeTableColumns, QWidget* parent = 0); bool autoResizeTableColumns, QWidget* parent = 0);
~ADSBDemodDisplayDialog(); ~ADSBDemodDisplayDialog();
int m_removeTimeout; int m_removeTimeout;
float m_airportRange; float m_airportRange;
ADSBDemodSettings::AirportType m_airportMinimumSize; ADSBDemodSettings::AirportType m_airportMinimumSize;
bool m_displayHeliports; bool m_displayHeliports;
bool m_siUnits; bool m_siUnits;
QString m_fontName; QString m_fontName;
int m_fontSize; int m_fontSize;
bool m_displayDemodStats; bool m_displayDemodStats;
bool m_autoResizeTableColumns; bool m_autoResizeTableColumns;
private slots: private slots:
void accept(); void accept();
void on_font_clicked(bool checked = false); void on_font_clicked();
private: private:
Ui::ADSBDemodDisplayDialog* ui; Ui::ADSBDemodDisplayDialog* ui;

Wyświetl plik

@ -1238,6 +1238,7 @@ void ADSBDemodGUI::on_feed_clicked(bool checked)
void ADSBDemodGUI::on_adsbData_cellClicked(int row, int column) void ADSBDemodGUI::on_adsbData_cellClicked(int row, int column)
{ {
(void) column;
// Get ICAO of aircraft in row clicked // Get ICAO of aircraft in row clicked
int icao = ui->adsbData->item(row, 0)->text().toInt(nullptr, 16); int icao = ui->adsbData->item(row, 0)->text().toInt(nullptr, 16);
if (m_aircraft.contains(icao)) if (m_aircraft.contains(icao))
@ -1292,12 +1293,14 @@ void ADSBDemodGUI::on_adsbData_cellDoubleClicked(int row, int column)
// Columns in table reordered // Columns in table reordered
void ADSBDemodGUI::adsbData_sectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex) void ADSBDemodGUI::adsbData_sectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex)
{ {
(void) oldVisualIndex;
m_settings.m_columnIndexes[logicalIndex] = newVisualIndex; m_settings.m_columnIndexes[logicalIndex] = newVisualIndex;
} }
// Column in table resized (when hidden size is 0) // Column in table resized (when hidden size is 0)
void ADSBDemodGUI::adsbData_sectionResized(int logicalIndex, int oldSize, int newSize) void ADSBDemodGUI::adsbData_sectionResized(int logicalIndex, int oldSize, int newSize)
{ {
(void) oldSize;
m_settings.m_columnSizes[logicalIndex] = newSize; m_settings.m_columnSizes[logicalIndex] = newSize;
} }
@ -1310,6 +1313,7 @@ void ADSBDemodGUI::columnSelectMenu(QPoint pos)
// Hide/show column when menu selected // Hide/show column when menu selected
void ADSBDemodGUI::columnSelectMenuChecked(bool checked) void ADSBDemodGUI::columnSelectMenuChecked(bool checked)
{ {
(void) checked;
QAction* action = qobject_cast<QAction*>(sender()); QAction* action = qobject_cast<QAction*>(sender());
if (action != nullptr) if (action != nullptr)
{ {
@ -1347,7 +1351,7 @@ void ADSBDemodGUI::on_demodModeS_clicked(bool checked)
applySettings(); applySettings();
} }
void ADSBDemodGUI::on_getOSNDB_clicked(bool checked) void ADSBDemodGUI::on_getOSNDB_clicked()
{ {
// Don't try to download while already in progress // Don't try to download while already in progress
if (m_progressDialog == nullptr) if (m_progressDialog == nullptr)
@ -1367,7 +1371,7 @@ void ADSBDemodGUI::on_getOSNDB_clicked(bool checked)
} }
} }
void ADSBDemodGUI::on_getAirportDB_clicked(bool checked) void ADSBDemodGUI::on_getAirportDB_clicked()
{ {
// Don't try to download while already in progress // Don't try to download while already in progress
if (m_progressDialog == nullptr) if (m_progressDialog == nullptr)
@ -1735,7 +1739,7 @@ void ADSBDemodGUI::feedSelect()
} }
// Show display settings dialog // Show display settings dialog
void ADSBDemodGUI::on_displaySettings_clicked(bool checked) void ADSBDemodGUI::on_displaySettings_clicked()
{ {
ADSBDemodDisplayDialog dialog(m_settings.m_removeTimeout, m_settings.m_airportRange, m_settings.m_airportMinimumSize, ADSBDemodDisplayDialog dialog(m_settings.m_removeTimeout, m_settings.m_airportRange, m_settings.m_airportMinimumSize,
m_settings.m_displayHeliports, m_settings.m_siUnits, m_settings.m_displayHeliports, m_settings.m_siUnits,

Wyświetl plik

@ -242,7 +242,9 @@ public:
bool setData(const QModelIndex &index, const QVariant& value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant& value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const override { Qt::ItemFlags flags(const QModelIndex &index) const override
{
(void) index;
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
} }
@ -374,7 +376,9 @@ public:
bool setData(const QModelIndex &index, const QVariant& value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant& value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const override { Qt::ItemFlags flags(const QModelIndex &index) const override
{
(void) index;
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
} }
@ -537,12 +541,12 @@ private slots:
void columnSelectMenu(QPoint pos); void columnSelectMenu(QPoint pos);
void columnSelectMenuChecked(bool checked = false); void columnSelectMenuChecked(bool checked = false);
void on_spb_currentIndexChanged(int value); void on_spb_currentIndexChanged(int value);
void on_correlateFullPreamble_clicked(bool checked=false); void on_correlateFullPreamble_clicked(bool checked);
void on_demodModeS_clicked(bool checked=false); void on_demodModeS_clicked(bool checked);
void on_feed_clicked(bool checked=false); void on_feed_clicked(bool checked);
void on_getOSNDB_clicked(bool checked = false); void on_getOSNDB_clicked();
void on_getAirportDB_clicked(bool checked = false); void on_getAirportDB_clicked();
void on_flightPaths_clicked(bool checked = false); void on_flightPaths_clicked(bool checked);
void onWidgetRolled(QWidget* widget, bool rollDown); void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDialogCalled(const QPoint& p); void onMenuDialogCalled(const QPoint& p);
void handleInputMessages(); void handleInputMessages();
@ -552,7 +556,7 @@ private slots:
void on_devicesRefresh_clicked(); void on_devicesRefresh_clicked();
void on_device_currentIndexChanged(int index); void on_device_currentIndexChanged(int index);
void feedSelect(); void feedSelect();
void on_displaySettings_clicked(bool checked=false); void on_displaySettings_clicked();
signals: signals:
void homePositionChanged(); void homePositionChanged();
}; };

Wyświetl plik

@ -44,6 +44,7 @@ int ADSBDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
ADSBDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); ADSBDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -77,7 +77,9 @@ ChannelGUI* ADSBPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* ADSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* ADSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -58,7 +58,9 @@ ChannelGUI* AMDemodPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int AMDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
AMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); AMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -43,6 +43,7 @@ int BFMDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
BFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); BFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -78,7 +78,9 @@ ChannelGUI* BFMPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -42,6 +42,7 @@ int ChirpChatDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
ChirpChatDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); ChirpChatDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);
ChirpChatDemod::webapiFormatChannelSettings(response, m_settings); ChirpChatDemod::webapiFormatChannelSettings(response, m_settings);

Wyświetl plik

@ -74,7 +74,9 @@ ChannelGUI* ChirpChatPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* ChirpChatPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* ChirpChatPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -1782,6 +1782,7 @@ struct s2_deinterleaver : runnable
hard_sb accs[/*bps*/], int nacc, hard_sb accs[/*bps*/], int nacc,
bool msb_first) bool msb_first)
{ {
(void) nacc;
if (msb_first) if (msb_first)
{ {
for (int b = 0; b < bps; ++b) for (int b = 0; b < bps; ++b)
@ -1847,6 +1848,7 @@ struct s2_deinterleaver : runnable
static inline void pack_qpsk_symbol(const llr_ss &ps, static inline void pack_qpsk_symbol(const llr_ss &ps,
hard_sb *acc, int nacc) hard_sb *acc, int nacc)
{ {
(void) nacc;
// TBD Must match LLR law, see softsymb_harden. // TBD Must match LLR law, see softsymb_harden.
uint8_t s = llr_harden(ps.bits[0]) | (llr_harden(ps.bits[1]) << 1); uint8_t s = llr_harden(ps.bits[0]) | (llr_harden(ps.bits[1]) << 1);
*acc = (*acc << 2) | s; *acc = (*acc << 2) | s;

Wyświetl plik

@ -32,6 +32,7 @@ inline void softword_set(hard_sb *p, int b, bool v)
inline void softword_clear(hard_sb *p) { *p = 0; } inline void softword_clear(hard_sb *p) { *p = 0; }
inline bool softword_weight(const bool &l) inline bool softword_weight(const bool &l)
{ {
(void) l;
return true; return true;
} }
inline void softbit_set(bool *p, bool v) { *p = v; } inline void softbit_set(bool *p, bool v) { *p = v; }
@ -66,6 +67,8 @@ inline void softwords_flip(hard_sb p[], int b)
} }
uint8_t *softbytes_harden(hard_sb p[], int nbytes, uint8_t storage[]) uint8_t *softbytes_harden(hard_sb p[], int nbytes, uint8_t storage[])
{ {
(void) nbytes;
(void) storage;
return p; return p;
} }

Wyświetl plik

@ -77,7 +77,9 @@ ChannelGUI* DSDDemodPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int DSDDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
DSDDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); DSDDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -43,6 +43,7 @@ int FreeDVDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
FreeDVDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); FreeDVDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* FreeDVPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int NFMDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
NFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); NFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -59,7 +59,9 @@ ChannelGUI* NFMPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int SSBDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
SSBDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); SSBDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -59,7 +59,9 @@ ChannelGUI* SSBPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int WFMDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
WFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); WFMDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -60,7 +60,9 @@ ChannelGUI* WFMPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -76,6 +76,8 @@ ChannelGUI* FileSinkPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
(void) deviceUISet;
(void) rxChannel;
return nullptr; return nullptr;
} }
#else #else

Wyświetl plik

@ -44,6 +44,7 @@ int FileSinkWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
FileSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); FileSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* FreqTrackerPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int FreqTrackerWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
FreqTracker::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); FreqTracker::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -77,7 +77,9 @@ ChannelGUI* LocalSinkPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int LocalSinkWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
LocalSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); LocalSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -77,7 +77,9 @@ ChannelGUI* RemoteSinkPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int RemoteSinkWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
RemoteSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); RemoteSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -76,7 +76,9 @@ ChannelGUI* SigMFFileSinkPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* SigMFFileSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* SigMFFileSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -44,6 +44,7 @@ int SigMFFileSinkWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
SigMFFileSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); SigMFFileSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -76,7 +76,9 @@ ChannelGUI* UDPSinkPlugin::createRxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const BasebandSampleSink *rxChannel) const
{ {
return 0; (void) deviceUISet;
(void) rxChannel;
return nullptr;
} }
#else #else
ChannelGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const ChannelGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int UDPSinkWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
UDPSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); UDPSink::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* FileSourcePlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -40,7 +40,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples) {} virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }
/** Set center frequency given in Hz */ /** Set center frequency given in Hz */
void setCenterFrequency(uint64_t centerFrequency) { m_centerFrequency = centerFrequency; } void setCenterFrequency(uint64_t centerFrequency) { m_centerFrequency = centerFrequency; }

Wyświetl plik

@ -43,6 +43,7 @@ int FileSourceWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
FileSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); FileSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -77,7 +77,9 @@ ChannelGUI* LocalSourcePlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -36,7 +36,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples) {} virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }
void start(DeviceSampleSink *deviceSink); void start(DeviceSampleSink *deviceSink);
void stop(); void stop();

Wyświetl plik

@ -43,6 +43,7 @@ int LocalSourceWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
LocalSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); LocalSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -205,7 +205,7 @@ void IEEE_802_15_4_ModGUI::on_channelMute_toggled(bool checked)
applySettings(); applySettings();
} }
void IEEE_802_15_4_ModGUI::on_txButton_clicked(bool checked) void IEEE_802_15_4_ModGUI::on_txButton_clicked()
{ {
transmit(); transmit();
} }

Wyświetl plik

@ -96,7 +96,7 @@ private slots:
void on_rfBW_valueChanged(int index); void on_rfBW_valueChanged(int index);
void on_gain_valueChanged(int value); void on_gain_valueChanged(int value);
void on_channelMute_toggled(bool checked); void on_channelMute_toggled(bool checked);
void on_txButton_clicked(bool checked); void on_txButton_clicked();
void on_frame_editingFinished(); void on_frame_editingFinished();
void on_frame_returnPressed(); void on_frame_returnPressed();
void on_repeat_toggled(bool checked); void on_repeat_toggled(bool checked);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* IEEE_802_15_4_ModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* IEEE_802_15_4_ModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* IEEE_802_15_4_ModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -93,10 +93,6 @@ void IEEE_802_15_4_ModSource::pullOne(Sample& sample)
sample.m_imag = (FixReal) (ci.imag() * SDR_TX_SCALEF); sample.m_imag = (FixReal) (ci.imag() * SDR_TX_SCALEF);
} }
void IEEE_802_15_4_ModSource::prefetch(unsigned int nbSamples)
{
}
void IEEE_802_15_4_ModSource::sampleToSpectrum(Complex sample) void IEEE_802_15_4_ModSource::sampleToSpectrum(Complex sample)
{ {
if (m_spectrumSink && (m_settings.m_spectrumRate > 0)) if (m_spectrumSink && (m_settings.m_spectrumRate > 0))

Wyświetl plik

@ -47,7 +47,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples); virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }
double getMagSq() const { return m_magsq; } double getMagSq() const { return m_magsq; }
void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const
@ -60,7 +60,7 @@ public:
void setScopeSink(BasebandSampleSink* scopeSink) { m_scopeSink = scopeSink; } void setScopeSink(BasebandSampleSink* scopeSink) { m_scopeSink = scopeSink; }
void applySettings(const IEEE_802_15_4_ModSettings& settings, bool force = false); void applySettings(const IEEE_802_15_4_ModSettings& settings, bool force = false);
void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false); void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false);
uint8_t *hexToBin(uint8_t *p, QString data); uint8_t *hexToBin(uint8_t *p, QString data);
void addTXFrame(QString data); void addTXFrame(QString data);
@ -76,7 +76,7 @@ private:
double *m_sinLUT; double *m_sinLUT;
int m_chips[2]; // Chips. Odd/even for O-QPSK int m_chips[2]; // Chips. Odd/even for O-QPSK
bool m_chipOdd; bool m_chipOdd;
int m_diffBit; // Output of differential coder int m_diffBit; // Output of differential coder
RaisedCosine<Real> m_pulseShapeI; // Pulse shaping filters RaisedCosine<Real> m_pulseShapeI; // Pulse shaping filters
RaisedCosine<Real> m_pulseShapeQ; RaisedCosine<Real> m_pulseShapeQ;
@ -107,10 +107,10 @@ private:
int m_chipsPerSymbol; // Number of chips per symbol int m_chipsPerSymbol; // Number of chips per symbol
int m_bitsPerSymbol; // Number of bits per symbol int m_bitsPerSymbol; // Number of bits per symbol
int m_chipRate; int m_chipRate;
int m_symbol; int m_symbol;
int m_chipIdx; int m_chipIdx;
Real m_pow; // In dB Real m_pow; // In dB
Real m_powRamp; // In dB Real m_powRamp; // In dB
enum IEEE_802_15_4_ModState { enum IEEE_802_15_4_ModState {
@ -128,7 +128,7 @@ private:
std::ofstream m_basebandFile; // For debug output of baseband waveform std::ofstream m_basebandFile; // For debug output of baseband waveform
bool chipsValid(); // Are there any chips to transmit bool chipsValid(); // Are there any chips to transmit
int getSymbol(); int getSymbol();
int getChip(); int getChip();
void initTX(); void initTX();
void createHalfSine(int sampleRate, int chipRate); void createHalfSine(int sampleRate, int chipRate);

Wyświetl plik

@ -44,6 +44,7 @@ int IEEE_802_15_4_ModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
IEEE_802_15_4_Mod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); IEEE_802_15_4_Mod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* AMModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -49,6 +49,7 @@ int AMModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
AMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); AMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* ATVModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -43,6 +43,7 @@ int ATVModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
ATVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); ATVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* ChirpChatModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* ChirpChatModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* ChirpChatModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -327,10 +327,6 @@ unsigned short ChirpChatModSource::encodeSymbol(unsigned short symbol)
// return deWidth*baseSymbol + (deWidth/2) - 1; // return deWidth*baseSymbol + (deWidth/2) - 1;
} }
void ChirpChatModSource::processOneSample(Complex& ci)
{
}
void ChirpChatModSource::calculateLevel(Real& sample) void ChirpChatModSource::calculateLevel(Real& sample)
{ {
if (m_levelCalcCount < m_levelNbSamples) if (m_levelCalcCount < m_levelNbSamples)

Wyświetl plik

@ -36,7 +36,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples) {} virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }
double getMagSq() const { return m_magsq; } double getMagSq() const { return m_magsq; }
void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const
@ -104,7 +104,6 @@ private:
void initSF(unsigned int sf); //!< Init tables, FFTs, depending on spread factor void initSF(unsigned int sf); //!< Init tables, FFTs, depending on spread factor
void initTest(unsigned int sf, unsigned int deBits); void initTest(unsigned int sf, unsigned int deBits);
void reset(); void reset();
void processOneSample(Complex& ci);
void calculateLevel(Real& sample); void calculateLevel(Real& sample);
void modulateSample(); void modulateSample();
unsigned short encodeSymbol(unsigned short symbol); //!< Encodes symbol with possible DE bits spacing unsigned short encodeSymbol(unsigned short symbol); //!< Encodes symbol with possible DE bits spacing

Wyświetl plik

@ -42,6 +42,7 @@ int ChirpChatModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
ChirpChatMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); ChirpChatMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);
ChirpChatMod::webapiFormatChannelSettings(response, m_settings); ChirpChatMod::webapiFormatChannelSettings(response, m_settings);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* FreeDVModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -49,6 +49,7 @@ int FreeDVModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
FreeDVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); FreeDVMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* NFMModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -49,6 +49,7 @@ int NFMModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
NFMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); NFMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -172,7 +172,7 @@ void PacketModGUI::on_channelMute_toggled(bool checked)
applySettings(); applySettings();
} }
void PacketModGUI::on_txButton_clicked(bool checked) void PacketModGUI::on_txButton_clicked()
{ {
transmit(); transmit();
} }
@ -206,7 +206,7 @@ void PacketModGUI::on_packet_editingFinished()
applySettings(); applySettings();
} }
void PacketModGUI::on_insertPosition_clicked(bool checked) void PacketModGUI::on_insertPosition_clicked()
{ {
float latitude = MainCore::instance()->getSettings().getLatitude(); float latitude = MainCore::instance()->getSettings().getLatitude();
float longitude = MainCore::instance()->getSettings().getLongitude(); float longitude = MainCore::instance()->getSettings().getLongitude();

Wyświetl plik

@ -87,12 +87,12 @@ private slots:
void on_fmDev_valueChanged(int value); void on_fmDev_valueChanged(int value);
void on_gain_valueChanged(int value); void on_gain_valueChanged(int value);
void on_channelMute_toggled(bool checked); void on_channelMute_toggled(bool checked);
void on_txButton_clicked(bool checked); void on_txButton_clicked();
void on_callsign_editingFinished(); void on_callsign_editingFinished();
void on_to_currentTextChanged(const QString &text); void on_to_currentTextChanged(const QString &text);
void on_via_currentTextChanged(const QString &text); void on_via_currentTextChanged(const QString &text);
void on_packet_editingFinished(); void on_packet_editingFinished();
void on_insertPosition_clicked(bool checked); void on_insertPosition_clicked();
void on_packet_returnPressed(); void on_packet_returnPressed();
void on_repeat_toggled(bool checked); void on_repeat_toggled(bool checked);
void on_preEmphasis_toggled(bool checked); void on_preEmphasis_toggled(bool checked);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* PacketModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* PacketModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* PacketModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -91,10 +91,6 @@ void PacketModSource::pullOne(Sample& sample)
sample.m_imag = (FixReal) (ci.imag() * SDR_TX_SCALEF); sample.m_imag = (FixReal) (ci.imag() * SDR_TX_SCALEF);
} }
void PacketModSource::prefetch(unsigned int nbSamples)
{
}
void PacketModSource::sampleToSpectrum(Real sample) void PacketModSource::sampleToSpectrum(Real sample)
{ {
if (m_spectrumSink) if (m_spectrumSink)

Wyświetl plik

@ -53,7 +53,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples); virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }
double getMagSq() const { return m_magsq; } double getMagSq() const { return m_magsq; }
void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const

Wyświetl plik

@ -44,6 +44,7 @@ int PacketModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
PacketMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); PacketMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* SSBModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -49,6 +49,7 @@ int SSBModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
SSBMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); SSBMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* WFMModPlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -49,6 +49,7 @@ int WFMModWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
WFMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); WFMMod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -75,7 +75,9 @@ ChannelGUI* RemoteSourcePlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -41,7 +41,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples) {} virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; }
void start(); void start();
void stop(); void stop();

Wyświetl plik

@ -43,6 +43,7 @@ int RemoteSourceWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
RemoteSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); RemoteSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -78,7 +78,9 @@ ChannelGUI* UDPSourcePlugin::createTxChannelGUI(
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const BasebandSampleSource *txChannel) const
{ {
return 0; (void) deviceUISet;
(void) txChannel;
return nullptr;
} }
#else #else
ChannelGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const ChannelGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const

Wyświetl plik

@ -40,7 +40,7 @@ public:
virtual void pull(SampleVector::iterator begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator begin, unsigned int nbSamples);
virtual void pullOne(Sample& sample); virtual void pullOne(Sample& sample);
virtual void prefetch(unsigned int nbSamples) {}; virtual void prefetch(unsigned int nbSamples) { (void) nbSamples; };
void setUDPFeedbackMessageQueue(MessageQueue *messageQueue); void setUDPFeedbackMessageQueue(MessageQueue *messageQueue);
void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_spectrumSink = spectrumSink; } void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_spectrumSink = spectrumSink; }

Wyświetl plik

@ -43,6 +43,7 @@ int UDPSourceWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
UDPSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response); UDPSource::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

Wyświetl plik

@ -259,6 +259,7 @@ int AFC::webapiRun(bool run,
SWGSDRangel::SWGDeviceState& response, SWGSDRangel::SWGDeviceState& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage;
getFeatureStateStr(*response.getState()); getFeatureStateStr(*response.getState());
MsgStartStop *msg = MsgStartStop::create(run); MsgStartStop *msg = MsgStartStop::create(run);
getInputMessageQueue()->push(msg); getInputMessageQueue()->push(msg);

Wyświetl plik

@ -43,6 +43,7 @@ int AFCWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGFeatureSettings& response, SWGSDRangel::SWGFeatureSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
AFC::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); AFC::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response);

Wyświetl plik

@ -112,7 +112,7 @@ bool AFCWorker::handleMessage(const Message& cmd)
Feature::MsgChannelSettings& cfg = (Feature::MsgChannelSettings&) cmd; Feature::MsgChannelSettings& cfg = (Feature::MsgChannelSettings&) cmd;
SWGSDRangel::SWGChannelSettings *swgChannelSettings = cfg.getSWGSettings(); SWGSDRangel::SWGChannelSettings *swgChannelSettings = cfg.getSWGSettings();
qDebug() << "AFCWorker::handleMessage: Feature::MsgChannelSettings:" << *swgChannelSettings->getChannelType(); qDebug() << "AFCWorker::handleMessage: Feature::MsgChannelSettings:" << *swgChannelSettings->getChannelType();
processChannelSettings(cfg.getChannelAPI(), cfg.getChannelSettingsKeys(), swgChannelSettings); processChannelSettings(cfg.getChannelAPI(), swgChannelSettings);
delete swgChannelSettings; delete swgChannelSettings;
return true; return true;
@ -280,7 +280,6 @@ void AFCWorker::initTrackedDeviceSet(int deviceSetIndex)
void AFCWorker::processChannelSettings( void AFCWorker::processChannelSettings(
const ChannelAPI *channelAPI, const ChannelAPI *channelAPI,
const QList<QString> &channelSettingsKeys,
SWGSDRangel::SWGChannelSettings *swgChannelSettings) SWGSDRangel::SWGChannelSettings *swgChannelSettings)
{ {
MainCore *mainCore = MainCore::instance(); MainCore *mainCore = MainCore::instance();
@ -322,7 +321,7 @@ void AFCWorker::processChannelSettings(
} }
} }
bool AFCWorker::updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset, unsigned int blockCount) bool AFCWorker::updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset)
{ {
SWGSDRangel::SWGChannelSettings swgChannelSettings; SWGSDRangel::SWGChannelSettings swgChannelSettings;
SWGSDRangel::SWGErrorResponse errorResponse; SWGSDRangel::SWGErrorResponse errorResponse;
@ -419,7 +418,7 @@ void AFCWorker::updateTarget()
} }
// adjust tracker offset // adjust tracker offset
if (updateChannelOffset(m_freqTracker, 0, m_trackerChannelOffset + correction, 1)) { if (updateChannelOffset(m_freqTracker, 0, m_trackerChannelOffset + correction)) {
m_trackerChannelOffset += correction; m_trackerChannelOffset += correction;
} }

Wyświetl plik

@ -131,7 +131,7 @@ private:
ChannelTracking(int channelOffset, int trackerOffset, int channelDirection) : ChannelTracking(int channelOffset, int trackerOffset, int channelDirection) :
m_channelOffset(channelOffset), m_channelOffset(channelOffset),
m_trackerOffset(trackerOffset), m_trackerOffset(trackerOffset),
m_channelDirection(m_channelDirection) m_channelDirection(channelDirection)
{} {}
ChannelTracking(const ChannelTracking& other) : ChannelTracking(const ChannelTracking& other) :
@ -161,10 +161,9 @@ private:
void initTrackedDeviceSet(int deviceSetIndex); void initTrackedDeviceSet(int deviceSetIndex);
void processChannelSettings( void processChannelSettings(
const ChannelAPI *channelAPI, const ChannelAPI *channelAPI,
const QList<QString> &channelSettingsKeys,
SWGSDRangel::SWGChannelSettings *swgChannelSettings SWGSDRangel::SWGChannelSettings *swgChannelSettings
); );
bool updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset, unsigned int blockCount = 0); bool updateChannelOffset(ChannelAPI *channelAPI, int direction, int offset);
bool updateDeviceFrequency(DeviceSet *deviceSet, const QString& key, int64_t frequency); bool updateDeviceFrequency(DeviceSet *deviceSet, const QString& key, int64_t frequency);
int getDeviceDirection(DeviceAPI *deviceAPI); int getDeviceDirection(DeviceAPI *deviceAPI);
void getDeviceSettingsKey(DeviceAPI *deviceAPI, QString& settingsKey); void getDeviceSettingsKey(DeviceAPI *deviceAPI, QString& settingsKey);

Wyświetl plik

@ -221,6 +221,7 @@ int GS232Controller::webapiRun(bool run,
SWGSDRangel::SWGDeviceState& response, SWGSDRangel::SWGDeviceState& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage;
getFeatureStateStr(*response.getState()); getFeatureStateStr(*response.getState());
MsgStartStop *msg = MsgStartStop::create(run); MsgStartStop *msg = MsgStartStop::create(run);
getInputMessageQueue()->push(msg); getInputMessageQueue()->push(msg);

Wyświetl plik

@ -376,12 +376,14 @@ void GS232ControllerGUI::on_channel_currentIndexChanged(int index)
void GS232ControllerGUI::on_serialPort_currentIndexChanged(int index) void GS232ControllerGUI::on_serialPort_currentIndexChanged(int index)
{ {
(void) index;
m_settings.m_serialPort = ui->serialPort->currentText(); m_settings.m_serialPort = ui->serialPort->currentText();
applySettings(); applySettings();
} }
void GS232ControllerGUI::on_baudRate_currentIndexChanged(int index) void GS232ControllerGUI::on_baudRate_currentIndexChanged(int index)
{ {
(void) index;
m_settings.m_baudRate = ui->baudRate->currentText().toInt(); m_settings.m_baudRate = ui->baudRate->currentText().toInt();
applySettings(); applySettings();
} }

Wyświetl plik

@ -44,6 +44,7 @@ int GS232ControllerWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGFeatureSettings& response, SWGSDRangel::SWGFeatureSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
GS232Controller::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); GS232Controller::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response);

Wyświetl plik

@ -212,6 +212,7 @@ int RigCtlServer::webapiRun(bool run,
SWGSDRangel::SWGDeviceState& response, SWGSDRangel::SWGDeviceState& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage;
getFeatureStateStr(*response.getState()); getFeatureStateStr(*response.getState());
MsgStartStop *msg = MsgStartStop::create(run); MsgStartStop *msg = MsgStartStop::create(run);
getInputMessageQueue()->push(msg); getInputMessageQueue()->push(msg);

Wyświetl plik

@ -44,6 +44,7 @@ int RigCtlServerWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGFeatureSettings& response, SWGSDRangel::SWGFeatureSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
RigCtlServer::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); RigCtlServer::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response);

Wyświetl plik

@ -196,6 +196,7 @@ int SimplePTT::webapiRun(bool run,
SWGSDRangel::SWGDeviceState& response, SWGSDRangel::SWGDeviceState& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage;
getFeatureStateStr(*response.getState()); getFeatureStateStr(*response.getState());
MsgStartStop *msg = MsgStartStop::create(run); MsgStartStop *msg = MsgStartStop::create(run);
getInputMessageQueue()->push(msg); getInputMessageQueue()->push(msg);

Wyświetl plik

@ -43,6 +43,7 @@ int SimplePTTWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGFeatureSettings& response, SWGSDRangel::SWGFeatureSettings& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
SimplePTT::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response); SimplePTT::webapiUpdateFeatureSettings(m_settings, featureSettingsKeys, response);

Wyświetl plik

@ -45,6 +45,7 @@ int BladeRF2MIMOWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGDeviceSettings& response, // query + response SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
BladeRF2MIMO::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); BladeRF2MIMO::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response);
return 200; return 200;

Wyświetl plik

@ -1753,6 +1753,7 @@ int LimeSDRMIMO::webapiRunGet(
SWGSDRangel::SWGDeviceState& response, SWGSDRangel::SWGDeviceState& response,
QString& errorMessage) QString& errorMessage)
{ {
(void) subsystemIndex;
(void) errorMessage; (void) errorMessage;
m_deviceAPI->getDeviceEngineStateStr(*response.getState()); m_deviceAPI->getDeviceEngineStateStr(*response.getState());
return 200; return 200;
@ -2334,4 +2335,4 @@ void LimeSDRMIMO::networkManagerFinished(QNetworkReply *reply)
} }
reply->deleteLater(); reply->deleteLater();
} }

Wyświetl plik

@ -43,9 +43,9 @@ int LimeSDRMIMOWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGDeviceSettings& response, // query + response SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage;
(void) force; (void) force;
(void) deviceSettingsKeys; (void) deviceSettingsKeys;
(void) response; (void) response;
(void) errorMessage;
return 501; return 501;
} }

Wyświetl plik

@ -207,7 +207,7 @@ void MetisMISO::setSourceCenterFrequency(qint64 centerFrequency, int index)
if (index < MetisMISOSettings::m_maxReceivers) if (index < MetisMISOSettings::m_maxReceivers)
{ {
settings.m_rxCenterFrequencies[index]; settings.m_rxCenterFrequencies[index] = centerFrequency;
MsgConfigureMetisMISO* message = MsgConfigureMetisMISO::create(settings, false); MsgConfigureMetisMISO* message = MsgConfigureMetisMISO::create(settings, false);
m_inputMessageQueue.push(message); m_inputMessageQueue.push(message);

Wyświetl plik

@ -45,6 +45,7 @@ int MetisMISOWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGDeviceSettings& response, // query + response SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
MetisMISO::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); MetisMISO::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response);
return 200; return 200;

Wyświetl plik

@ -45,6 +45,7 @@ int TestMIWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGDeviceSettings& response, // query + response SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage) QString& errorMessage)
{ {
(void) force; // no action
(void) errorMessage; (void) errorMessage;
TestMI::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response); TestMI::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response);
return 200; return 200;

Wyświetl plik

@ -155,6 +155,7 @@ const QString& TestMOSync::getDeviceDescription() const
int TestMOSync::getSourceSampleRate(int index) const int TestMOSync::getSourceSampleRate(int index) const
{ {
(void) index;
return 0; return 0;
} }
@ -424,4 +425,4 @@ void TestMOSync::webapiUpdateDeviceSettings(
if (deviceSettingsKeys.contains("sampleRate")) { if (deviceSettingsKeys.contains("sampleRate")) {
settings.m_sampleRate = response.getTestMoSyncSettings()->getSampleRate(); settings.m_sampleRate = response.getTestMoSyncSettings()->getSampleRate();
} }
} }

Wyświetl plik

@ -983,7 +983,7 @@ bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force)
m_settings.m_rxDevSampleRate, m_settings.m_rxDevSampleRate,
DeviceSampleSource::FrequencyShiftScheme::FSHIFT_STD, DeviceSampleSource::FrequencyShiftScheme::FSHIFT_STD,
false); false);
setRxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency, 0); setRxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency);
} }
} }
@ -1083,7 +1083,7 @@ bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, bool force)
DeviceSampleSink::FC_POS_CENTER, DeviceSampleSink::FC_POS_CENTER,
m_settings.m_txDevSampleRate, m_settings.m_txDevSampleRate,
false); false);
setTxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency, 0); setTxDeviceCenterFrequency(m_deviceShared.m_dev->getDevice(), deviceCenterFrequency);
} }
} }
@ -1271,14 +1271,14 @@ void XTRXMIMO::getLPRange(float& minF, float& maxF, float& stepF) const
minF, maxF, stepF); minF, maxF, stepF);
} }
void XTRXMIMO::setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int loPpmTenths) void XTRXMIMO::setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz)
{ {
if (dev) if (dev)
{ {
if (xtrx_tune(dev, if (xtrx_tune(dev,
XTRX_TUNE_RX_FDD, XTRX_TUNE_RX_FDD,
freq_hz, freq_hz,
0) < 0) { nullptr) < 0) {
qCritical("XTRXMIMO::setRxDeviceCenterFrequency: could not set Rx frequency to %llu", freq_hz); qCritical("XTRXMIMO::setRxDeviceCenterFrequency: could not set Rx frequency to %llu", freq_hz);
} else { } else {
qDebug("XTRXMIMO::setRxDeviceCenterFrequency: Rx frequency set to %llu", freq_hz); qDebug("XTRXMIMO::setRxDeviceCenterFrequency: Rx frequency set to %llu", freq_hz);
@ -1286,14 +1286,14 @@ void XTRXMIMO::setRxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int lo
} }
} }
void XTRXMIMO::setTxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz, int loPpmTenths) void XTRXMIMO::setTxDeviceCenterFrequency(xtrx_dev *dev, quint64 freq_hz)
{ {
if (dev) if (dev)
{ {
if (xtrx_tune(dev, if (xtrx_tune(dev,
XTRX_TUNE_TX_FDD, XTRX_TUNE_TX_FDD,
freq_hz, freq_hz,
0) < 0) { nullptr) < 0) {
qCritical("XTRXMIMO::setTxDeviceCenterFrequency: could not set Tx frequency to %llu", freq_hz); qCritical("XTRXMIMO::setTxDeviceCenterFrequency: could not set Tx frequency to %llu", freq_hz);
} else { } else {
qDebug("XTRXMIMO::setTxDeviceCenterFrequency: Tx frequency set to %llu", freq_hz); qDebug("XTRXMIMO::setTxDeviceCenterFrequency: Tx frequency set to %llu", freq_hz);

Some files were not shown because too many files have changed in this diff Show More