Bump to v0.10.1

Configuration.cpp

@@ -642,7 +642,7 @@ private:
   bool insert_blank_;
   bool DXCC_;
   bool ppfx_;
-  bool clear_DX_;
+  bool clear_callsign_;
   bool miles_;
   bool quick_call_;
   bool disable_TX_on_73_;
@@ -773,7 +773,7 @@ bool Configuration::prompt_to_log () const {return m_->prompt_to_log_;}
 bool Configuration::insert_blank () const {return m_->insert_blank_;}
 bool Configuration::DXCC () const {return m_->DXCC_;}
 bool Configuration::ppfx() const {return m_->ppfx_;}
-bool Configuration::clear_DX () const {return m_->clear_DX_;}
+bool Configuration::clear_callsign () const {return m_->clear_callsign_;}
 bool Configuration::miles () const {return m_->miles_;}
 bool Configuration::quick_call () const {return m_->quick_call_;}
 bool Configuration::disable_TX_on_73 () const {return m_->disable_TX_on_73_;}
@@ -945,6 +945,20 @@ QSet<QString> Configuration::my_groups() const {
     return QSet<QString>::fromList(m_->my_groups_);
 }
 
+void Configuration::addGroup(QString const &group){
+    QSet<QString> groups = my_groups();
+    groups.insert(group.trimmed());
+    m_->my_groups_ = groups.toList();
+    m_->write_settings();
+}
+
+void Configuration::removeGroup(QString const &group){
+    QSet<QString> groups = my_groups();
+    groups.remove(group.trimmed());
+    m_->my_groups_ = groups.toList();
+    m_->write_settings();
+}
+
 QString Configuration::my_qth() const
 {
     return m_->my_qth_.trimmed();
@@ -1353,7 +1367,7 @@ void Configuration::impl::initialize_models ()
   ui_->stations_table_view->setEnabled(ui_->auto_switch_bands_check_box->isChecked());
   ui_->report_in_comments_check_box->setChecked (report_in_comments_);
   ui_->prompt_to_log_check_box->setChecked (prompt_to_log_);
-  ui_->clear_DX_check_box->setChecked (clear_DX_);
+  ui_->clear_callsign_check_box->setChecked (clear_callsign_);
   ui_->miles_check_box->setChecked (miles_);
   ui_->quick_call_check_box->setChecked (quick_call_);
   ui_->disable_TX_on_73_check_box->setChecked (disable_TX_on_73_);
@@ -1663,7 +1677,7 @@ void Configuration::impl::read_settings ()
   insert_blank_ = settings_->value ("InsertBlank", false).toBool ();
   DXCC_ = settings_->value ("DXCCEntity", false).toBool ();
   ppfx_ = settings_->value ("PrincipalPrefix", false).toBool ();
-  clear_DX_ = settings_->value ("ClearCallGrid", false).toBool ();
+  clear_callsign_ = settings_->value ("ClearCallGrid", false).toBool ();
   miles_ = settings_->value ("Miles", false).toBool ();
   quick_call_ = settings_->value ("QuickCall", false).toBool ();
   disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool ();
@@ -1798,7 +1812,7 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("InsertBlank", insert_blank_);
   settings_->setValue ("DXCCEntity", DXCC_);
   settings_->setValue ("PrincipalPrefix", ppfx_);
-  settings_->setValue ("ClearCallGrid", clear_DX_);
+  settings_->setValue ("ClearCallGrid", clear_callsign_);
   settings_->setValue ("Miles", miles_);
   settings_->setValue ("QuickCall", quick_call_);
   settings_->setValue ("73TxDisable", disable_TX_on_73_);
@@ -2283,7 +2297,7 @@ void Configuration::impl::accept ()
   log_as_DATA_ = ui_->log_as_RTTY_check_box->isChecked ();
   report_in_comments_ = ui_->report_in_comments_check_box->isChecked ();
   prompt_to_log_ = ui_->prompt_to_log_check_box->isChecked ();
-  clear_DX_ = ui_->clear_DX_check_box->isChecked ();
+  clear_callsign_ = ui_->clear_callsign_check_box->isChecked ();
   miles_ = ui_->miles_check_box->isChecked ();
   quick_call_ = ui_->quick_call_check_box->isChecked ();
   disable_TX_on_73_ = ui_->disable_TX_on_73_check_box->isChecked ();

Configuration.hpp

@@ -99,6 +99,8 @@ public:
   QString my_grid () const;
   QString my_station () const;
   QSet<QString> my_groups() const;
+  void addGroup(QString const &group);
+  void removeGroup(QString const &group);
   int activity_aging() const;
   int callsign_aging() const;
   QString my_qth () const;
@@ -131,7 +133,7 @@ public:
   bool insert_blank () const;
   bool DXCC () const;
   bool ppfx() const;
-  bool clear_DX () const;
+  bool clear_callsign () const;
   bool miles () const;
   bool quick_call () const;
   bool disable_TX_on_73 () const;

Configuration.ui

@@ -23,7 +23,7 @@
       <string>Select tab to change configuration parameters.</string>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="general_tab">
       <attribute name="title">
@@ -279,8 +279,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>724</width>
-                <height>473</height>
+                <width>654</width>
+                <height>489</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_26">
@@ -632,11 +632,65 @@ text message.</string>
                 </widget>
                </item>
                <item>
-                <widget class="QGroupBox" name="groupBox_12">
+                <widget class="QGroupBox" name="groupBox_8">
+                 <property name="title">
+                  <string>Idle Watchdog</string>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_32">
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_12">
+                    <item>
+                     <widget class="QLabel" name="label_10">
+                      <property name="text">
+                       <string>Disable automatic transmissions:</string>
+                      </property>
+                      <property name="buddy">
+                       <cstring>tx_watchdog_spin_box</cstring>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QSpinBox" name="tx_watchdog_spin_box">
+                      <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 of inactivity</string>
+                      </property>
+                      <property name="prefix">
+                       <string>after </string>
+                      </property>
+                      <property name="minimum">
+                       <number>0</number>
+                      </property>
+                      <property name="maximum">
+                       <number>1440</number>
+                      </property>
+                      <property name="singleStep">
+                       <number>1</number>
+                      </property>
+                      <property name="value">
+                       <number>60</number>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <widget class="QGroupBox" name="heartbeatGroupBox">
+                 <property name="visible">
+                  <bool>false</bool>
+                 </property>
                  <property name="title">
                   <string>Heartbeat (HB)</string>
                  </property>
-                 <layout class="QVBoxLayout" name="verticalLayout_21">
+                 <layout class="QVBoxLayout" name="verticalLayout_211">
                   <item>
                    <widget class="QCheckBox" name="heartbeat_anywhere_check_box">
                     <property name="text">
@@ -644,10 +698,38 @@ text message.</string>
                     </property>
                    </widget>
                   </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <spacer name="verticalSpacer_5">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QGroupBox" name="heartbeatGroupBoxOld">
+                 <property name="visible">
+                  <bool>false</bool>
+                 </property>
+                 <property name="title">
+                  <string>Heartbeat (HB)</string>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_21">
                   <item>
                    <layout class="QHBoxLayout" name="horizontalLayout_15">
                     <item>
                      <widget class="QLabel" name="ping_label_10">
+                      <property name="visible">
+                       <bool>false</bool>
+                      </property>
                       <property name="text">
                        <string>Heartbeat interval:</string>
                       </property>
@@ -655,6 +737,9 @@ text message.</string>
                     </item>
                     <item>
                      <widget class="QSpinBox" name="heartbeat_spin_box">
+                      <property name="visible">
+                       <bool>false</bool>
+                      </property>
                       <property name="toolTip">
                        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes between unattended heartbeat transmissions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                       </property>
@@ -684,46 +769,17 @@ text message.</string>
                    </layout>
                   </item>
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_12">
-                    <item>
-                     <widget class="QLabel" name="label_10">
-                      <property name="text">
-                       <string>Heartbeat idle watchdog timer:</string>
-                      </property>
-                      <property name="buddy">
-                       <cstring>tx_watchdog_spin_box</cstring>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QSpinBox" name="tx_watchdog_spin_box">
-                      <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>
-                      <property name="prefix">
-                       <string>after </string>
-                      </property>
-                      <property name="minimum">
-                       <number>0</number>
-                      </property>
-                      <property name="maximum">
-                       <number>1440</number>
-                      </property>
-                      <property name="singleStep">
-                       <number>1</number>
-                      </property>
-                      <property name="value">
-                       <number>60</number>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
+                   <spacer name="verticalSpacer_2">
+                    <property name="orientation">
+                     <enum>Qt::Vertical</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>20</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
                   </item>
                  </layout>
                 </widget>
@@ -1975,7 +2031,7 @@ both here.</string>
             <x>0</x>
             <y>0</y>
             <width>746</width>
-            <height>519</height>
+            <height>554</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_30">
@@ -2022,20 +2078,19 @@ both here.</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="1">
-                 <widget class="QCheckBox" name="clear_DX_check_box">
+                <item row="1" column="1">
+                 <widget class="QCheckBox" name="clear_callsign_check_box">
                   <property name="enabled">
-                   <bool>false</bool>
+                   <bool>true</bool>
                   </property>
                   <property name="visible">
-                   <bool>false</bool>
+                   <bool>true</bool>
                   </property>
                   <property name="toolTip">
-                   <string>Check this option to force the clearing of the DX Call
-and DX Grid fields when a 73 or free text message is sent.</string>
+                   <string>Check this option to force deselect callsign after logging.</string>
                   </property>
                   <property name="text">
-                   <string>Clear &amp;DX call and grid after logging</string>
+                   <string>Deselect callsign after logging</string>
                   </property>
                  </widget>
                 </item>
@@ -2056,7 +2111,7 @@ and DX Grid fields when a 73 or free text message is sent.</string>
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1">
+                <item row="2" column="1">
                  <widget class="QCheckBox" name="report_in_comments_check_box">
                   <property name="enabled">
                    <bool>false</bool>
@@ -2373,6 +2428,19 @@ for assessing propagation and system performance.</string>
              </layout>
             </widget>
            </item>
+           <item>
+            <spacer name="verticalSpacer_7">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item>
             <spacer name="verticalSpacer_4">
              <property name="orientation">
@@ -3999,12 +4067,12 @@ soundcard changes</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="CAT_handshake_button_group"/>
   <buttongroup name="PTT_method_button_group"/>
   <buttongroup name="CAT_data_bits_button_group"/>
-  <buttongroup name="CAT_stop_bits_button_group"/>
-  <buttongroup name="split_mode_button_group"/>
   <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="CAT_handshake_button_group"/>
+  <buttongroup name="CAT_stop_bits_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 9)
-set (WSJTX_VERSION_PATCH 0)
+set (WSJTX_VERSION_MINOR 10)
+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

@@ -126,7 +126,7 @@ bool DecodedText::tryUnpackHeartbeat(){
 
     // Heartbeat Alt Type
     // ---------------
-    // 1      0   BCN
+    // 1      0   HB
     // 1      1   CQ
     isHeartbeat_ = true;
     isAlt_ = isAlt;
@@ -140,7 +140,7 @@ bool DecodedText::tryUnpackHeartbeat(){
         cmp.append(parts.at(1));
     }
     compound_ = cmp.join("/");
-    message_ = QString("%1: %2 %3 ").arg(compound_).arg(isAlt ? Varicode::cqString(bits3) : "HEARTBEAT").arg(extra_);
+    message_ = QString("%1: %2 %3 ").arg(compound_).arg(isAlt ? Varicode::cqString(bits3) : Varicode::hbString(bits3)).arg(extra_);
     frameType_ = type;
     return true;
 }

logbook/adif.cpp

@@ -100,6 +100,7 @@ void ADIF::load()
           add (extractField (record, "CALL")
                , extractField (record, "BAND")
                , extractField (record, "MODE")
+               , extractField (record, "SUBMODE")
                , extractField (record, "QSO_DATE"));
         }
         inputFile.close ();
