mirror of https://github.com/f4exb/sdrangel.git
SDRdaemonFEC support: debug (1)
This commit is contained in:
parent
b73330c663
commit
46e85fa643
|
@ -272,12 +272,12 @@ bool SDRdaemonFECGui::handleMessage(const Message& message)
|
||||||
updateWithAcquisition();
|
updateWithAcquisition();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (SDRdaemonFECInput::MsgReportSDRdaemonStreamData::match(message))
|
else if (SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData::match(message))
|
||||||
{
|
{
|
||||||
m_sampleRate = ((SDRdaemonFECInput::MsgReportSDRdaemonStreamData&)message).getSampleRate();
|
m_sampleRate = ((SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData&)message).getSampleRate();
|
||||||
m_centerFrequency = ((SDRdaemonFECInput::MsgReportSDRdaemonStreamData&)message).getCenterFrequency();
|
m_centerFrequency = ((SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData&)message).getCenterFrequency();
|
||||||
m_startingTimeStamp.tv_sec = ((SDRdaemonFECInput::MsgReportSDRdaemonStreamData&)message).get_tv_sec();
|
m_startingTimeStamp.tv_sec = ((SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData&)message).get_tv_sec();
|
||||||
m_startingTimeStamp.tv_usec = ((SDRdaemonFECInput::MsgReportSDRdaemonStreamData&)message).get_tv_usec();
|
m_startingTimeStamp.tv_usec = ((SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData&)message).get_tv_usec();
|
||||||
updateWithStreamData();
|
updateWithStreamData();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonAutoCorr, Messa
|
||||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonWork, Message)
|
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonWork, Message)
|
||||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonStreamTiming, Message)
|
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgConfigureSDRdaemonStreamTiming, Message)
|
||||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonAcquisition, Message)
|
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonAcquisition, Message)
|
||||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonStreamData, Message)
|
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData, Message)
|
||||||
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamTiming, Message)
|
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamTiming, Message)
|
||||||
|
|
||||||
SDRdaemonFECInput::SDRdaemonFECInput(const QTimer& masterTimer, DeviceAPI *deviceAPI) :
|
SDRdaemonFECInput::SDRdaemonFECInput(const QTimer& masterTimer, DeviceAPI *deviceAPI) :
|
||||||
|
|
|
@ -131,31 +131,28 @@ public:
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
class MsgReportSDRdaemonStreamData : public Message {
|
class MsgReportSDRdaemonFECStreamData : public Message {
|
||||||
MESSAGE_CLASS_DECLARATION
|
MESSAGE_CLASS_DECLARATION
|
||||||
|
|
||||||
public:
|
public:
|
||||||
int getSampleRateStream() const { return m_sampleRateStream; }
|
|
||||||
int getSampleRate() const { return m_sampleRate; }
|
int getSampleRate() const { return m_sampleRate; }
|
||||||
quint64 getCenterFrequency() const { return m_centerFrequency; }
|
quint64 getCenterFrequency() const { return m_centerFrequency; }
|
||||||
uint32_t get_tv_sec() const { return m_tv_sec; }
|
uint32_t get_tv_sec() const { return m_tv_sec; }
|
||||||
uint32_t get_tv_usec() const { return m_tv_usec; }
|
uint32_t get_tv_usec() const { return m_tv_usec; }
|
||||||
|
|
||||||
static MsgReportSDRdaemonStreamData* create(int sampleRateStream, int sampleRate, quint64 centerFrequency, uint32_t tv_sec, uint32_t tv_usec)
|
static MsgReportSDRdaemonFECStreamData* create(int sampleRate, quint64 centerFrequency, uint32_t tv_sec, uint32_t tv_usec)
|
||||||
{
|
{
|
||||||
return new MsgReportSDRdaemonStreamData(sampleRateStream, sampleRate, centerFrequency, tv_sec, tv_usec);
|
return new MsgReportSDRdaemonFECStreamData(sampleRate, centerFrequency, tv_sec, tv_usec);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int m_sampleRateStream;
|
|
||||||
int m_sampleRate;
|
int m_sampleRate;
|
||||||
quint64 m_centerFrequency;
|
quint64 m_centerFrequency;
|
||||||
uint32_t m_tv_sec;
|
uint32_t m_tv_sec;
|
||||||
uint32_t m_tv_usec;
|
uint32_t m_tv_usec;
|
||||||
|
|
||||||
MsgReportSDRdaemonStreamData(int sampleRateStream, int sampleRate, quint64 centerFrequency, uint32_t tv_sec, uint32_t tv_usec) :
|
MsgReportSDRdaemonFECStreamData(int sampleRate, quint64 centerFrequency, uint32_t tv_sec, uint32_t tv_usec) :
|
||||||
Message(),
|
Message(),
|
||||||
m_sampleRateStream(sampleRateStream),
|
|
||||||
m_sampleRate(sampleRate),
|
m_sampleRate(sampleRate),
|
||||||
m_centerFrequency(centerFrequency),
|
m_centerFrequency(centerFrequency),
|
||||||
m_tv_sec(tv_sec),
|
m_tv_sec(tv_sec),
|
||||||
|
|
|
@ -134,6 +134,9 @@ void SDRdaemonFECUDPHandler::dataReadyRead()
|
||||||
qint64 pendingDataSize = m_dataSocket->pendingDatagramSize();
|
qint64 pendingDataSize = m_dataSocket->pendingDatagramSize();
|
||||||
m_udpReadBytes = m_dataSocket->readDatagram(m_udpBuf, pendingDataSize, &m_remoteAddress, 0);
|
m_udpReadBytes = m_dataSocket->readDatagram(m_udpBuf, pendingDataSize, &m_remoteAddress, 0);
|
||||||
|
|
||||||
|
qDebug() << "SDRdaemonUDPHandler::dataReadyRead:"
|
||||||
|
<< " m_udpReadBytes: " << m_udpReadBytes;
|
||||||
|
|
||||||
if (m_udpReadBytes == SDRdaemonFECBuffer::m_udpPayloadSize) {
|
if (m_udpReadBytes == SDRdaemonFECBuffer::m_udpPayloadSize) {
|
||||||
processData();
|
processData();
|
||||||
}
|
}
|
||||||
|
@ -143,15 +146,39 @@ void SDRdaemonFECUDPHandler::dataReadyRead()
|
||||||
void SDRdaemonFECUDPHandler::processData()
|
void SDRdaemonFECUDPHandler::processData()
|
||||||
{
|
{
|
||||||
m_sdrDaemonBuffer.writeData(m_udpBuf, m_udpReadBytes);
|
m_sdrDaemonBuffer.writeData(m_udpBuf, m_udpReadBytes);
|
||||||
|
const SDRdaemonFECBuffer::MetaDataFEC& metaData = m_sdrDaemonBuffer.getOutputMeta();
|
||||||
|
|
||||||
|
bool change = false;
|
||||||
|
m_tv_sec = metaData.m_tv_sec;
|
||||||
|
m_tv_usec = metaData.m_tv_usec;
|
||||||
|
|
||||||
|
qDebug() << "SDRdaemonUDPHandler::processData:"
|
||||||
|
<< " m_samplerate: " << metaData.m_sampleRate
|
||||||
|
<< " m_centerFrequency: " << metaData.m_centerFrequency;
|
||||||
|
|
||||||
|
if (m_centerFrequency != metaData.m_centerFrequency)
|
||||||
|
{
|
||||||
|
m_centerFrequency = metaData.m_centerFrequency;
|
||||||
|
change = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDRdaemonFECUDPHandler::setSamplerate(uint32_t samplerate)
|
if (m_samplerate != metaData.m_sampleRate)
|
||||||
{
|
{
|
||||||
qDebug() << "SDRdaemonUDPHandler::setSamplerate:"
|
m_samplerate = metaData.m_sampleRate;
|
||||||
<< " new:" << samplerate
|
change = true;
|
||||||
<< " old:" << m_samplerate;
|
}
|
||||||
|
|
||||||
m_samplerate = samplerate;
|
if (change)
|
||||||
|
{
|
||||||
|
DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency * 1000); // Frequency in Hz for the DSP engine
|
||||||
|
m_deviceAPI->getDeviceInputMessageQueue()->push(notif);
|
||||||
|
SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData *report = SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData::create(
|
||||||
|
m_samplerate,
|
||||||
|
m_centerFrequency * 1000, // Frequency in Hz for the GUI
|
||||||
|
m_tv_sec,
|
||||||
|
m_tv_usec);
|
||||||
|
m_outputMessageQueueToGUI->push(report);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDRdaemonFECUDPHandler::connectTimer(const QTimer* timer)
|
void SDRdaemonFECUDPHandler::connectTimer(const QTimer* timer)
|
||||||
|
|
|
@ -75,7 +75,6 @@ private:
|
||||||
int m_rateDivider;
|
int m_rateDivider;
|
||||||
bool m_autoCorrBuffer;
|
bool m_autoCorrBuffer;
|
||||||
|
|
||||||
void setSamplerate(uint32_t samplerate);
|
|
||||||
void processData();
|
void processData();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
|
Loading…
Reference in New Issue