Version bump

Reducing compound callsigns to their basecall for most commands except CQ and DE (beacon)

CMakeCPackOptions.cmake.in

@@ -9,8 +9,8 @@ set (CPACK_PACKAGE_CONTACT "@PROJECT_CONTACT@")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_SUMMARY_DESCRIPTION@")
 set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-set (CPACK_PACKAGE_EXECUTABLES wsjtx-ft8call "@PROJECT_NAME@")
-set (CPACK_CREATE_DESKTOP_LINKS wsjtx-ft8call)
+set (CPACK_PACKAGE_EXECUTABLES ft8call "@PROJECT_NAME@")
+set (CPACK_CREATE_DESKTOP_LINKS ft8call)
 set (CPACK_STRIP_FILES TRUE)
 
 #
@@ -21,6 +21,7 @@ set (CPACK_STRIP_FILES TRUE)
 #set (CPACK_COMPONENT_RUNTIME_DESCRIPTION "@WSJTX_DESCRIPTION_SUMMARY@")
 
 if (CPACK_GENERATOR MATCHES "NSIS")
+  set (CPACK_SET_DESTDIR FALSE)
   set (CPACK_STRIP_FILES FALSE)	# breaks Qt packaging on Windows
 
   set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call")
@@ -37,13 +38,13 @@ if (CPACK_GENERATOR MATCHES "NSIS")
     "@PROJECT_HOMEPAGE@" "@PROJECT_NAME@ Web Site"
     )
   # Use the icon from wsjtx for add-remove programs
