Merge branch 'develop' into map65; set build type to 2.6.1-rc1

CMakeLists.txt

@@ -45,7 +45,7 @@ if (POLICY CMP0075)
 endif ()
 
 project (wsjtx
-  VERSION 2.6.0.0
+  VERSION 2.6.1.0
   LANGUAGES C CXX Fortran
   )
 set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio")
@@ -71,7 +71,7 @@ message (STATUS "******************************************************")
 
 include (set_build_type)
 # RC 0 or omitted is a development build, GA is a General Availability release build
-set_build_type (RC 6)
+set_build_type (RC 1)
 set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}")
 
 #
@@ -80,7 +80,7 @@ set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
 set (PROJECT_BUNDLE_NAME "WSJT-X")
 set (PROJECT_VENDOR "Joe Taylor, K1JT")
 set (PROJECT_CONTACT "Joe Taylor <k1jt@arrl.net>")
-set (PROJECT_COPYRIGHT "Copyright (C) 2001-2022 by Joe Taylor, K1JT")
+set (PROJECT_COPYRIGHT "Copyright (C) 2001-2023 by Joe Taylor, K1JT")
 set (PROJECT_HOMEPAGE https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html)
 set (PROJECT_MANUAL wsjtx-main)
 set (PROJECT_MANUAL_DIRECTORY_URL https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/)

Configuration.ui

@@ -1312,6 +1312,9 @@ radio interface behave as expected.</string>
          <layout class="QGridLayout" name="gridLayout_12">
           <item row="0" column="2">
            <widget class="QRadioButton" name="split_emulate_radio_button">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use only VFO A for split operation (the program temporarily changes the QRG of your rig during transmission).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="text">
              <string>Fake It</string>
             </property>
@@ -1322,6 +1325,9 @@ radio interface behave as expected.</string>
           </item>
           <item row="0" column="1">
            <widget class="QRadioButton" name="split_rig_radio_button">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use VFO A+B for split operation (works with many rigs, but requires the use of both VFOs).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="text">
              <string>Rig</string>
             </property>
@@ -1332,6 +1338,9 @@ radio interface behave as expected.</string>
           </item>
           <item row="0" column="0">
            <widget class="QRadioButton" name="split_none_radio_button">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don't use split (not recommended).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="text">
              <string>None</string>
             </property>
@@ -3267,13 +3276,13 @@ Right click for insert and delete options.</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="split_mode_button_group"/>
-  <buttongroup name="PTT_method_button_group"/>
-  <buttongroup name="TX_mode_button_group"/>
-  <buttongroup name="CAT_stop_bits_button_group"/>
   <buttongroup name="TX_audio_source_button_group"/>
-  <buttongroup name="CAT_data_bits_button_group"/>
+  <buttongroup name="PTT_method_button_group"/>
-  <buttongroup name="CAT_handshake_button_group"/>
   <buttongroup name="special_op_activity_button_group"/>
+  <buttongroup name="CAT_stop_bits_button_group"/>
+  <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="TX_mode_button_group"/>
+  <buttongroup name="CAT_handshake_button_group"/>
+  <buttongroup name="CAT_data_bits_button_group"/>
  </buttongroups>
 </ui>

NEWS

@@ -9,7 +9,34 @@
  \$$      \$$  \$$$$$$   \$$$$$$     \$$        \$$   \$$
                                                          
                                                          
-Copyright 2001 - 2022 by Joe Taylor, K1JT, and the WSJT Development Team
+Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team
+
+                        Release: WSJT-X 2.6.0
+                           Januar 2, 2023
+                      -------------------------
+
+WSJT-X 2.6.0 is very similar to rc5, but contains some bug fixes. It has 
+the following changes since Release Candidate 5:
+
+ - PSK Reporter spotting is now also possible for frequencies > 4 GHz. 
+   This is required for QO-100, for example.
+
+ - The minimum width of the main window has been further reduced, and 
+   such small sizes are now remembered.
+
+ - Some further improvements for Fox operators.
+
+ - Fix the long-standing flaw that "Start new period decodes at top" 
+   didn't work anymore after several hours.
+
+ - Fix a flaw that could cause crashes by double-clicking messages 
+   with <...> in certain QSO situations.
+
+ - Fix a flaw that prevented the rig from initializing correctly after 
+   switching between configurations when connected via HRD.
+
+ - Add tooltips to better explain the split operation options.
+
 
                       Release: WSJT-X 2.6.0-rc5
                           November 29, 2022

Network/PSKReporter.cpp

@@ -299,7 +299,7 @@ void PSKReporter::impl::build_preamble (QDataStream& message)
           << quint16 (0xffff)       // Option 1 Field Length (variable)
           << quint32 (30351u)       // Option 1 Enterprise Number
           << quint16 (0x8000 + 5u)  // Option 2 Information Element ID (frequency)
-          << quint16 (4u)           // Option 2 Field Length
+          << quint16 (5u)           // Option 2 Field Length
           << quint32 (30351u)       // Option 2 Enterprise Number
           << quint16 (0x8000 + 6u)  // Option 3 Information Element ID (sNR)
           << quint16 (1u)           // Option 3 Field Length
