Fixed table column swap for snr and offset

Configuration.ui

@@ -675,6 +675,9 @@ text message.</string>
                   <property name="toolTip">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended heartbeat transmissions are aborted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
+                  <property name="specialValueText">
+                   <string>Disabled</string>
+                  </property>
                   <property name="suffix">
                    <string> minutes</string>
                   </property>
@@ -682,7 +685,7 @@ text message.</string>
                    <string>after </string>
                   </property>
                   <property name="minimum">
-                   <number>1</number>
+                   <number>0</number>
                   </property>
                   <property name="maximum">
                    <number>1440</number>
@@ -3668,12 +3671,12 @@ soundcard changes</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="CAT_stop_bits_button_group"/>
-  <buttongroup name="split_mode_button_group"/>
   <buttongroup name="CAT_handshake_button_group"/>
+  <buttongroup name="CAT_stop_bits_button_group"/>
   <buttongroup name="CAT_data_bits_button_group"/>
-  <buttongroup name="TX_mode_button_group"/>
-  <buttongroup name="PTT_method_button_group"/>
   <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="PTT_method_button_group"/>
+  <buttongroup name="TX_mode_button_group"/>
  </buttongroups>
 </ui>

Versions.cmake

@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 0)
 set (WSJTX_VERSION_MINOR 8)
-set (WSJTX_VERSION_PATCH 0)
+set (WSJTX_VERSION_PATCH 1)
 set (WSJTX_RC 0)		 # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

lib/decoder.f90

@@ -93,32 +93,6 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
         n30min=minval(n30fox(1:nfox))
         n30max=maxval(n30fox(1:nfox))
      endif
-     j=0
-     rewind 19
-     if(nfox.eq.0) then
-        endfile 19
-        rewind 19
-     else
-        do i=1,nfox
-           n=n30fox(i)
-           if(n30max-n30fox(i).le.4) then
-              j=j+1
-              c2fox(j)=c2fox(i)
-              g2fox(j)=g2fox(i)
-              nsnrfox(j)=nsnrfox(i)
-              nfreqfox(j)=nfreqfox(i)
-              n30fox(j)=n
-              m=n30max-n
-              if(len(trim(g2fox(j))).eq.4) then
-                 call azdist(mygrid,g2fox(j),0.d0,nAz,nEl,nDmiles,nDkm, &
-                      nHotAz,nHotABetter)
-              else
-                 nDkm=9999
-              endif
-           endif
-        enddo
-        nfox=j
-     endif
      go to 800
   endif
 

logqso.cpp

@@ -98,9 +98,9 @@ void LogQSO::accept()
   QString hisCall,hisGrid,mode,rptSent,rptRcvd,dateOn,dateOff,timeOn,timeOff,band,operator_call;
   QString comments,name;
 
-  hisCall=ui->call->text();
-  hisGrid=ui->grid->text();
-  mode=ui->mode->text();
+  hisCall=ui->call->text().toUpper();
+  hisGrid=ui->grid->text().toUpper();
+  mode=ui->mode->text().toUpper();
   rptSent=ui->sent->text();
   rptRcvd=ui->rcvd->text();
   m_dateTimeOn = ui->start_date_time->dateTime ();

mainwindow.cpp

@@ -551,6 +551,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   m_manual {&m_network_manager},
   m_txFrameCount {0},
   m_txTextDirty {false},
