diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp index bf18f2871..fe07de693 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp @@ -362,7 +362,7 @@ void ChirpChatMod::applySettings(const ChirpChatModSettings& settings, bool forc if (getMessageQueueToGUI()) { - MsgReportPayloadTime *rpt = MsgReportPayloadTime::create(m_currentPayloadTime); + MsgReportPayloadTime *rpt = MsgReportPayloadTime::create(m_currentPayloadTime, symbols.size()); getMessageQueueToGUI()->push(rpt); } } @@ -1095,7 +1095,7 @@ void ChirpChatMod::udpRx() if (getMessageQueueToGUI()) { - MsgReportPayloadTime *rpt = MsgReportPayloadTime::create(m_currentPayloadTime); + MsgReportPayloadTime *rpt = MsgReportPayloadTime::create(m_currentPayloadTime, symbols.size()); getMessageQueueToGUI()->push(rpt); } } diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.h b/plugins/channeltx/modchirpchat/chirpchatmod.h index 583118235..e2b990183 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.h +++ b/plugins/channeltx/modchirpchat/chirpchatmod.h @@ -74,16 +74,19 @@ public: public: float getPayloadTimeMs() const { return m_timeMs; } - static MsgReportPayloadTime* create(float timeMs) { - return new MsgReportPayloadTime(timeMs); + std::size_t getNbSymbols() const { return m_nbSymbols; } + static MsgReportPayloadTime* create(float timeMs, std::size_t nbSymbols) { + return new MsgReportPayloadTime(timeMs, nbSymbols); } private: float m_timeMs; //!< time in milliseconds + std::size_t m_nbSymbols; //!< number of symbols - MsgReportPayloadTime(float timeMs) : + MsgReportPayloadTime(float timeMs, std::size_t nbSymbols) : Message(), - m_timeMs(timeMs) + m_timeMs(timeMs), + m_nbSymbols(nbSymbols) {} }; diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp index f7215e70d..29fa32f64 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp @@ -97,6 +97,7 @@ bool ChirpChatModGUI::handleMessage(const Message& message) fourthsChirps += m_settings.hasSyncWord() ? 8 : 0; fourthsChirps += m_settings.getNbSFDFourths(); float controlMs = fourthsChirps * fourthsMs; // preamble + sync word + SFD + ui->timeMessageLengthText->setText(tr("%1").arg(rpt.getNbSymbols())); ui->timePayloadText->setText(tr("%1 ms").arg(QString::number(rpt.getPayloadTimeMs(), 'f', 0))); ui->timeTotalText->setText(tr("%1 ms").arg(QString::number(rpt.getPayloadTimeMs() + controlMs, 'f', 0))); ui->timeSymbolText->setText(tr("%1 ms").arg(QString::number(4.0*fourthsMs, 'f', 1))); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.ui b/plugins/channeltx/modchirpchat/chirpchatmodgui.ui index feb0f9db1..03915bf8e 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.ui +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.ui @@ -722,12 +722,12 @@ - + Qt::ClickFocus - Report to callee + Caller QRA locator @@ -751,12 +751,12 @@ - + Qt::ClickFocus - Caller QRA locator + Report to callee @@ -1028,6 +1028,23 @@ + + + + ML + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 000 + + +