-  set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\wsjtx-ft8call.exe")
+  set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\ft8call.exe")
 
   set (CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
   set (CPACK_NSIS_HELP_LINK "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@")
   set (CPACK_NSIS_URL_INFO_ABOUT "@PROJECT_HOMEPAGE@")
   set (CPACK_NSIS_CONTACT "${CPACK_PACKAGE_CONTACT}")
-  set (CPACK_NSIS_MUI_FINISHPAGE_RUN "wsjtx-ft8call.exe")
+  set (CPACK_NSIS_MUI_FINISHPAGE_RUN "ft8call.exe")
   set (CPACK_NSIS_MODIFY_PATH ON)
 endif ()
 
@@ -67,9 +68,9 @@ if ("${CPACK_GENERATOR}" STREQUAL "WIX")
   # Reset CPACK_PACKAGE_VERSION to deal with WiX restriction.
   # But the file names still use the full CMake_VERSION value:
   set (CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-@wsjtx-ft8call_VERSION@-${CPACK_SYSTEM_NAME}")
+    "${CPACK_PACKAGE_NAME}-@ft8call_VERSION@-${CPACK_SYSTEM_NAME}")
   set (CPACK_SOURCE_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-@wsjtx-ft8call_VERSION@-Source")
+    "${CPACK_PACKAGE_NAME}-@ft8call_VERSION@-Source")
 
   if (NOT CPACK_WIX_SIZEOF_VOID_P)
     set (CPACK_WIX_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")

CMakeLists.txt

@@ -22,7 +22,7 @@ Change this to the newest SDK available that you can install on your system (10.
 Do not override this if you intend to build an official deployable installer.")
 endif (APPLE)
 
-project (wsjtx-ft8call C CXX Fortran)
+project (ft8call C CXX Fortran)
 
 #
 # CMake policies
@@ -303,6 +303,7 @@ set (wsjtx_CXXSRCS
   astro.cpp
   messageaveraging.cpp
   WsprTxScheduler.cpp
+  varicode.cpp
   mainwindow.cpp
   Configuration.cpp
   main.cpp
@@ -1298,7 +1299,7 @@ else (${OPENMP_FOUND} OR APPLE)
 endif (${OPENMP_FOUND} OR APPLE)
 
 # build the main application
-add_executable (wsjtx-ft8call MACOSX_BUNDLE
+add_executable (ft8call MACOSX_BUNDLE
   ${wsjtx_CXXSRCS}
   ${wsjtx_GENUISRCS}
   wsjtx.rc
@@ -1307,10 +1308,10 @@ add_executable (wsjtx-ft8call MACOSX_BUNDLE
   )
 
 if (WSJT_CREATE_WINMAIN)
-  set_target_properties (wsjtx-ft8call PROPERTIES WIN32_EXECUTABLE ON)
+  set_target_properties (ft8call PROPERTIES WIN32_EXECUTABLE ON)
 endif (WSJT_CREATE_WINMAIN)
 
-set_target_properties (wsjtx-ft8call PROPERTIES
+set_target_properties (ft8call PROPERTIES
   MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}"
   MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
   MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
@@ -1321,27 +1322,27 @@ set_target_properties (wsjtx-ft8call PROPERTIES
   MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
   )
 
-target_include_directories (wsjtx-ft8call PRIVATE ${FFTW3_INCLUDE_DIRS})
+target_include_directories (ft8call PRIVATE ${FFTW3_INCLUDE_DIRS})
 if (APPLE)
-  target_link_libraries (wsjtx-ft8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+  target_link_libraries (ft8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
 else ()
-  target_link_libraries (wsjtx-ft8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+  target_link_libraries (ft8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
   if (OpenMP_C_FLAGS)
-    set_target_properties (wsjtx-ft8call PROPERTIES
+    set_target_properties (ft8call PROPERTIES
       COMPILE_FLAGS "${OpenMP_C_FLAGS}"
       LINK_FLAGS "${OpenMP_C_FLAGS}"
       )
   endif ()
-  set_target_properties (wsjtx-ft8call PROPERTIES
+  set_target_properties (ft8call PROPERTIES
     Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
     )
   if (WIN32)
-    set_target_properties (wsjtx-ft8call PROPERTIES
+    set_target_properties (ft8call PROPERTIES
       LINK_FLAGS -Wl,--stack,16777216
       )
   endif ()
 endif ()
-qt5_use_modules (wsjtx-ft8call SerialPort) # not sure why the interface link library syntax above doesn't work
+qt5_use_modules (ft8call SerialPort) # not sure why the interface link library syntax above doesn't work
 
 # make a library for WSJT-X UDP servers
 # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
@@ -1386,18 +1387,18 @@ endif (WSJT_CREATE_WINMAIN)
 if (UNIX)
   if (NOT WSJT_SKIP_MANPAGES)
     add_subdirectory (manpages)
-    add_dependencies (wsjtx-ft8call manpages)
+    add_dependencies (ft8call manpages)
   endif (NOT WSJT_SKIP_MANPAGES)
   if (NOT APPLE)
     add_subdirectory (debian)
-    add_dependencies (wsjtx-ft8call debian)
+    add_dependencies (ft8call debian)
   endif (NOT APPLE)
 endif (UNIX)
 
 #
 # installation
 #
-install (TARGETS wsjtx-ft8call
+install (TARGETS ft8call
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
   BUNDLE DESTINATION . COMPONENT runtime
   )
@@ -1487,11 +1488,11 @@ add_custom_target (uninstall
 
 
 # creates svnversion.h using cmake script
-add_custom_target (revisiontag
-  COMMAND ${CMAKE_COMMAND} -D SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D OUTPUT_DIR=${PROJECT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/getsvn.cmake
-  COMMENT "Generating Subversion revision information"
-  VERBATIM
-  )
+# add_custom_target (revisiontag
+#   COMMAND ${CMAKE_COMMAND} -D SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D OUTPUT_DIR=${PROJECT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/getsvn.cmake
+#   COMMENT "Generating Subversion revision information"
+#   VERBATIM
+#   )
 # explicitly say that the wsjt_qt depends on custom target, this is
 # done indirectly so that the revisiontag target gets built exactly
 # once per build
@@ -1511,7 +1512,7 @@ if (NOT WIN32 AND NOT APPLE)
   # install a desktop file so wsjtx appears in the application start
   # menu with an icon
   install (
-    FILES wsjtx-ft8call.desktop message_aggregator.desktop
+    FILES ft8call.desktop message_aggregator.desktop
     DESTINATION share/applications
     #COMPONENT runtime
     )

CallsignValidator.cpp

@@ -10,6 +10,7 @@ auto CallsignValidator::validate (QString& input, int& pos) const -> State
 {
   auto match = re_.match (input, 0, QRegularExpression::PartialPreferCompleteMatch);
   input = input.toUpper ();
+  if (input.count(QLatin1Char('/')) > 1) return Invalid;
   if (match.hasMatch ()) return Acceptable;
   if (!input.size () || match.hasPartialMatch ()) return Intermediate;
   pos = input.size ();

Configuration.cpp

@@ -140,6 +140,7 @@
 #include <QSettings>
 #include <QAudioDeviceInfo>
 #include <QAudioInput>
+#include <QDebug>
 #include <QDialog>
 #include <QAction>
 #include <QFileDialog>
@@ -160,7 +161,6 @@
 #include <QColorDialog>
 #include <QSerialPortInfo>
 #include <QScopedPointer>
-#include <QDebug>
 
 #include "pimpl_impl.hpp"
 #include "qt_helpers.hpp"
@@ -181,6 +181,8 @@
 #include "MaidenheadLocatorValidator.hpp"
 #include "CallsignValidator.hpp"
 
+#include "varicode.h"
+
 #include "ui_Configuration.h"
 #include "moc_Configuration.cpp"
 
@@ -430,6 +432,8 @@ private:
   Q_SLOT void on_add_macro_push_button_clicked (bool = false);
   Q_SLOT void on_delete_macro_push_button_clicked (bool = false);
   Q_SLOT void on_PTT_method_button_group_buttonClicked (int);
+  Q_SLOT void on_station_message_line_edit_textChanged(QString const&);
+  Q_SLOT void on_qth_message_line_edit_textChanged(QString const&);
   Q_SLOT void on_add_macro_line_edit_editingFinished ();
   Q_SLOT void delete_macro ();
   void delete_selected_macros (QModelIndexList);
@@ -529,6 +533,11 @@ private:
   // configuration fields that we publish
   QString my_callsign_;
   QString my_grid_;
+  QString my_station_;
+  int my_dBm_;
+  QString my_qth_;
+  int callsign_aging_;
+  int activity_aging_;
   QColor color_CQ_;
   QColor next_color_CQ_;
   QColor color_MyCall_;
@@ -548,6 +557,7 @@ private:
   bool id_after_73_;
   bool tx_QSY_allowed_;
   bool spot_to_psk_reporter_;
+  bool autoreply_off_at_startup_;
   bool monitor_off_at_startup_;
   bool monitor_last_used_;
   bool log_as_RTTY_;
@@ -658,6 +668,7 @@ void Configuration::set_spot_to_psk_reporter (bool spot)
     }
 }
 
+bool Configuration::autoreply_off_at_startup () const {return m_->autoreply_off_at_startup_;}
 bool Configuration::monitor_off_at_startup () const {return m_->monitor_off_at_startup_;}
 bool Configuration::monitor_last_used () const {return m_->rig_is_dummy_ || m_->monitor_last_used_;}
 bool Configuration::log_as_RTTY () const {return m_->log_as_RTTY_;}
@@ -817,6 +828,30 @@ QString Configuration::my_grid() const
   return the_grid;
 }
 
+QString Configuration::my_station() const
+{
+    return m_->my_station_;
+}
+
+int Configuration::my_dBm() const {
+    return m_->my_dBm_;
+}
+
+QString Configuration::my_qth() const
+{
+    return m_->my_qth_;
+}
+
+int Configuration::callsign_aging() const
+{
+    return m_->callsign_aging_;
+}
+
+int Configuration::activity_aging() const
+{
+    return m_->activity_aging_;
+}
+
 void Configuration::set_location (QString const& grid_descriptor)
 {
   // change the dynamic grid
@@ -955,6 +990,8 @@ Configuration::impl::impl (Configuration * self, QDir const& temp_directory,
   ui_->callsign_line_edit->setValidator (new CallsignValidator {this});
   ui_->grid_line_edit->setValidator (new MaidenheadLocatorValidator {this});
   ui_->add_macro_line_edit->setValidator (new QRegExpValidator {message_alphabet, this});
+  ui_->station_message_line_edit->setValidator (new QRegExpValidator {message_alphabet, this});
+  ui_->qth_message_line_edit->setValidator (new QRegExpValidator {message_alphabet, this});
 
   ui_->udp_server_port_spin_box->setMinimum (1);
   ui_->udp_server_port_spin_box->setMaximum (std::numeric_limits<port_type>::max ());
@@ -1125,10 +1162,49 @@ void Configuration::impl::initialize_models ()
     {
       pal.setColor (QPalette::Base, Qt::white);
     }
+
+  QMap<int, int> dbm2mw = {
+      {0  , 1},
+      {3  , 2},
+      {7  , 5},
+      {10 , 10},
+      {13 , 20},
+      {17 , 50},
+      {20 , 100},
+      {23 , 200},
+      {27 , 500},
+      {30 , 1000},    //    1W
+      {33 , 2000},    //    2W
+      {37 , 5000},    //    5W
+      {40 , 10000},   //   10W
+      {43 , 20000},   //   20W
+      {47 , 50000},   //   50W
+      {50 , 100000},  //  100W
+      {53 , 200000},  //  200W
+      {57 , 500000},  //  500W
+      {60 , 1000000}, // 1000W
+  };
+
+  ui_->station_power_combo_box->clear();
+  ui_->station_power_combo_box->addItem(QString(""), -1);
+
+  foreach(auto dbm, dbm2mw.keys()){
+    ui_->station_power_combo_box->addItem(QString("%1 (%2 dBm)").arg(Varicode::formatPWR(dbm)).arg(dbm), dbm);
+
+    if(dbm == my_dBm_){
+        ui_->station_power_combo_box->setCurrentIndex(ui_->station_power_combo_box->count()-1);
+    }
+  }
+
+
   ui_->callsign_line_edit->setPalette (pal);
   ui_->grid_line_edit->setPalette (pal);
   ui_->callsign_line_edit->setText (my_callsign_);
   ui_->grid_line_edit->setText (my_grid_);
+  ui_->callsign_aging_spin_box->setValue(callsign_aging_);
+  ui_->activity_aging_spin_box->setValue(activity_aging_);
+  ui_->station_message_line_edit->setText (my_station_.toUpper());
+  ui_->qth_message_line_edit->setText (my_qth_.toUpper());
   ui_->use_dynamic_grid->setChecked(use_dynamic_grid_);
   ui_->labCQ->setStyleSheet(QString("background: %1").arg(color_CQ_.name()));
   ui_->labMyCall->setStyleSheet(QString("background: %1").arg(color_MyCall_.name()));
@@ -1147,6 +1223,7 @@ void Configuration::impl::initialize_models ()
   ui_->CW_id_after_73_check_box->setChecked (id_after_73_);
   ui_->tx_QSY_check_box->setChecked (tx_QSY_allowed_);
   ui_->psk_reporter_check_box->setChecked (spot_to_psk_reporter_);
+  ui_->autoreply_off_check_box->setChecked (autoreply_off_at_startup_);
   ui_->monitor_off_check_box->setChecked (monitor_off_at_startup_);
   ui_->monitor_last_used_check_box->setChecked (monitor_last_used_);
   ui_->log_as_RTTY_check_box->setChecked (log_as_RTTY_);
@@ -1247,6 +1324,11 @@ void Configuration::impl::read_settings ()
 
   my_callsign_ = settings_->value ("MyCall", QString {}).toString ();
   my_grid_ = settings_->value ("MyGrid", QString {}).toString ();
+  my_station_ = settings_->value("MyStation", QString {}).toString();
+  my_dBm_ = settings_->value("MyPower", -1).toInt();
+  callsign_aging_ = settings_->value ("CallsignAging", 0).toInt ();
+  activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
+  my_qth_ = settings_->value("MyQTH", QString {}).toString();
   next_color_CQ_ = color_CQ_ = settings_->value("colorCQ","#66ff66").toString();
   next_color_MyCall_ = color_MyCall_ = settings_->value("colorMyCall","#ff6666").toString();
   next_color_TxMsg_ = color_TxMsg_ = settings_->value("colorTxMsg","#ffff00").toString();
@@ -1340,6 +1422,7 @@ void Configuration::impl::read_settings ()
 
   type_2_msg_gen_ = settings_->value ("Type2MsgGen", QVariant::fromValue (Configuration::type_2_msg_3_full)).value<Configuration::Type2MsgGen> ();
 
+  autoreply_off_at_startup_ = settings_->value ("AutoreplyOFF", false).toBool ();
   monitor_off_at_startup_ = settings_->value ("MonitorOFF", false).toBool ();
   monitor_last_used_ = settings_->value ("MonitorLastUsed", false).toBool ();
   spot_to_psk_reporter_ = settings_->value ("PSKReporter", false).toBool ();
@@ -1399,7 +1482,7 @@ void Configuration::impl::read_settings ()
   miles_ = settings_->value ("Miles", false).toBool ();
   quick_call_ = settings_->value ("QuickCall", false).toBool ();
   disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool ();
-  beacon_ = settings_->value ("TxBeacon", 5).toInt ();
+  beacon_ = settings_->value ("TxBeacon", 15).toInt ();
   watchdog_ = settings_->value ("TxWatchdog", 0).toInt ();
   TX_messages_ = settings_->value ("Tx2QSO", true).toBool ();
   enable_VHF_features_ = settings_->value("VHFUHF",false).toBool ();
@@ -1433,6 +1516,11 @@ void Configuration::impl::write_settings ()
 
   settings_->setValue ("MyCall", my_callsign_);
   settings_->setValue ("MyGrid", my_grid_);
+  settings_->setValue ("MyStation", my_station_);
+  settings_->setValue ("MyPower", my_dBm_);
+  settings_->setValue ("MyQTH", my_qth_);
+  settings_->setValue ("CallsignAging", callsign_aging_);
+  settings_->setValue ("ActivityAging", activity_aging_);
   settings_->setValue("colorCQ",color_CQ_);
   settings_->setValue("colorMyCall",color_MyCall_);
   settings_->setValue("colorTxMsg",color_TxMsg_);
@@ -1471,6 +1559,7 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("AudioInputChannel", AudioDevice::toString (audio_input_channel_));
   settings_->setValue ("AudioOutputChannel", AudioDevice::toString (audio_output_channel_));
   settings_->setValue ("Type2MsgGen", QVariant::fromValue (type_2_msg_gen_));
+  settings_->setValue ("AutoreplyOFF", autoreply_off_at_startup_);
   settings_->setValue ("MonitorOFF", monitor_off_at_startup_);
   settings_->setValue ("MonitorLastUsed", monitor_last_used_);
   settings_->setValue ("PSKReporter", spot_to_psk_reporter_);
@@ -1884,6 +1973,11 @@ void Configuration::impl::accept ()
 
   my_callsign_ = ui_->callsign_line_edit->text ();
   my_grid_ = ui_->grid_line_edit->text ();
+  my_station_ = ui_->station_message_line_edit->text().toUpper();
+  my_dBm_ = ui_->station_power_combo_box->currentData().toInt();
+  my_qth_ = ui_->qth_message_line_edit->text().toUpper();
+  callsign_aging_ = ui_->callsign_aging_spin_box->value();
+  activity_aging_ = ui_->activity_aging_spin_box->value();
   spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked ();
   id_interval_ = ui_->CW_id_interval_spin_box->value ();
   ntrials_ = ui_->sbNtrials->value ();
@@ -1893,6 +1987,7 @@ void Configuration::impl::accept ()
   RxBandwidth_ = ui_->sbBandwidth->value ();
   id_after_73_ = ui_->CW_id_after_73_check_box->isChecked ();
   tx_QSY_allowed_ = ui_->tx_QSY_check_box->isChecked ();
+  autoreply_off_at_startup_ = ui_->autoreply_off_check_box->isChecked ();
   monitor_off_at_startup_ = ui_->monitor_off_check_box->isChecked ();
   monitor_last_used_ = ui_->monitor_last_used_check_box->isChecked ();
   type_2_msg_gen_ = static_cast<Type2MsgGen> (ui_->type_2_msg_gen_combo_box->currentIndex ());
@@ -2167,6 +2262,22 @@ void Configuration::impl::on_sound_output_combo_box_currentTextChanged (QString
   default_audio_output_device_selected_ = QAudioDeviceInfo::defaultOutputDevice ().deviceName () == text;
 }
 
+void Configuration::impl::on_station_message_line_edit_textChanged(QString const &text)
+{
+  QString upper = text.toUpper();
+  if(text != upper){
+    ui_->station_message_line_edit->setText (upper);
+  }
+}
+
+void Configuration::impl::on_qth_message_line_edit_textChanged(QString const &text)
+{
+  QString upper = text.toUpper();
+  if(text != upper){
+    ui_->qth_message_line_edit->setText (upper);
+  }
+}
+
 void Configuration::impl::on_add_macro_line_edit_editingFinished ()
 {
   ui_->add_macro_line_edit->setText (ui_->add_macro_line_edit->text ().toUpper ());

Configuration.hpp

@@ -96,6 +96,11 @@ public:
 
   QString my_callsign () const;
   QString my_grid () const;
+  QString my_station () const;
+  int my_dBm() const;
+  int activity_aging() const;
+  int callsign_aging() const;
+  QString my_qth () const;
   QFont text_font () const;
   QFont decoded_text_font () const;
   qint32 id_interval () const;
@@ -108,6 +113,7 @@ public:
   bool tx_QSY_allowed () const;
   bool spot_to_psk_reporter () const;
   void set_spot_to_psk_reporter (bool);
+  bool autoreply_off_at_startup () const;
   bool monitor_off_at_startup () const;
   bool monitor_last_used () const;
   bool log_as_RTTY () const;

HamlibTransceiver.cpp

@@ -804,9 +804,9 @@ void HamlibTransceiver::do_tx_frequency (Frequency tx, MODE mode, bool no_ignore
               if (UNK != mode)
                 {
                   auto new_mode = map_mode (mode);
-                  // TRACE_CAT ("HamlibTransceiver", "rig_set_split_freq_mode freq = " << tx
-                  //            << " mode = " << rig_strrmode (new_mode));
-                  // error_check (rig_set_split_freq_mode (rig_.data (), RIG_VFO_CURR, tx, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting split TX frequency and mode"));
+                  TRACE_CAT ("HamlibTransceiver", "rig_set_split_freq_mode freq = " << tx
+                              << " mode = " << rig_strrmode (new_mode));
+                  error_check (rig_set_split_freq_mode (rig_.data (), RIG_VFO_CURR, tx, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting split TX frequency and mode"));
                 }
               else
                 {

Modes.cpp

@@ -24,7 +24,6 @@ namespace
     "QRA64",
     "FreqCal",
     "FT8",
-    "FT8Free"
   };
   std::size_t constexpr mode_names_size = sizeof (mode_names) / sizeof (mode_names[0]);
 }

Modes.hpp

@@ -50,7 +50,6 @@ public:
     QRA64,
     FreqCal,
     FT8,
-    FT8Free,
     MODES_END_SENTINAL_AND_COUNT // this must be last
   };
   Q_ENUM (Mode)

Versions.cmake

@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 0)
-set (WSJTX_VERSION_MINOR 0)
-set (WSJTX_VERSION_PATCH 4)
+set (WSJTX_VERSION_MINOR 3)
+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

decodedtext.cpp

@@ -4,6 +4,8 @@
 #include <QRegularExpression>
 #include <QDebug>
 
+#include <varicode.h>
+
 extern "C" {
   bool stdmsg_(char const * msg, bool contest_mode, char const * mygrid, fortran_charlen_t, fortran_charlen_t);
 }
@@ -50,8 +52,109 @@ DecodedText::DecodedText (QString const& the_string, bool contest_mode, QString
                               , contest_mode_
                               , grid_c_string.constData ()
                               , 22, 6);
+
+      // We're only going to unpack standard messages for CQs && beacons...
+      // TODO: jsherer - this is a hack for now...
+      if(is_standard_){
+        is_standard_ = QRegularExpression("^(CQ|DE|QRZ)\\s").match(message_).hasMatch();
+      }
     }
-};
+
+    tryUnpack();
+}
+
+DecodedText::DecodedText (QString const& ft8callmessage){
+    message_ = ft8callmessage;
+    is_standard_ = false;
+    tryUnpack();
+}
+
+bool DecodedText::tryUnpack(){
+    if(is_standard_){
+        return false;
+    }
+
+    bool unpacked = false;
+    if(!unpacked){
+      unpacked = tryUnpackCompound();
+    }
+
+    if(!unpacked){
+      unpacked = tryUnpackDirected();
+    }
+
+    if(!unpacked){
+      unpacked = tryUnpackData();
+    }
+
+    return unpacked;
+}
+
+bool DecodedText::tryUnpackCompound(){
+  QString m = message().trimmed();
+
+  // directed calls will always be 12+ chars and contain no spaces.
+  if(m.length() < 12 || m.contains(' ')){
+    return false;
+  }
+
+  QStringList parts = Varicode::unpackCompoundMessage(m);
+
+  if(parts.isEmpty() || parts.length() < 2){
+    return false;
+  }
+
+  compound_ = QString("%1/%2").arg(parts.at(0), parts.at(1));
+  message_ = QString("%1: ").arg(compound_);
+  return true;
+}
+
+bool DecodedText::tryUnpackDirected(){
+    QString m = message().trimmed();
+
+    // directed calls will always be 12+ chars and contain no spaces.
+    if(m.length() < 12 || m.contains(' ')){
+      return false;
+    }
+
+    QStringList parts = Varicode::unpackDirectedMessage(m);
+
+    if(parts.isEmpty()){
+      return false;
+    }
+
+    if(parts.length() == 3){
+      // replace it with the correct unpacked (directed)
+      message_ = QString("%1: %2%3 ").arg(parts.at(0), parts.at(1), parts.at(2));
+    } else if(parts.length() == 4){
+      // replace it with the correct unpacked (directed numeric)
+      message_ = QString("%1: %2%3 %4 ").arg(parts.at(0), parts.at(1), parts.at(2), parts.at(3));
+    } else {
+      // replace it with the correct unpacked (freetext)
+      message_ = QString(parts.join(""));
+    }
+
+    directed_ = parts;
+    return true;
+}
+
+bool DecodedText::tryUnpackData(){
+    QString m = message().trimmed();
+
+    // data frames calls will always be 12+ chars and contain no spaces.
+    if(m.length() < 12 || m.contains(' ')){
+      return false;
+    }
+
+    QString data = Varicode::unpackDataMessage(m);
+
+    if(data.isEmpty()){
+      return false;
+    }
+
+    message_ = data;
+    return true;
+}
 
 QStringList DecodedText::messageWords () const
 {

decodedtext.h

@@ -10,6 +10,7 @@
 #define DECODEDTEXT_H
 
 #include <QString>
+#include <QStringList>
 
 
 
@@ -30,15 +31,28 @@ class DecodedText
 {
 public:
   explicit DecodedText (QString const& message, bool, QString const& my_grid);
+  explicit DecodedText (QString const& ft8callmessage);
 
-  QString string() const { return string_; };
+  bool tryUnpack();
+  bool tryUnpackCompound();
+  bool tryUnpackDirected();
+  bool tryUnpackData();
+
+  QString compoundCall() const { return compound_; }
+  bool isCompoundMessage() const { return !compound_.isEmpty(); }
+
+  QStringList directedMessage() const { return directed_; }
+  bool isDirectedMessage() const { return !directed_.isEmpty() && directed_.length() > 2; }
+
+  QString string() const { return string_; }
+  QString message() const { return message_; }
   QStringList messageWords () const;
-  int indexOf(QString s) const { return string_.indexOf(s); };
-  int indexOf(QString s, int i) const { return string_.indexOf(s,i); };
-  QString mid(int f, int t) const { return string_.mid(f,t); };
-  QString left(int i) const { return string_.left(i); };
+  int indexOf(QString s) const { return string_.indexOf(s); }
+  int indexOf(QString s, int i) const { return string_.indexOf(s,i); }
+  QString mid(int f, int t) const { return string_.mid(f,t); }
+  QString left(int i) const { return string_.left(i); }
 
-  void clear() { string_.clear(); };
+  void clear() { string_.clear(); }
 
   QString CQersCall() const;
 
@@ -49,6 +63,8 @@ public:
   bool isLowConfidence () const;
   int frequencyOffset() const;  // hertz offset from the tuned dial or rx frequency, aka audio frequency
   int snr() const;
+  bool hasBits() const { return !string_.right(5).trimmed().isEmpty(); }
+  int bits() const { return string_.right(5).trimmed().toShort(); }
   float dt() const;
 
   // find and extract any report. Returns true if this is a standard message
@@ -75,6 +91,8 @@ private:
       column_mode    = 19,
       column_qsoText = 22 };
 
+  QString compound_;
+  QStringList directed_;
   QString string_;
   int padding_;
   bool contest_mode_;

ft8call.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
-Name=wsjtx-ft8call
+Name=ft8call
 Comment=Amateur Radio Weak Signal Operating
-Exec=wsjtx-ft8call
+Exec=ft8call
 Icon=wsjtx_icon
 Terminal=false
 X-MultipleArgs=false

lib/ft8/ft8b.f90

@@ -380,6 +380,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
         if(i3bit.eq.1) decoded(57:)=0
         call extractmessage174(decoded,message,ncrcflag)
         decoded=decoded0
+
 ! This needs fixing for messages with i3bit=1:        
         call genft8(message,mygrid6,bcontest,i3bit,msgsent,msgbits,itone)
         if(lsubtract) call subtractft8(dd0,itone,f1,xdt2)
@@ -397,6 +398,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
         if(.not.nagain) xsnr=xsnr2
         if(xsnr .lt. -24.0) xsnr=-24.0
         
+        
         if(i3bit.eq.1) then
            do i=1,12
               i1hiscall(i)=ichar(hiscall12(i:i))
@@ -431,6 +433,10 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
         else
            msg37=message//'               '
         endif
+
+        if(i3bit.gt.1) then
+            msg37(22:22) = char(48 + i3bit)
+        endif
         
         return
      endif

lib/packjt.f90

@@ -423,7 +423,9 @@ subroutine packbits(dbits,nsymd,m0,sym)
 
    itype=1
    if(bcontest) then
-      call to_contest_msg(msg0,msg)
+      !call to_contest_msg(msg0,msg)
+      ! this causes problems with freetext ala, KN4CRD DE KN4CRD -13 R
+      msg=msg0
    else
       msg=msg0
    end if

logqso.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>377</width>
-    <height>257</height>
+    <width>600</width>
+    <height>285</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,6 +16,12 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>600</width>
+    <height>0</height>
+   </size>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_11">
    <item>
     <widget class="QLabel" name="label">

mainwindow.h

@@ -39,6 +39,7 @@
 #include "MessageBox.hpp"
 #include "NetworkAccessManager.hpp"
 #include "qorderedmap.h"
+#include "varicode.h"
 
 #define NUM_JT4_SYMBOLS 206                //(72+31)*2, embedded sync
 #define NUM_JT65_SYMBOLS 126               //63 data + 63 sync
@@ -115,13 +116,15 @@ public slots:
   void readFromStdout();
   void p1ReadFromStdout();
   void setXIT(int n, Frequency base = 0u);
+  void setFreqForRestore(int freq, bool shouldRestore);
   void setFreq4(int rxFreq, int txFreq);
   void msgAvgDecode2();
   void fastPick(int x0, int x1, int y);
 
+  QString lookupCallInCompoundCache(QString const &call);
   void clearActivity();
-  int logRxTxMessageText(QDateTime date, bool isFree, QString text, int freq, bool tx, int block=-1);
-  void addMessageText(QString text);
+  int logRxTxMessageText(QDateTime date, QString text, int freq, bool tx, int block=-1);
+  void addMessageText(QString text, bool clear=false);
   void resetMessage();
   void resetMessageUI();
   void createMessage(QString const& text);
@@ -196,6 +199,7 @@ private slots:
   void on_txb5_doubleClicked ();
   void on_txb6_clicked();
   void on_startTxButton_toggled(bool checked);
+  void toggleTx(bool start);
   void splitAndSendNextMessage();
   void on_rbNextFreeTextMsg_toggled (bool status);
   void on_lookupButton_clicked();
@@ -235,10 +239,10 @@ private slots:
   void on_rbFreeText_clicked(bool checked);
   void on_clearAction_triggered(QObject * sender);
   void on_cqMacroButton_clicked();
-  void on_deMacroButton_clicked();
-  void on_replyMacroButton_clicked();
+  void on_qtcMacroButton_clicked();
   void on_qthMacroButton_clicked();
-  void on_snrMacroButton_clicked();
+  void buildQueryMenu(QMenu *);
+  void on_queryButton_pressed();
   void on_macrosMacroButton_pressed();
   void on_tableWidgetRXAll_cellClicked(int row, int col);
   void on_tableWidgetRXAll_cellDoubleClicked(int row, int col);
@@ -250,14 +254,17 @@ private slots:
   void on_nextFreeTextMsg_currentTextChanged (QString const&);
   void on_extFreeTextMsg_currentTextChanged (QString const&);
   void on_extFreeTextMsgEdit_currentTextChanged (QString const&);
-  QStringList buildFT8MessageFrames(QString const& text);
-  QString parseFT8Message(QString input);
-  int countFreeTextMsgs(QString input);
+  int currentFreq();
+  int countFT8MessageFrames(QString const& text);
+  QPair<QStringList, QStringList> buildFT8MessageFrames(QString const& text);
+  QString parseFT8Message(QString input, bool *isFree);
   bool prepareNextMessageFrame();
   bool isFreqOffsetFree(int f, int bw);
   int findFreeFreqOffset(int fmin, int fmax, int bw);
-  void scheduleBeacon(bool first=false);
-  void prepareBeacon();
+  void scheduleBacon(bool first=false);
+  void setBaconTimer(QDateTime timestamp);
+  void pauseBacon();
+  void prepareBacon();
   QString calculateDistance(QString const& grid);
   void on_rptSpinBox_valueChanged(int n);
   void killFile();
@@ -634,40 +641,62 @@ private:
   struct CallDetail
   {
     QString call;
+    QString through;
     QString grid;
     int freq;
     QDateTime utcTimestamp;
     int snr;
   };
 
+  struct CommandDetail
+  {
+    QString from;
+    QString to;
+    QString cmd;
+    int freq;
+    QDateTime utcTimestamp;
+    int snr;
+    QString text;
+  };
+
   struct ActivityDetail
   {
     bool isFree;
     bool isLowConfidence;
-    QString firstCall;
-    QString secondCall;
+    bool isCompound;
+    int bits;
     int freq;
     QString text;
     QDateTime utcTimestamp;
     int snr;
   };
 
-  struct RXDetail
-  {
-      bool isFree;
-      int freq;
-      QString text;
-      QDateTime utcTimestamp;
+  struct MessageBuffer {
+    CommandDetail cmd;
+    QList<ActivityDetail> msgs;
   };
 
+  bool m_rxDirty;
   int m_txFrameCount;
+  QString m_lastTxMessage;
+  QDateTime m_lastTxTime;
+
+
   QQueue<QString> m_txFrameQueue;
-  QQueue<RXDetail> m_rxFrameQueue;
+  QQueue<ActivityDetail> m_rxFrameQueue;
+  QQueue<CommandDetail> m_rxCommandQueue;
+  QMap<QString, QString> m_compoundCallCache; // base callsign -> compound callsign
+  QCache<QString, QDateTime> m_txAllcallCommandCache; // callsign -> last tx
+  QCache<int, QDateTime> m_rxRecentCache; // freq -> last rx
   QCache<int, QDateTime> m_rxDirectedCache; // freq -> last directed rx
   QCache<QString, int> m_rxCallCache; // call -> last freq seen
   QMap<int, int> m_rxFrameBlockNumbers; // freq -> block
   QMap<int, QList<ActivityDetail>> m_bandActivity; // freq -> [(text, last timestamp), ...]
+  QMap<int, MessageBuffer> m_messageBuffer; // freq -> (cmd, [frames, ...])
   QMap<QString, CallDetail> m_callActivity; // call -> (last freq, last timestamp)
+  QSet<QString> m_callSeenBeacon; // call
+  int m_previousFreq;
+  bool m_shouldRestoreFreq;
   QMap<QString,FoxQSO> m_foxQSO;
   QMap<QString,QString> m_loggedByFox;
 
@@ -676,6 +705,7 @@ private:
   QQueue<QString> m_foxRR73Queue;
   QQueue<qint64>  m_foxRateQueue;
 
+  bool m_nextBeaconPaused = false;
   QDateTime m_nextBeacon;
   QDateTime m_dateTimeQSOOn;
   QDateTime m_dateTimeLastTX;
@@ -732,6 +762,7 @@ private:
   void rigFailure (QString const& reason);
   void pskSetLocal ();
   void pskPost(DecodedText const& decodedtext);
+  void pskLogReport(QString mode, int offset, int snr, QString callsign, QString grid);
   void displayDialFrequency ();
   void transmitDisplay (bool);
   void processMessage(DecodedText const&, Qt::KeyboardModifiers = 0);
@@ -740,7 +771,13 @@ private:
   void replayDecodes ();
   void postDecode (bool is_new, QString const& message);
   void displayTransmit();
-  void displayActivity();
+  void updateButtonDisplay();
+  bool isMyCallIncluded(QString const &text);
+  bool isAllCallIncluded(QString const &text);
+  QString callsignSelected();
+  bool isRecentOffset(int offset);
+  bool isDirectedOffset(int offset);
+  void displayActivity(bool force=false);
   void postWSPRDecode (bool is_new, QStringList message_parts);
   void enable_DXCC_entity (bool on);
   void switch_mode (Mode);
@@ -805,6 +842,27 @@ protected:
     }
 };
 
+class EnterKeyPressEater : public QObject
+{
+    Q_OBJECT
+protected:
+    bool eventFilter(QObject *obj, QEvent *event){
+        if (event->type() == QEvent::KeyPress) {
+            QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+            if(keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return){
+                emit this->enterKeyPressed(keyEvent, obj);
+                return true;
+            }
+        }
+
+        // standard event processing
+        return QObject::eventFilter(obj, event);
+    }
+
+public:
+    Q_SIGNAL void enterKeyPressed(QKeyEvent *evt, QObject *obj);
+};
+
 extern int killbyname(const char* progName);
 extern void getDev(int* numDevices,char hostAPI_DeviceName[][50],
                    int minChan[], int maxChan[],

qpriorityqueue.h

@@ -0,0 +1,253 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Corentin Chary <corentin.chary@gmail.cm>
+**
+** This file could be part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPRIORITY_QUEUE_H
+#define QPRIORITY_QUEUE_H
+
+#include <QtCore/qalgorithms.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Core)
+
+template <class T> class QList;
+
+#ifndef QT_NO_STL
+#include <queue>
+#include <vector>
+#else
+/* Fallback class used when stl is not available */
+template <class T, typename LessThan = qLess < T > >
+class QPriorityQueuePrivate {
+public:
+    inline QPriorityQueuePrivate(LessThan l) : lessThan(l), d() {}
+    inline ~QPriorityQueuePrivate() {}
+
+    inline void clear() { return d.clear(); }
+    inline int size() const { return d.size(); }
+    inline bool empty() const { return d.empty(); }
+
+    inline T &top() { return d.front(); }
+
+    void pop();
+    void push(const T &value);
+private:
+    inline int parent(int i) {
+    return (i - 1) / 2;
+    }
+    inline int leftChild(int i) {
+    return 2 * i + 1;
+    }
+    inline int rightChild(int i) {
+    return 2 * i + 2;
+    }
+
+    LessThan lessThan;
+    QList < T > d;
+};
+#endif
+
+template <class T, typename LessThan = qLess < T > >
+class Q_CORE_EXPORT QPriorityQueue
+{
+public:
+    inline QPriorityQueue(LessThan l = qLess < T >())
+      : lessThan(l), d(lessThan) { }
+    inline QPriorityQueue(const QPriorityQueue<T> &q)
+      : lessThan(q.lessThan), d(q.d) { }
+    inline ~QPriorityQueue() { }
+
+    QPriorityQueue<T> &operator=(const QPriorityQueue<T> &q) {
+      d = q.d; return *this;
+    }
+
+    inline int size() const { return d.size(); }
+    inline bool isEmpty() const { return empty(); }
+
+    // like qlist
+    void clear();
+    void append(const T &t) { return enqueue(t); }
+    void append(const QList<T> &t);
+    T takeFirst() { return dequeue(); }
+    inline int length() const { return size(); } // Same as count()
+    inline T& first() { return head(); }
+    inline const T& first() const { return head(); }
+    inline void removeFirst() { pop(); }
+    inline bool startsWith(const T &t) const
+    { return !isEmpty() && first() == t; }
+
+    // like qqueue
+    inline void enqueue(const T &t) { push(t); }
+    inline T dequeue() { T t = d.top();	d.pop(); return t; }
+    inline T &head() { top(); }
+    inline const T &head() const { top(); }
+
+    // stl compatibility
+    typedef int size_type;
+    typedef T value_type;
+
+    inline bool empty() const { return d.empty(); }
+    inline const value_type& top() { Q_ASSERT(!isEmpty()); return d.top(); }
+    inline void push(const value_type& x) { return d.push(x); }
+    inline void pop() { Q_ASSERT(!isEmpty()); d.pop(); }
+
+    // comfort
+    inline QPriorityQueue<T> &operator+=(const T &t) {
+      enqueue(t); return *this;
+    }
+    inline QPriorityQueue<T> &operator<< (const T &t) {
+      enqueue(t); return *this;
+    }
+    inline QPriorityQueue<T> &operator>> (T &t) {
+      t = d.top(); d.pop(); return *this;
+    }
+
+#ifndef QT_NO_STL
+    static inline QPriorityQueue<T>fromStdPriorityQueue(
+        const std::priority_queue<T> &q) {
+      QPriorityQueue<T> tmp; tmp.d = q; return tmp;
+    }
+    inline std::priority_queue<T> toStdPriorityQueue() const {
+      return d;
+    }
+#endif
+
+private:
+    LessThan lessThan;
+#ifndef QT_NO_STL
+    std::priority_queue <T, std::vector < T >, LessThan> d;
+#else
+    QPriorityQueuePrivate <T> d;
+#endif
+};
+
+#ifndef QT_NO_STL
+
+template <typename T, typename LessThan>
+Q_INLINE_TEMPLATE void QPriorityQueue<T, LessThan>::clear()
+{
+    d = std::priority_queue<T>(lessThan);
+}
+
+#else
+
+template <typename T, typename LessThan>
+Q_INLINE_TEMPLATE void QPriorityQueue<T, LessThan>::clear()
+{
+    d.clear();
+}
+
+#endif
+
+template <typename T, typename LessThan>
+Q_OUTOFLINE_TEMPLATE void QPriorityQueue<T, LessThan>::append(const QList<T> &t)
+{
+    foreach (T & e, t)
+    push(e);
+}
+
+// Re-implement std::priority_queue if STL not available, probably
+// less efficient.
+#ifdef QT_NO_STL
+/*!
+ *  Pop an element from the queue and reorder it using an
+ *  inlined binary heap.
+ *
+ *  \internal
+ */
+template <typename T, typename LessThan>
+Q_OUTOFLINE_TEMPLATE void QPriorityQueuePrivate<T, LessThan>::pop()
+{
+    int i = 0;
+    ssize_t size = d.size();;
+
+    if(!size)
+    return;
+    if(size == 1)
+    return d.clear();
+
+    d[0] = d.takeLast();
+
+    while(i < size - 1) {
+    int left = leftChild(i);
+    int right = rightChild(i);
+    bool validLeft = left < size;
+    bool validRight = right < size;
+
+    if(validLeft && lessThan(d.at(i), d.at(left)))
+        if(validRight && !lessThan(d.at(right), d.at(left))) {
+        d.swap(i, right);
+        i = right;
+        } else {
+        d.swap(i, left);
+        i = left;
+        }
+    else if(validRight && lessThan(d.at(i), d.at(right))) {
+        d.swap(i, right);
+        i = right;
+    }
+    else
+        break;
+    }
+}
+
+/*!
+ *  Push an element with a given priority to the right place.
+ *
+ *  \internal
+ */
+template <typename T, typename LessThan>
+Q_OUTOFLINE_TEMPLATE void QPriorityQueuePrivate<T, LessThan>::push(const T &value)
+{
+    int i = d.size();
+    d.append(value);
+    while(i != 0 && !lessThan(d.at(i), d.at(parent(i)))) {
+    d.swap(i, parent(i));
+    i = parent(i);
+    }
+}
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QPRIORITY_QUEUE_H

revision_utils.cpp

@@ -5,64 +5,9 @@
 #include <QCoreApplication>
 #include <QRegularExpression>
 
-#include "svnversion.h"
-
-namespace
-{
-  QString revision_extract_number (QString const& s)
-  {
-    QString revision;
-
-    // try and match a number
-    QRegularExpression re {R"(^[$:]\w+: (\d+[^$]*)\$$)"};
-    auto match = re.match (s);
-    if (match.hasMatch ())
-      {
-        revision = 'r' + match.captured (1);
-      }
-    return revision;
-  }
-}
-
 QString revision (QString const& svn_rev_string)
 {
-  QString result;
-#if 0
-  auto revision_from_svn = revision_extract_number (svn_rev_string);
-
-#if defined (CMAKE_BUILD)
-  QString svn_info {":Rev: " WSJTX_STRINGIZE (SVNVERSION) " $"};
-
-  auto revision_from_svn_info = revision_extract_number (svn_info);
-  if (!revision_from_svn_info.isEmpty ())
-    {
-      // we managed to get the revision number from svn info etc.
-      result = revision_from_svn_info;
-    }
-  else if (!revision_from_svn.isEmpty ())
-    {
-      // fall back to revision passed in if any
-      result = revision_from_svn;
-    }
-  else
-    {
-      // match anything
-      QRegularExpression re {R"(^[$:]\w+: ([^$]*)\$$)"};
-      auto match = re.match (svn_info);
-      if (match.hasMatch ())
-        {
-          result = match.captured (1);
-        }
-    }
-#else
-  if (!revision_from_svn.isEmpty ())
-    {
-      // not CMake build so all we have is revision passed
-      result = revision_from_svn;
-    }
-#endif
-#endif
-  return result.trimmed ();
+  return "";
 }
 
 QString version (bool include_patch)

varicode.h

@@ -0,0 +1,96 @@
+#ifndef VARICODE_H
+#define VARICODE_H
+
+/**
+ * (C) 2018 Jordan Sherer <kn4crd@gmail.com> - All Rights Reserved
+ **/
+
+#include <QBitArray>
+#include <QRegularExpression>
+#include <QRegExp>
+#include <QString>
+#include <QVector>
+
+class Varicode
+{
+public:
+    enum FrameType{
+        FT8              = 0, // [000]
+        FT8Fox           = 1, // [001]
+        FT8Call          = 2, // [010]
+        FT8CallLast      = 3, // [011] <- used to indicate last frame in transmission
+        FT8CallReservedA = 4, // [100]
+        FT8CallReservedB = 5, // [101]
+        FT8CallReservedC = 6, // [110]
+        FT8CallReservedD = 7, // [111]
+    };
+
+    //Varicode();
+
+    static QString formatSNR(int snr);
+    static QString formatPWR(int dbm);
+
+    static QString checksum16(QString const &input);
+    static bool checksum16Valid(QString const &checksum, QString const &input);
+
+    static QString checksum32(QString const &input);
+    static bool checksum32Valid(QString const &checksum, QString const &input);
+
+    static QStringList parseCallsigns(QString const &input);
+    static QStringList parseGrids(QString const &input);
+
+    static QList<QVector<bool>> huffEncode(const QMap<QChar, QString> &huff, QString const& text);
+    static QString huffDecode(const QMap<QChar, QString> &huff, QVector<bool> const& bitvec, int pad=0);
+
+    static QString huffUnescape(QString const &input);
+    static QString huffEscape(QString const &input);
+    static QSet<QChar> huffValidChars();
+    static bool huffShouldEscape(QString const &input);
+
+    static QVector<bool> bytesToBits(char * bitvec, int n);
+    static QVector<bool> strToBits(QString const& bitvec);
+    static QString bitsToStr(QVector<bool> const& bitvec);
+
+    static QVector<bool> intToBits(quint64 value, int expected=0);
+    static quint64 bitsToInt(QVector<bool> const value);
+    static quint64 bitsToInt(QVector<bool>::ConstIterator start, int n);
+    static QVector<bool> bitsListToBits(QList<QVector<bool>> &list);
+
+    static quint8 unpack5bits(QString const& value);
+    static QString pack5bits(quint8 packed);
+
+    static quint8 unpack6bits(QString const& value);
+    static QString pack6bits(quint8 packed);
+
+    static quint16 unpack16bits(QString const& value);
+    static QString pack16bits(quint16 packed);
+
+    static quint32 unpack32bits(QString const& value);
+    static QString pack32bits(quint32 packed);
+
+    static quint64 unpack64bits(QString const& value);
+    static QString pack64bits(quint64 packed);
+
+    static quint32 packCallsignPrefixSuffix(QString const& value);
+    static QString unpackCallsignPrefixSuffix(quint32 packed);
+
+    static quint32 packCallsign(QString const& value);
+    static QString unpackCallsign(quint32 value);
+
+    static quint16 packGrid(QString const& value);
+    static QString unpackGrid(quint16 value);
+
+    static bool isCommandAllowed(const QString &cmd);
+    static bool isCommandBuffered(const QString &cmd);
+
+    static QString packCompoundMessage(const QString &baseCallsign, const QString &fix, bool isPrefix, quint16 num);
+    static QStringList unpackCompoundMessage(const QString &text);
+
+    static QString packDirectedMessage(QString const& text, QString const& callsign, QString * pCmd, int *n);
+    static QStringList unpackDirectedMessage(QString const& text);
+
+    static QString packDataMessage(QString const& text, QString *out, int *n);
+    static QString unpackDataMessage(QString const& text);
+};
+
+#endif // VARICODE_H

wsjtx.pro

@@ -67,7 +67,8 @@ SOURCES += \
   echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
   WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
   MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
-  EqualizationToolsDialog.cpp
+  EqualizationToolsDialog.cpp \
+    varicode.cpp
 
 HEADERS  += qt_helpers.hpp \
   pimpl_h.hpp pimpl_impl.hpp \
@@ -84,7 +85,10 @@ HEADERS  += qt_helpers.hpp \
   messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
   WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \
   IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp \
-    qorderedmap.h
+    qorderedmap.h \
+    varicode.h \
+    qpriorityqueue.h \
+    crc.h
 
 
 INCLUDEPATH += qmake_only