+  m_txFrameCountEstimate {0},
   m_previousFreq {0}
 {
   ui->setupUi(this);
@@ -6245,6 +6246,7 @@ void MainWindow::on_clearAction_triggered(QObject * sender){
     if(sender == ui->tableWidgetRXAll){
         m_bandActivity.clear();
         clearTableWidget(ui->tableWidgetRXAll);
+        resetTimeDeltaAverage();
     }
 
     // TODO: jsherer - abstract this into a tableWidgetCallsReset function
@@ -6252,6 +6254,7 @@ void MainWindow::on_clearAction_triggered(QObject * sender){
         m_callActivity.clear();
         clearTableWidget((ui->tableWidgetCalls));
         createAllcallTableRows(ui->tableWidgetCalls, "");
+        resetTimeDeltaAverage();
     }
 
     if(sender == ui->extFreeTextMsgEdit){
@@ -6355,7 +6358,7 @@ void MainWindow::buildShowColumnsMenu(QMenu *menu, QString tableKey){
         {"Frequency Offset", "offset"},
         {"Last heard timestamp", "timestamp"},
         {"SNR", "snr"},
-        {"Time delta", "tdrift"},
+        {"RX Time Drift", "tdrift"},
     };
 
     if(tableKey == "call"){
@@ -8018,7 +8021,12 @@ void MainWindow::updateTextDisplay(){
     }
 }
 
+
+#if __APPLE__
+#define USE_SYNC_FRAME_COUNT 1
+#else
 #define USE_SYNC_FRAME_COUNT 0
+#endif
 
 void MainWindow::refreshTextDisplay(){
     qDebug() << "refreshing text display...";
@@ -8029,8 +8037,8 @@ void MainWindow::refreshTextDisplay(){
 
     QStringList textList;
     qDebug() << "frames:";
-    foreach(Frame frame, frames){
-        auto dt = DecodedText(frame.frame, frame.bits);
+    foreach(auto frame, frames){
+        auto dt = DecodedText(frame.first, frame.second);
         qDebug() << "->" << frame << dt.message() << Varicode::frameTypeString(dt.frameType());
         textList.append(dt.message());
     }
@@ -8275,6 +8283,9 @@ void MainWindow::observeTimeDeltaForAverage(float delta){
 void MainWindow::resetTimeDeltaAverage(){
     m_timeDeltaMsMMA = 0;
     m_timeDeltaMsMMA_N = 0;
+
+    // observe zero for reset
+    observeTimeDeltaForAverage(0);
 }
 
 void MainWindow::processRxActivity() {
@@ -8859,7 +8870,7 @@ void MainWindow::processCommandActivity() {
         }
 
         // PROCESS HEARTBEAT
-        else if (d.cmd == " HEARTBEAT" && ui->heartbeatButton->isChecked() && ui->autoReplyButton->isChecked()){
+        else if (d.cmd == " HEARTBEAT" && ui->heartbeatButton->isChecked() && ui->autoReplyButton->isChecked() && !ui->selcalButton->isChecked()){
             reply = QString("%1 HEARTBEAT ACK %2").arg(d.from).arg(Varicode::formatSNR(d.snr));
 
             enqueueHeartbeat(reply);
@@ -9585,8 +9596,8 @@ void MainWindow::displayCallActivity() {
         ui->tableWidgetCalls->setColumnHidden(0, !showColumn("call", "callsign"));
         ui->tableWidgetCalls->setColumnHidden(1, !showColumn("call", "flag"));
         ui->tableWidgetCalls->setColumnHidden(2, !showColumn("call", "timestamp"));
-        ui->tableWidgetCalls->setColumnHidden(3, !showColumn("call", "offset"));
-        ui->tableWidgetCalls->setColumnHidden(4, !showColumn("call", "snr"));
+        ui->tableWidgetCalls->setColumnHidden(3, !showColumn("call", "snr"));
+        ui->tableWidgetCalls->setColumnHidden(4, !showColumn("call", "offset"));
         ui->tableWidgetCalls->setColumnHidden(5, !showColumn("call", "tdrift"));
         ui->tableWidgetCalls->setColumnHidden(6, !showColumn("call", "grid"));
         ui->tableWidgetCalls->setColumnHidden(7, !showColumn("call", "distance"));

varicode.cpp

@@ -1622,6 +1622,7 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
     #define ALLOW_SEND_COMPOUND_DIRECTED 1
     #define AUTO_PREPEND_DIRECTED 1
     #define AUTO_REMOVE_MYCALL 1
+    #define AUTO_PREPEND_DIRECTED_ALLOW_TEXT_CALLSIGNS 1
 
     bool mycallCompound = Varicode::isCompoundCallsign(mycall);