@@ -107,12 +108,13 @@ void ADIF::load()
 }
 
 
-void ADIF::add(QString const& call, QString const& band, QString const& mode, QString const& date)
+void ADIF::add(QString const& call, QString const& band, QString const& mode, QString const& submode, QString const& date)
 {
     QSO q;
     q.call = call;
     q.band = band;
     q.mode = mode;
+    q.submode = submode;
     q.date = date;
     if (q.call.size ())
       {
@@ -121,8 +123,8 @@ void ADIF::add(QString const& call, QString const& band, QString const& mode, QS
       }
 }
 
-// return true if in the log same band and mode (where JT65 == JT9)
-bool ADIF::match(QString const& call, QString const& band, QString const& mode) const
+// return true if in the log same band
+bool ADIF::match(QString const& call, QString const& band) const
 {
     QList<QSO> qsos = _data.values(call);
     if (qsos.size()>0)
@@ -134,22 +136,6 @@ bool ADIF::match(QString const& call, QString const& band, QString const& mode)
                   || (band=="")
                   || (q.band==""))
             {
-                if (
-                     (
-                       ((mode.compare("JT65",Qt::CaseInsensitive)==0) ||
-                        (mode.compare("JT9",Qt::CaseInsensitive)==0)  ||
-                        (mode.compare("JS8",Qt::CaseInsensitive)==0)  ||
-                        (mode.compare("FT8",Qt::CaseInsensitive)==0))
-                       &&
-                       ((q.mode.compare("JT65",Qt::CaseInsensitive)==0) ||
-                        (q.mode.compare("JT9",Qt::CaseInsensitive)==0)  ||
-                        (q.mode.compare("JS8",Qt::CaseInsensitive)==0)  ||
-                        (q.mode.compare("FT8",Qt::CaseInsensitive)==0))
-                     )
-                        || (mode.compare(q.mode,Qt::CaseInsensitive)==0)
-                        || (mode=="")
-                        || (q.mode=="")
-                    )
                 return true;
             }
         }
