From cda483ba69eb23b99c3266650ac8d602e1196440 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 9 Jul 2020 19:28:48 +0200 Subject: [PATCH] LimeSDR MIMO: removed IQ record feature --- .../samplemimo/limesdrmimo/limesdrmimo.cpp | 38 ------------ plugins/samplemimo/limesdrmimo/limesdrmimo.h | 22 ------- .../samplemimo/limesdrmimo/limesdrmimogui.cpp | 41 ------------- .../samplemimo/limesdrmimo/limesdrmimogui.h | 2 - .../samplemimo/limesdrmimo/limesdrmimogui.ui | 61 ++++++------------- .../limesdrmimo/limesdrmimosettings.cpp | 3 - .../limesdrmimo/limesdrmimosettings.h | 1 - .../sdrangel/api/swagger/include/LimeSdr.yaml | 2 - 8 files changed, 17 insertions(+), 153 deletions(-) diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp index ea74a8882..118d8a7e8 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp @@ -45,7 +45,6 @@ MESSAGE_CLASS_DEFINITION(LimeSDRMIMO::MsgConfigureLimeSDRMIMO, Message) MESSAGE_CLASS_DEFINITION(LimeSDRMIMO::MsgGetStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRMIMO::MsgGetDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRMIMO::MsgReportStreamInfo, Message) -MESSAGE_CLASS_DEFINITION(LimeSDRMIMO::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(LimeSDRMIMO::MsgStartStop, Message) LimeSDRMIMO::LimeSDRMIMO(DeviceAPI *deviceAPI) : @@ -506,30 +505,6 @@ bool LimeSDRMIMO::handleMessage(const Message& message) return true; } - else if (MsgFileRecord::match(message)) - { - // TODO - // MsgFileRecord& conf = (MsgFileRecord&) message; - // qDebug() << "LimeSDRMIMO::handleMessage: MsgFileRecord: " << conf.getStartStop(); - // int istream = conf.getStreamIndex(); - - // if (conf.getStartStop()) - // { - // if (m_settings.m_fileRecordName.size() != 0) { - // m_fileSinks[istream]->setFileName(m_settings.m_fileRecordName + "_0.sdriq"); - // } else { - // m_fileSinks[istream]->genUniqueFileName(m_deviceAPI->getDeviceUID(), istream); - // } - - // m_fileSinks[istream]->startRecording(); - // } - // else - // { - // m_fileSinks[istream]->stopRecording(); - // } - - return true; - } else if (MsgStartStop::match(message)) { MsgStartStop& cmd = (MsgStartStop&) message; @@ -666,7 +641,6 @@ bool LimeSDRMIMO::applySettings(const LimeSDRMIMOSettings& settings, bool force) << " m_gpioPins: " << settings.m_gpioPins << " m_extClock: " << settings.m_extClock << " m_extClockFreq: " << settings.m_extClockFreq - << " m_fileRecordName: " << settings.m_fileRecordName << " m_useReverseAPI: " << settings.m_useReverseAPI << " m_reverseAPIAddress: " << settings.m_reverseAPIAddress << " m_reverseAPIPort: " << settings.m_reverseAPIPort @@ -1814,12 +1788,6 @@ void LimeSDRMIMO::webapiFormatDeviceSettings( response.getLimeSdrMimoSettings()->setExtClock(settings.m_extClock ? 1 : 0); response.getLimeSdrMimoSettings()->setExtClockFreq(settings.m_extClockFreq); - if (response.getLimeSdrMimoSettings()->getFileRecordName()) { - *response.getLimeSdrMimoSettings()->getFileRecordName() = settings.m_fileRecordName; - } else { - response.getLimeSdrMimoSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); - } - response.getLimeSdrMimoSettings()->setGpioDir(settings.m_gpioDir); response.getLimeSdrMimoSettings()->setGpioPins(settings.m_gpioPins); response.getLimeSdrMimoSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); @@ -1901,9 +1869,6 @@ void LimeSDRMIMO::webapiUpdateDeviceSettings( if (deviceSettingsKeys.contains("extClockFreq")) { settings.m_extClockFreq = response.getLimeSdrMimoSettings()->getExtClockFreq(); } - if (deviceSettingsKeys.contains("fileRecordName")) { - settings.m_fileRecordName = *response.getLimeSdrMimoSettings()->getFileRecordName(); - } if (deviceSettingsKeys.contains("gpioDir")) { settings.m_gpioDir = response.getLimeSdrMimoSettings()->getGpioDir() & 0xFF; } @@ -2154,9 +2119,6 @@ void LimeSDRMIMO::webapiReverseSendSettings(QList& deviceSettingsKeys, if (deviceSettingsKeys.contains("extClockFreq") || force) { swgLimeSdrMIMOSettings->setExtClockFreq(settings.m_extClockFreq); } - if (deviceSettingsKeys.contains("fileRecordName") || force) { - swgLimeSdrMIMOSettings->setFileRecordName(new QString(settings.m_fileRecordName)); - } if (deviceSettingsKeys.contains("gpioDir") || force) { swgLimeSdrMIMOSettings->setGpioDir(settings.m_gpioDir & 0xFF); } diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimo.h b/plugins/samplemimo/limesdrmimo/limesdrmimo.h index 23832012b..89e4d20ea 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimo.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimo.h @@ -176,28 +176,6 @@ public: { } }; - class MsgFileRecord : public Message { - MESSAGE_CLASS_DECLARATION - - public: - bool getStartStop() const { return m_startStop; } - int getStreamIndex() const { return m_streamIndex; } - - static MsgFileRecord* create(bool startStop, int streamIndex) { - return new MsgFileRecord(startStop, streamIndex); - } - - protected: - bool m_startStop; - int m_streamIndex; - - MsgFileRecord(bool startStop, int streamIndex) : - Message(), - m_startStop(startStop), - m_streamIndex(streamIndex) - { } - }; - class MsgStartStop : public Message { MESSAGE_CLASS_DECLARATION diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index bf1418e47..ac561e1ca 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -99,9 +99,6 @@ LimeSDRMIMOGUI::LimeSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStopRx); connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &))); - CRightClickEnabler *fileRecordRightClickEnabler = new CRightClickEnabler(ui->record); - connect(fileRecordRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openFileRecordDialog(const QPoint &))); - sendSettings(); } @@ -784,18 +781,6 @@ void LimeSDRMIMOGUI::on_startStopTx_toggled(bool checked) } } -void LimeSDRMIMOGUI::on_record_toggled(bool checked) -{ - if (checked) { - ui->record->setStyleSheet("QToolButton { background-color : red; }"); - } else { - ui->record->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); - } - - LimeSDRMIMO::MsgFileRecord* message = LimeSDRMIMO::MsgFileRecord::create(checked, m_streamIndex); - m_limeSDRMIMO->getInputMessageQueue()->push(message); -} - void LimeSDRMIMOGUI::on_centerFrequency_changed(quint64 value) { if (m_rxElseTx) { @@ -1174,29 +1159,3 @@ void LimeSDRMIMOGUI::openDeviceSettingsDialog(const QPoint& p) sendSettings(); } - -void LimeSDRMIMOGUI::openFileRecordDialog(const QPoint& p) -{ - QFileDialog fileDialog( - this, - tr("Save I/Q record file"), - m_settings.m_fileRecordName, - tr("SDR I/Q Files (*.sdriq)") - ); - - fileDialog.setOptions(QFileDialog::DontUseNativeDialog); - fileDialog.setFileMode(QFileDialog::AnyFile); - fileDialog.move(p); - QStringList fileNames; - - if (fileDialog.exec()) - { - fileNames = fileDialog.selectedFiles(); - - if (fileNames.size() > 0) - { - m_settings.m_fileRecordName = fileNames.at(0); - sendSettings(); - } - } -} diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h index 0bc06fa69..bd7ec8324 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h @@ -112,7 +112,6 @@ private slots: void on_spectrumIndex_currentIndexChanged(int index); void on_startStopRx_toggled(bool checked); void on_startStopTx_toggled(bool checked); - void on_record_toggled(bool checked); void on_centerFrequency_changed(quint64 value); void on_ncoEnable_toggled(bool checked); void on_ncoFrequency_changed(qint64 value); @@ -134,7 +133,6 @@ private slots: void on_pgaGain_valueChanged(int value); void on_antenna_currentIndexChanged(int index); void openDeviceSettingsDialog(const QPoint& p); - void openFileRecordDialog(const QPoint& p); }; #endif // PLUGINS_SAMPLEMIMO_LIMESDRMIMO_LIMESDRMIMOGUI_H_ \ No newline at end of file diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui b/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui index b9873e3f8..fc6981dcf 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui @@ -257,50 +257,23 @@ 4 - - - - - - - Left: toggle record I/Q samples from device - Right: select output file - - - - - - - :/record_off.png - :/record_on.png:/record_off.png - - - - - - - - - - - - 54 - 0 - - - - ADC rate before hardware downsampling (k or MS/s) - - - 00000k - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - + + + + 54 + 0 + + + + ADC rate before hardware downsampling (k or MS/s) + + + 00000k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp index 607027813..7deaecb71 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp @@ -31,7 +31,6 @@ void LimeSDRMIMOSettings::resetToDefaults() m_gpioPins = 0; m_extClock = false; m_extClockFreq = 10000000; // 10 MHz - m_fileRecordName = ""; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -98,7 +97,6 @@ QByteArray LimeSDRMIMOSettings::serialize() const s.writeU32(4, m_gpioPins); s.writeBool(5, m_extClock); s.writeU32(6, m_extClockFreq); - s.writeString(7, m_fileRecordName); s.writeBool(8, m_useReverseAPI); s.writeString(9, m_reverseAPIAddress); s.writeU32(10, m_reverseAPIPort); @@ -180,7 +178,6 @@ bool LimeSDRMIMOSettings::deserialize(const QByteArray& data) m_gpioPins = uintval & 0xFF; d.readBool(5, &m_extClock, false); d.readU32(6, &m_extClockFreq, 10000000); - d.readString(7, &m_fileRecordName, ""); d.readBool(8, &m_useReverseAPI, false); d.readString(9, &m_reverseAPIAddress, "127.0.0.1"); d.readU32(10, &uintval, 0); diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h index 76dbe1aa7..6bb8617a5 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h @@ -57,7 +57,6 @@ struct LimeSDRMIMOSettings uint8_t m_gpioPins; //!< GPIO pins to write; LSB first bool m_extClock; //!< True if external clock source uint32_t m_extClockFreq; //!< Frequency (Hz) of external clock source - QString m_fileRecordName; bool m_useReverseAPI; QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; diff --git a/swagger/sdrangel/api/swagger/include/LimeSdr.yaml b/swagger/sdrangel/api/swagger/include/LimeSdr.yaml index acc32b5ed..6619bb957 100644 --- a/swagger/sdrangel/api/swagger/include/LimeSdr.yaml +++ b/swagger/sdrangel/api/swagger/include/LimeSdr.yaml @@ -140,8 +140,6 @@ LimeSdrMIMOSettings: extClockFreq: description: Frequency (Hz) of external clock source type: integer - fileRecordName: - type: string useReverseAPI: description: Boolean type: integer