Browse Source

Make clear which device has an error.

chirpmodem-v8.1.0
Jon Beniston 3 weeks ago
parent
commit
58de186780
  1. 4
      sdrbase/dsp/dspdevicemimoengine.cpp
  2. 6
      sdrbase/dsp/dspdevicesinkengine.cpp
  3. 6
      sdrbase/dsp/dspdevicesourceengine.cpp

4
sdrbase/dsp/dspdevicemimoengine.cpp

@ -810,12 +810,12 @@ DSPDeviceMIMOEngine::State DSPDeviceMIMOEngine::gotoError(int subsystemIndex, co @@ -810,12 +810,12 @@ DSPDeviceMIMOEngine::State DSPDeviceMIMOEngine::gotoError(int subsystemIndex, co
if (subsystemIndex == 0)
{
m_errorMessageRx = errorMessage;
m_errorMessageRx = QString("M:%1: %2").arg(getUID()).arg(errorMessage);
setStateRx(State::StError);
}
else if (subsystemIndex == 1)
{
m_errorMessageTx = errorMessage;
m_errorMessageTx = QString("M:%1: %2").arg(getUID()).arg(errorMessage);
setStateTx(State::StError);
}

6
sdrbase/dsp/dspdevicesinkengine.cpp

@ -384,9 +384,11 @@ DSPDeviceSinkEngine::State DSPDeviceSinkEngine::gotoRunning() @@ -384,9 +384,11 @@ DSPDeviceSinkEngine::State DSPDeviceSinkEngine::gotoRunning()
DSPDeviceSinkEngine::State DSPDeviceSinkEngine::gotoError(const QString& errorMessage)
{
qDebug() << "DSPDeviceSinkEngine::gotoError";
QString message = QString("T:%1: %2").arg(getUID()).arg(errorMessage);
m_errorMessage = errorMessage;
qDebug() << "DSPDeviceSinkEngine::gotoError: " << message;
m_errorMessage = message;
m_deviceDescription.clear();
setState(State::StError);
return State::StError;

6
sdrbase/dsp/dspdevicesourceengine.cpp

@ -498,9 +498,11 @@ DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoRunning() @@ -498,9 +498,11 @@ DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoRunning()
DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoError(const QString& errorMessage)
{
qDebug() << "DSPDeviceSourceEngine::gotoError: " << errorMessage;
QString message = QString("R:%1: %2").arg(getUID()).arg(errorMessage);
m_errorMessage = errorMessage;
qDebug() << "DSPDeviceSourceEngine::gotoError: " << message;
m_errorMessage = message;
m_deviceDescription.clear();
setState(State::StError);
return State::StError;

Loading…
Cancel
Save