@@ -176,7 +162,7 @@ int ADIF::getCount() const
     return _data.size();
 }   
     
-QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QString const& mode
+QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QString const& mode, QString const& submode
                            , QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn
                            , QDateTime const& dateTimeOff, QString const& band, QString const& comments
                            , QString const& name, QString const& strDialFreq, QString const& m_myCall
@@ -186,6 +172,9 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
   t = "<call:" + QString::number(hisCall.length()) + ">" + hisCall;
   t += " <gridsquare:" + QString::number(hisGrid.length()) + ">" + hisGrid;
   t += " <mode:" + QString::number(mode.length()) + ">" + mode;
+  if(!submode.isEmpty()){
+    t += " <submode:" + QString::number(submode.length()) + ">" + submode;
+  }
   t += " <rst_sent:" + QString::number(rptSent.length()) + ">" + rptSent;
   t += " <rst_rcvd:" + QString::number(rptRcvd.length()) + ">" + rptRcvd;
   t += " <qso_date:8>" + dateTimeOn.date().toString("yyyyMMdd");

logbook/adif.h

@@ -23,15 +23,15 @@ class ADIF
 	public:
 	void init(QString const& filename);
 	void load();
-	void add(QString const& call, QString const& band, QString const& mode, QString const& date);
-	bool match(QString const& call, QString const& band, QString const& mode) const;
+    void add(QString const& call, QString const& band, QString const& mode, const QString &submode, QString const& date);
+    bool match(QString const& call, QString const& band) const;
 	QList<QString> getCallList() const;
 	int getCount() const;
 		
         // open ADIF file and append the QSO details. Return true on success
 	bool addQSOToFile(QByteArray const& ADIF_record);
 
-  QByteArray QSOToADIF(QString const& hisCall, QString const& hisGrid, QString const& mode, QString const& rptSent
+  QByteArray QSOToADIF(QString const& hisCall, QString const& hisGrid, QString const& mode, QString const& submode, QString const& rptSent
 											 , QString const& rptRcvd, QDateTime const& dateTimeOn, QDateTime const& dateTimeOff
 											 , QString const& band, QString const& comments, QString const& name
 											 , QString const& strDialFreq, QString const& m_myCall, QString const& m_myGrid
@@ -41,7 +41,7 @@ class ADIF
 private:
 		struct QSO
 		{
-		  QString call,band,mode,date;
+          QString call,band,mode,submode,date;
 		};		  
 
 		QMultiHash<QString, QSO> _data;

logbook/logbook.cpp

@@ -50,8 +50,8 @@ void LogBook::_setAlreadyWorkedFromLog()
     }
 }
 
