ChirpChat modulator enhancements

srcejon · Mar 25, 2024 · c833432 · c833432
1 parent a728563
commit c833432
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git 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
@@ -74,16 +74,19 @@ class ChirpChatMod : public BasebandSampleSource, public ChannelAPI {
 
     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
@@ -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
@@ -722,12 +722,12 @@
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="report">
+       <widget class="QLineEdit" name="myLocator">
         <property name="focusPolicy">
          <enum>Qt::ClickFocus</enum>
         </property>
         <property name="toolTip">
-         <string>Report to callee</string>
+         <string>Caller QRA locator</string>
         </property>
         <property name="text">
          <string/>
@@ -751,12 +751,12 @@
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="myLocator">
+       <widget class="QLineEdit" name="report">
         <property name="focusPolicy">
          <enum>Qt::ClickFocus</enum>
         </property>
         <property name="toolTip">
-         <string>Caller QRA locator</string>
+         <string>Report to callee</string>
         </property>
         <property name="text">
          <string/>
@@ -1028,6 +1028,23 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="timeMessageLengthLabel">
+        <property name="text">
+         <string>ML</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="timeMessageLengthText">
+        <property name="text">
+         <string>000</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <spacer name="horizontalSpacer_6">
         <property name="orientation">