@@ -423,8 +423,19 @@ void PSKReporter::impl::send_report (bool send_residue)
 
               // Sender information
               writeUtfString (tx_out, spot.call_);
-              tx_out
+              uint8_t data[5];
-                << static_cast<quint32> (spot.freq_)
+              long long int i64 = spot.freq_;
+              data[0] = ( i64 & 0xff);
+              data[1] = ((i64 >>  8) & 0xff);
+              data[2] = ((i64 >> 16) & 0xff);
+              data[3] = ((i64 >> 24) & 0xff);
+              data[4] = ((i64 >> 32) & 0xff);
+              tx_out // BigEndian
+                << static_cast<uint8_t> (data[4])
+                << static_cast<uint8_t> (data[3])
+                << static_cast<uint8_t> (data[2])
+                << static_cast<uint8_t> (data[1])
+                << static_cast<uint8_t> (data[0])
                 << static_cast<qint8> (spot.snr_);
               writeUtfString (tx_out, spot.mode_);
               writeUtfString (tx_out, spot.grid_);

Release_Notes.txt

@@ -9,7 +9,34 @@
  \$$      \$$  \$$$$$$   \$$$$$$     \$$        \$$   \$$
                                                          
                                                          
-Copyright 2001 - 2022 by Joe Taylor, K1JT, and the WSJT Development Team
+Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team
+
+                        Release: WSJT-X 2.6.0
+                           Januar 2, 2023
+                      -------------------------
+
+WSJT-X 2.6.0 is very similar to rc5, but contains some bug fixes. It has 
+the following changes since Release Candidate 5:
+
+ - PSK Reporter spotting is now also possible for frequencies > 4 GHz. 
+   This is required for QO-100, for example.
+
+ - The minimum width of the main window has been further reduced, and 
+   such small sizes are now remembered.
+
+ - Some further improvements for Fox operators.
+
+ - Fix the long-standing flaw that "Start new period decodes at top" 
+   didn't work anymore after several hours.
+
+ - Fix a flaw that could cause crashes by double-clicking messages 
+   with <...> in certain QSO situations.
+
+ - Fix a flaw that prevented the rig from initializing correctly after 
+   switching between configurations when connected via HRD.
+
+ - Add tooltips to better explain the split operation options.
+
 
                       Release: WSJT-X 2.6.0-rc5
                           November 29, 2022

widgets/mainwindow.cpp

@@ -827,6 +827,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
         config_label.hide ();
       }
       statusUpdate ();
+      QTimer::singleShot (250, [=] {setRig (m_lastMonitoredFrequency);});   // This is needed for Hamradio Deluxe
     });
   m_multi_settings->create_menu_actions (this, ui->menuConfig);
   m_configurations_button = m_rigErrorMessageBox.addButton (tr ("Configurations...")
@@ -4353,15 +4354,17 @@ void MainWindow::guiUpdate()
 
     if(m_mode=="FT8" and SpecOp::FOX==m_specOp) {
 // Don't allow Fox mode in any of the default FT8 sub-bands.
-      qint32 ft8Freq[]={1840,3573,7074,10136,14074,18100,21074,24915,28074,50313,70100};
+      qint32 ft8Freq[]={1840000,3573000,7074000,10136000,14074000,18100000,21074000,24915000,28074000,50313000,70154000};
       for(int i=0; i<11; i++) {
-        int kHzdiff=m_freqNominal/1000 - ft8Freq[i];
+          int kHzdiff=m_freqNominal - ft8Freq[i];
-        if(qAbs(kHzdiff) < 4) {
+          if(qAbs(kHzdiff) < 3000 ) {
           m_bTxTime=false;
           if (m_auto) auto_tx_mode (false);
-          auto const& message = tr ("Please choose another dial frequency."
+          if (m_tune) stop_tuning();
-                                    " WSJT-X will not operate in Fox mode"
+          auto const& message = tr ("Please choose another dial frequency.\n"
-                                    " in the standard FT8 sub-bands.");
+                                    "Must be 3Khz away from %1.\n"
+                                    "WSJT-X will not operate in Fox mode\n"
+                                    "overlapping the standard FT8 sub-bands.").arg(ft8Freq[i]);
           QTimer::singleShot (0, [=] {               // don't block guiUpdate
             MessageBox::warning_message (this, tr ("Fox Mode warning"), message);
           });

widgets/mainwindow.ui

@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>991</width>
+    <width>880</width>
-    <height>690</height>
+    <height>685</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>750</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>WSJT-X   by K1JT</string>
   </property>
@@ -2004,7 +2010,7 @@ Double-click to reset to the standard 73 message</string>
                    <attribute name="title">
                     <string>2</string>
                    </attribute>
-                   <layout class="QGridLayout" name="gridLayout_11" columnstretch="1,0">
+                   <layout class="QGridLayout" name="gridLayout_11" columnstretch="1">
                     <property name="leftMargin">
                      <number>4</number>
                     </property>
@@ -3144,7 +3150,7 @@ QPushButton[state=&quot;ok&quot;] {
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>991</width>
+     <width>880</width>
      <height>22</height>
     </rect>
    </property>