-bool LogBook::hasWorkedBefore(const QString &call, const QString &band, const QString &mode){
-    return _log.match(call, band, mode);
+bool LogBook::hasWorkedBefore(const QString &call, const QString &band){
+    return _log.match(call, band);
 }
 
 void LogBook::match(/*in*/const QString call,
@@ -61,9 +61,8 @@ void LogBook::match(/*in*/const QString call,
 {
   if (call.length() > 0)
     {
-      QString currentMode = "";  // match any mode
       QString currentBand = "";  // match any band
-      callWorkedBefore = _log.match(call,currentBand,currentMode);
+      callWorkedBefore = _log.match(call,currentBand);
       countryName = _countries.find(call);
 
       if (countryName.length() > 0)  //  country was found
@@ -76,9 +75,9 @@ void LogBook::match(/*in*/const QString call,
     }
 }
 
-void LogBook::addAsWorked(const QString call, const QString band, const QString mode, const QString date)
+void LogBook::addAsWorked(const QString call, const QString band, const QString mode, const QString submode, const QString date)
 {
-  _log.add(call,band,mode,date);
+  _log.add(call,band,mode,submode,date);
   QString countryName = _countries.find(call);
   if (countryName.length() > 0)
     _worked.setAsWorked(countryName);

logbook/logbook.h

@@ -20,12 +20,12 @@ class LogBook
 {
 public:
     void init();
-    bool hasWorkedBefore(const QString &call, const QString &band, const QString &mode);
+    bool hasWorkedBefore(const QString &call, const QString &band);
     void match(/*in*/ const QString call,
               /*out*/ QString &countryName,
                       bool &callWorkedBefore,
                       bool &countryWorkedBefore) const;
-    void addAsWorked(const QString call, const QString band, const QString mode, const QString date);
+    void addAsWorked(const QString call, const QString band, const QString mode, const QString submode, const QString date);
 
 private:
    CountryDat _countries;

logqso.cpp

@@ -95,12 +95,16 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString
 
 void LogQSO::accept()
 {
-  QString hisCall,hisGrid,mode,rptSent,rptRcvd,dateOn,dateOff,timeOn,timeOff,band,operator_call;
+  QString hisCall,hisGrid,mode,submode,rptSent,rptRcvd,dateOn,dateOff,timeOn,timeOff,band,operator_call;
   QString comments,name;
 
   hisCall=ui->call->text().toUpper();
   hisGrid=ui->grid->text().toUpper();
-  mode=ui->mode->text().toUpper();
+  mode = ui->mode->text().toUpper();
+  if(mode == "JS8"){
+    mode="MFSK";
+    submode="JS8";
+  }
   rptSent=ui->sent->text();
   rptRcvd=ui->rcvd->text();
   m_dateTimeOn = ui->start_date_time->dateTime ();
@@ -115,10 +119,10 @@ void LogQSO::accept()
   //Log this QSO to ADIF file "js8call_log.adi"
   QString filename = "js8call_log.adi";  // TODO allow user to set
   ADIF adifile;
-  auto adifilePath = QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("js8call_log.adi");
+  auto adifilePath = QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath (filename);
   adifile.init(adifilePath);
 
-  QByteArray ADIF {adifile.QSOToADIF (hisCall, hisGrid, mode, rptSent, rptRcvd, m_dateTimeOn, m_dateTimeOff, band
+  QByteArray ADIF {adifile.QSOToADIF (hisCall, hisGrid, mode, submode, rptSent, rptRcvd, m_dateTimeOn, m_dateTimeOff, band
                                       , comments, name, strDialFreq, m_myCall, m_myGrid, m_txPower, operator_call)};
   if (!adifile.addQSOToFile (ADIF))
   {
@@ -148,7 +152,7 @@ void LogQSO::accept()
       m_dateTimeOn.time().toString("hh:mm:ss,") +
       m_dateTimeOff.date().toString("yyyy-MM-dd,") +
       m_dateTimeOff.time().toString("hh:mm:ss,") + hisCall + "," +
-      hisGrid + "," + strDialFreq + "," + mode +
+      hisGrid + "," + strDialFreq + "," + (mode == "MFSK" ? "JS8" : mode) +
       "," + rptSent + "," + rptRcvd + "," + m_txPower +
       "," + comments + "," + name;
     QTextStream out(&f);
@@ -157,7 +161,7 @@ void LogQSO::accept()
   }
 
 //Clean up and finish logging
-  Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, rptSent, rptRcvd, m_txPower, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF);
+  Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, m_txPower, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF);
   QDialog::accept();
 }
 

logqso.h

@@ -40,7 +40,7 @@ public slots:
 
 signals:
   void acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid
-                  , Radio::Frequency dial_freq, QString const& mode
+                  , Radio::Frequency dial_freq, QString const& mode, QString const& submode
                   , QString const& rpt_sent, QString const& rpt_received
                   , QString const& tx_power, QString const& comments
                   , QString const& name, QDateTime const& QSO_date_on,  QString const& operator_call

logqso.ui

@@ -152,6 +152,9 @@
            <height>16777215</height>
           </size>
          </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>

mainwindow.h

@@ -173,10 +173,11 @@ private slots:
   void on_tx6_editingFinished();
   void on_menuControl_aboutToShow();
   void on_actionEnable_Spotting_toggled(bool checked);
+  void on_actionEnable_Active_toggled(bool checked);
   void on_actionEnable_Auto_Reply_toggled(bool checked);
-  void on_actionEnable_Heartbeat_toggled(bool checked);
   void on_actionEnable_Selcall_toggled(bool checked);
   void on_menuWindow_aboutToShow();
+  void on_actionShow_Fullscreen_triggered(bool checked);
   void on_actionShow_Frequency_Clock_triggered(bool checked);
   void on_actionShow_Band_Activity_triggered(bool checked);
   void on_actionShow_Call_Activity_triggered(bool checked);
@@ -273,6 +274,14 @@ private slots:
   void on_rbGenMsg_clicked(bool checked);
   void on_rbFreeText_clicked(bool checked);
   void on_clearAction_triggered(QObject * sender);
+  void buildHeartbeatMenu(QMenu *menu);
+  void buildCQMenu(QMenu *menu);
+  void buildRepeatMenu(QMenu *menu, QPushButton * button, int * interval);
+  void sendHeartbeat();
+  void on_hbMacroButton_toggled(bool checked);
+  void on_hbMacroButton_clicked();
+  void sendCQ(bool repeat=false);
+  void on_cqMacroButton_toggled(bool checked);
   void on_cqMacroButton_clicked();
   void on_replyMacroButton_clicked();
   void on_snrMacroButton_clicked();
@@ -310,11 +319,7 @@ private slots:
   bool prepareNextMessageFrame();
   bool isFreqOffsetFree(int f, int bw);
   int findFreeFreqOffset(int fmin, int fmax, int bw);
-  void scheduleHeartbeat(bool first=false);
-  void pauseHeartbeat();
-  void unpauseHeartbeat();
-  void checkHeartbeat();
-  void prepareHeartbeat();
+  void checkRepeat();
   QString calculateDistance(QString const& grid, int *pDistance=nullptr, int *pAzimuth=nullptr);
   void on_driftSpinBox_valueChanged(int n);
   void on_driftSyncButton_clicked();
@@ -326,10 +331,8 @@ private slots:
   void on_tuneButton_clicked (bool);
   void on_pbR2T_clicked();
   void on_pbT2R_clicked();
-  void on_heartbeatButton_clicked();
-  void on_selcalButton_clicked();
   void acceptQSO (QDateTime const&, QString const& call, QString const& grid
-                  , Frequency dial_freq, QString const& mode
+                  , Frequency dial_freq, QString const& mode, QString const& submode
                   , QString const& rpt_sent, QString const& rpt_received
                   , QString const& tx_power, QString const& comments
                   , QString const& name, QDateTime const& QSO_date_on, QString const& operator_call
@@ -356,7 +359,7 @@ private slots:
   void on_selcalButton_toggled(bool checked);
   void on_tuneButton_toggled(bool checked);
   void on_spotButton_toggled(bool checked);
-  void on_heartbeatButton_toggled(bool checked);
+  void on_activeButton_toggled(bool checked);
 
   void on_actionMessage_averaging_triggered();
   void on_actionFox_Log_triggered();
@@ -664,7 +667,7 @@ private:
   QTimer minuteTimer;
   QTimer splashTimer;
   QTimer p1Timer;
-  QTimer heartbeatTimer;
+  QTimer repeatTimer;
 
   QString m_path;
   QString m_baseCall;
@@ -834,9 +837,11 @@ private:
   QQueue<QString> m_foxQSOinProgress;  //QSOs in progress: Fox has sent a report
   QQueue<qint64>  m_foxRateQueue;
 
-  bool m_nextHeartbeatQueued = false;
-  bool m_nextHeartPaused = false;
+  bool m_hbHidden;
+  int m_hbInterval;
+  int m_cqInterval;
   QDateTime m_nextHeartbeat;
+  QDateTime m_nextCQ;
   QDateTime m_dateTimeQSOOn;
   QDateTime m_dateTimeLastTX;
 
@@ -863,7 +868,6 @@ private:
   double m_toneSpacing;
   int m_firstDecode;
   QProgressDialog m_optimizingProgress;
-  QTimer m_heartbeat;
   MessageClient * m_messageClient;
   PSK_Reporter *psk_Reporter;
   APRSISClient * m_aprsClient;
@@ -902,6 +906,7 @@ private:
   void postDecode (bool is_new, QString const& message);
   void displayTransmit();
   void updateButtonDisplay();
+  void updateRepeatButtonDisplay();
   void updateTextDisplay();
   void updateFrameCountEstimate(int count);
   void updateTextStatsDisplay(QString text, int count);
@@ -950,6 +955,10 @@ private:
                           , QString const& his_call
                           , QString const& his_grid) const;
   void read_wav_file (QString const& fname);
+  QDateTime nextTransmitCycle();
+  void resetAutomaticIntervalTransmissions(bool stopCQ, bool stopHB);
+  void resetCQTimer(bool stop);
+  void resetHeartbeatTimer(bool stop);
   void decodeDone ();
   void subProcessFailed (QProcess *, int exit_code, QProcess::ExitStatus);
   void subProcessError (QProcess *, QProcess::ProcessError);

mainwindow.ui

@@ -359,7 +359,7 @@ QPushButton[oob="true"] {
 </string>
                 </property>
                 <property name="text">
-                 <string/>
+                 <string>Callsign</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
@@ -411,29 +411,6 @@ color : white;
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QLabel" name="labHeartbeat">
-                <property name="styleSheet">
-                 <string notr="true">QLabel {
-font-family: MS Shell Dlg 2;
-font-size: 11pt;
-color : white;
-}</string>
-                </property>
-                <property name="text">
-                 <string>Next Heartbeat: disabled</string>
-                </property>
-                <property name="textFormat">
-                 <enum>Qt::RichText</enum>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>5</number>
-                </property>
-               </widget>
-              </item>
               <item>
                <spacer name="verticalSpacer">
                 <property name="orientation">
@@ -499,7 +476,7 @@ QPushButton:checked {
              <property name="frameShadow">
               <enum>QFrame::Plain</enum>
              </property>
-             <layout class="QGridLayout" name="gridLayout_8" columnstretch="1,1,1,1,0" columnminimumwidth="75,75,75,75,0">
+             <layout class="QGridLayout" name="gridLayout_8" columnstretch="1,1,1,1" columnminimumwidth="75,75,75,75">
               <property name="sizeConstraint">
                <enum>QLayout::SetMinimumSize</enum>
               </property>
@@ -573,43 +550,6 @@ QPushButton:checked {
                 </property>
                </widget>
               </item>
-              <item row="1" column="4">
-               <widget class="QPushButton" name="activeButton">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="visible">
-                 <bool>false</bool>
-                </property>
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable or disable automatic station replies to directed queries&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <property name="text">
-                 <string>ACTIVE</string>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
               <item row="1" column="0">
                <widget class="QPushButton" name="monitorButton">
                 <property name="enabled">
@@ -776,7 +716,7 @@ QPushButton:checked {
                </widget>
               </item>
               <item row="2" column="1">
-               <widget class="QPushButton" name="heartbeatButton">
+               <widget class="QPushButton" name="activeButton">
                 <property name="enabled">
                  <bool>true</bool>
                 </property>
@@ -804,7 +744,7 @@ QPushButton:checked {
                  </font>
                 </property>
                 <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable or disable the automatic heartbeat transmission&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Register your station as active or idle&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="styleSheet">
                  <string notr="true">QPushButton {
@@ -820,7 +760,7 @@ QPushButton:checked {
 }</string>
                 </property>
                 <property name="text">
-                 <string>HB</string>
+                 <string>ACTIVE</string>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -1361,192 +1301,7 @@ QTextEdit[transmitting=&quot;true&quot;] {
         <property name="bottomMargin">
          <number>0</number>
         </property>
-        <item row="1" column="11">
-         <widget class="QPushButton" name="queryButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send a directed message to another station&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>Directed</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="16">
-         <widget class="QPushButton" name="stopTxButton">
-          <property name="minimumSize">
-           <size>
-            <width>75</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stop transmitting&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>Halt</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="14">
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Preferred</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>10</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="5">
-         <widget class="QPushButton" name="qtcMacroButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send your station message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>QTC</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="QPushButton" name="snrMacroButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send an SNR message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>SNR</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="7">
-         <spacer name="horizontalSpacer_8">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Preferred</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>10</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="2">
-         <widget class="QPushButton" name="replyMacroButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reply to a CQ&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>Reply</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="6">
-         <widget class="QPushButton" name="macrosMacroButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send a saved message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>Saved</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="12">
-         <widget class="QPushButton" name="deselectButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Deselect the current callsign for directed messaging&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>Deselect</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="4">
-         <widget class="QPushButton" name="qthMacroButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send your station location message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>QTH</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QPushButton" name="cqMacroButton">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send a CQ message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>CQ</string>
-          </property>
-          <property name="flat">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="15">
          <widget class="QPushButton" name="startTxButton">
           <property name="enabled">
            <bool>false</bool>
@@ -1578,6 +1333,225 @@ color:#555;
           </property>
          </widget>
         </item>
+        <item row="1" column="17">
+         <widget class="QPushButton" name="stopTxButton">
+          <property name="minimumSize">
+           <size>
+            <width>75</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stop transmitting&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>Halt</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="15">
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>10</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="5">
+         <widget class="QPushButton" name="qthMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send your station location message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>QTH</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="13">
+         <widget class="QPushButton" name="deselectButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Deselect the current callsign for directed messaging&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>Deselect</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="QPushButton" name="snrMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send an SNR message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>SNR</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="8">
+         <spacer name="horizontalSpacer_8">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>10</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="3">
+         <widget class="QPushButton" name="replyMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reply to a CQ&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>Reply</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QPushButton" name="cqMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send a CQ message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QPushButton:checked { 
+  font-weight:bold;
+  color:black;
+}</string>
+          </property>
+          <property name="text">
+           <string>CQ</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="6">
+         <widget class="QPushButton" name="qtcMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send your station message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>QTC</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="7">
+         <widget class="QPushButton" name="macrosMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send a saved message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>Saved</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="12">
+         <widget class="QPushButton" name="queryButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send a directed message to another station&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>Directed</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QPushButton" name="hbMacroButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>30</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Send a Heartbeat message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QPushButton:checked { 
+  font-weight:bold;
+  color:black;
+}</string>
+          </property>
+          <property name="text">
+           <string>HB</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
       <widget class="QFrame" name="frame_5">
@@ -4723,7 +4697,6 @@ list. The list can be maintained in Settings (F2).</string>
     <property name="title">
      <string>&amp;View</string>
     </property>
-    <addaction name="actionShow_Tooltips"/>
     <addaction name="actionShow_Frequency_Clock"/>
     <addaction name="separator"/>
     <addaction name="actionShow_Band_Activity"/>
@@ -4738,6 +4711,8 @@ list. The list can be maintained in Settings (F2).</string>
     <addaction name="actionShow_Waterfall_Controls"/>
     <addaction name="actionShow_Time_Drift_Controls"/>
     <addaction name="separator"/>
+    <addaction name="actionShow_Fullscreen"/>
+    <addaction name="actionShow_Tooltips"/>
     <addaction name="actionReset_Window_Sizes"/>
    </widget>
    <widget class="QMenu" name="menu_Log">
@@ -4756,9 +4731,12 @@ list. The list can be maintained in Settings (F2).</string>
      <string>C&amp;ontrol</string>
     </property>
     <addaction name="actionEnable_Spotting"/>
-    <addaction name="actionEnable_Heartbeat"/>
+    <addaction name="actionEnable_Active"/>
     <addaction name="actionEnable_Auto_Reply"/>
     <addaction name="actionEnable_Selcall"/>
+    <addaction name="separator"/>
+    <addaction name="actionHeartbeat"/>
+    <addaction name="actionCQ"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuConfig"/>
@@ -5577,12 +5555,12 @@ list. The list can be maintained in Settings (F2).</string>
     <string>Enable Spotting</string>
    </property>
   </action>
-  <action name="actionEnable_Heartbeat">
+  <action name="actionEnable_Active">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Enable Heartbeat</string>
+    <string>Enable Active</string>
    </property>
   </action>
   <action name="actionEnable_Auto_Reply">
@@ -5601,6 +5579,27 @@ list. The list can be maintained in Settings (F2).</string>
     <string>Enable Selective Calling</string>
    </property>
   </action>
+  <action name="actionShow_Fullscreen">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Fullscreen</string>
+   </property>
+   <property name="shortcut">
+    <string>F11</string>
+   </property>
+  </action>
+  <action name="actionHeartbeat">
+   <property name="text">
+    <string>Heartbeat...</string>
+   </property>
+  </action>
+  <action name="actionCQ">
+   <property name="text">
+    <string>CQ...</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

varicode.cpp

@@ -27,6 +27,7 @@
 
 #include "varicode.h"
 #include "jsc.h"
+#include "decodedtext.h"
 
 #include <cmath>
 
@@ -54,26 +55,29 @@ QMap<QString, int> directed_cmds = {
     {" QTC?",     2  }, // query station message
     {"&",         2  }, // compat
 
+    //{"$",       3  }, // unused
+
     {" GRID?",    4  }, // query grid
     {"^",         4  }, // compat
 
+    {">",         5  }, // relay message
+
     {" STATUS?",  6  }, // query idle message
     {"*",         6  }, // compat
 
-    {">",     5  }, // relay message
-    {"#",     8  }, // all or nothing message
+    //{"!",       7  }, // unused
 
-    //{"!",     7  }, // alert message
-    //{"$",     3  }, // query station(s) heard
+    {"#",         8  }, // all or nothing message
 
-    {" TU",     9  }, // thank you
+    {" TU",       9  }, // thank you
 
-    {" ACTIVE",     10 }, // i have been active in the past 10 minutes
-    {" IDLE",       11 }, // i have not been active in the past 10 minutes
+    {" ACTIVE",     10 }, // i am active
+    {" IDLE",       11 }, // i am idle
 
-    {" HEARTBEAT",     -1 }, // this is my ping (unused except for faux processing of pings as directed commands)
-    {" HEARTBEAT ACK", 12 }, // i acknowledge your ping at this SNR
-    {" HEARTBEAT REQ", 13 }, // can you transmit a ping to callsign?
+    {" HB",     -1 }, // this is my heartbeat (unused except for faux processing of HBs as directed commands)
+    {" HB ACK", 12 }, // (unused, but a compatibility display)
+
+    {" QUERY",   13 }, // can you transmit a ping to callsign?
 
     {" APRS:",   14  }, // send an aprs packet
 
@@ -101,7 +105,7 @@ QSet<int> allowed_cmds = {-1, 0, 1, 2, 3, 4, 5, 6, /*7,*/ 8, 9, 10, 11, 12, 13,
 
 QSet<int> buffered_cmds = {3, 5, /*6,*/ /*7,*/ 8, 13, 14, 15};
 
-QSet<int> snr_cmds = {12, 25};
+QSet<int> snr_cmds = {25, 29};
 
 QMap<int, int> checksum_cmds = {
     {  5, 16 },
@@ -112,17 +116,17 @@ QMap<int, int> checksum_cmds = {
 };
 
 QString callsign_pattern = QString("(?<callsign>[@]?[A-Z0-9/]+)");
-QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:HEARTBEAT (ACK|REQ)|AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|QRZ[?]|SNR[?]|QTC[?]|QTH[?]|GRID[?]|STATUS[?]|(?:(?:ACK|73|YES|NO|SNR|QSL|RR|SK|FB|QTH|QTC|GRID|ACTIVE|IDLE|TU)(?=[ ]|$))|[?*^&@#> ]))?");
+QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|QRZ[?]|SNR[?]|QTC[?]|QTH[?]|GRID[?]|STATUS[?]|(?:(?:QUERY|ACK|73|YES|NO|SNR|QSL|RR|SK|FB|QTH|QTC|GRID|ACTIVE|IDLE|TU)(?=[ ]|$))|[?*^&@#> ]))?");
 QString optional_grid_pattern = QString("(?<grid>\\s?[A-R]{2}[0-9]{2})?");
 QString optional_extended_grid_pattern = QString("^(?<grid>\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?");
-QString optional_num_pattern = QString("(?<num>(?<=SNR|HEARTBEAT ACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");
+QString optional_num_pattern = QString("(?<num>(?<=SNR|ACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");
 
 QRegularExpression directed_re("^"                    +
                                callsign_pattern       +
                                optional_cmd_pattern   +
                                optional_num_pattern);
 
-QRegularExpression heartbeat_re(R"(^\s*(?<type>CQCQCQ|CQ QRPP?|CQ DX|CQ TEST|CQ( CQ){0,2}|HEARTBEAT)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
+QRegularExpression heartbeat_re(R"(^\s*(?<type>CQCQCQ|CQ QRPP?|CQ DX|CQ TEST|CQ( CQ){0,2}|HB (ACTIVE|IDLE))(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
 
 QRegularExpression compound_re("^\\s*[`]"              +
                                callsign_pattern        +
@@ -204,6 +208,12 @@ QMap<quint32, QString> cqs = {
     { 7, "CQ CQ CQ"},
 };
 
+QMap<quint32, QString> hbs = {
+    { 0, "HB ACTIVE"    },
+    { 1, "HB IDLE"  },
+};
+
+
 QMap<int, int> dbm2mw = {
     {0  , 1},       //   1mW
     {3  , 2},       //   2mW
@@ -290,6 +300,13 @@ QString Varicode::cqString(int number){
     return cqs[number];
 }
 
+QString Varicode::hbString(int number){
+    if(!hbs.contains(number)){
+        return QString{};
+    }
+    return hbs[number];
+}
+
 bool Varicode::startsWithCQ(QString text){
     foreach(auto cq, cqs.values()){
         if(text.startsWith(cq)){
@@ -299,6 +316,15 @@ bool Varicode::startsWithCQ(QString text){
     return false;
 }
 
+bool Varicode::startsWithHB(QString text){
+    foreach(auto cq, hbs.values()){
+        if(text.startsWith(cq)){
+            return true;
+        }
+    }
+    return false;
+}
+
 QString Varicode::formatSNR(int snr){
     if(snr < -60 || snr > 60){
         return QString();
@@ -992,7 +1018,7 @@ quint8 Varicode::packCmd(quint8 cmd, quint8 num, bool *pPackedNum){
         // [1][X][6]
         // X = 0 == SNR
         // X = 1 == ACK
-        value = ((1 << 1) | (int)(cmdStr == " HEARTBEAT ACK")) << 6;
+        value = ((1 << 1) | (int)(cmdStr == " ACK")) << 6;
         value = value + (num & ((1<<6)-1));
         if(pPackedNum) *pPackedNum = true;
     } else {
@@ -1010,7 +1036,7 @@ quint8 Varicode::unpackCmd(quint8 value, quint8 *pNum){
 
         auto cmd = directed_cmds[" SNR"];
         if(value & (1<<6)){
-            cmd = directed_cmds[" HEARTBEAT ACK"];
+            cmd = directed_cmds[" ACK"];
         }
         return cmd;
     } else {
@@ -1119,7 +1145,8 @@ bool Varicode::isCompoundCallsign(const QString &callsign){
 // CQCQCQ EM73
 // CQ DX EM73
 // CQ QRP EM73
-// HEARTBEAT EM73
+// HB ACTIVE EM73
+// HB IDLE EM73
 QString Varicode::packHeartbeatMessage(QString const &text, const QString &callsign, int *n){
     QString frame;
 
@@ -1133,8 +1160,8 @@ QString Varicode::packHeartbeatMessage(QString const &text, const QString &calls
 
     // Heartbeat Alt Type
     // ---------------
-    // 1      0   HEARTBEAT
-    // 1      1   CQCQCQ
+    // 1      0   HB
+    // 1      1   CQ
 
     auto type = parsedText.captured("type");
     auto isAlt = type.startsWith("CQ");
@@ -1149,12 +1176,13 @@ QString Varicode::packHeartbeatMessage(QString const &text, const QString &calls
         packed_extra = Varicode::packGrid(extra);
     }
 
+    quint8 cqNumber = hbs.key(type, 0);
+
     if(isAlt){
         packed_extra |= (1<<15);
+        cqNumber = cqs.key(type, 0);
     }
 
-    quint8 cqNumber = cqs.key(type, 0);
-
     frame = packCompoundFrame(callsign, FrameHeartbeat, packed_extra, cqNumber);
     if(frame.isEmpty()){
         if(n) *n = 0;
@@ -1655,9 +1683,9 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
         // and if this isn't a raw message (starting with "`")... then...
         if(!selectedCall.isEmpty() && !line.startsWith(selectedCall) && !line.startsWith("`")){
             bool lineStartsWithBaseCall = (
-                line.startsWith("@ALLCALL") ||
-                line.contains("HEARTBEAT")  ||
-                Varicode::startsWithCQ(line)
+                line.startsWith("@ALLCALL")  ||
+                Varicode::startsWithCQ(line) ||
+                Varicode::startsWithHB(line)
             );
 
 #if AUTO_PREPEND_DIRECTED_ALLOW_TEXT_CALLSIGNS
@@ -1865,12 +1893,15 @@ void BuildMessageFramesThread::run(){
         m_text
     );
 
-    QList<QString> frames;
-    QList<int> bits;
-    foreach(auto pair, results){
-        frames.append(pair.first);
-        bits.append(pair.second);
+    // TODO: jsherer - we wouldn't normally use decodedtext.h here... but it's useful for computing the actual frames transmitted.
+    QStringList textList;
+    qDebug() << "frames:";
+    foreach(auto frame, results){
+        auto dt = DecodedText(frame.first, frame.second);
+        qDebug() << "->" << frame << dt.message() << Varicode::frameTypeString(dt.frameType());
+        textList.append(dt.message());
     }
 
-    emit resultReady(frames, bits);
+    auto transmitText = textList.join("");
+    emit resultReady(transmitText, results.length());
 }

varicode.h

@@ -63,7 +63,9 @@ public:
 
     static QMap<QString, QString> defaultHuffTable();
     static QString cqString(int number);
+    static QString hbString(int number);
     static bool startsWithCQ(QString text);
+    static bool startsWithHB(QString text);
     static QString formatSNR(int snr);
     static QString formatPWR(int dbm);
 
@@ -172,7 +174,7 @@ public:
                              QObject *parent=nullptr);
     void run() override;
 signals:
-    void resultReady(QStringList, QList<int>);
+    void resultReady(QString, int);
 
 private:
     QString m_mycall;