From 79acdfccd350e2a7c96386ffd45bfec0e14edeb0 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Mon, 30 Mar 2020 14:27:36 -0400
Subject: [PATCH] Configurable HB ACKs vs SNR is a future consideration, not
 for 2.2

---
 Configuration.cpp | 8 +++++++-
 Configuration.ui  | 1 +
 mainwindow.cpp    | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 19f1459..1da456c 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -813,7 +813,13 @@ bool Configuration::autoreply_on_at_startup () const {
 bool Configuration::autoreply_confirmation() const { return m_->autoreply_confirmation_; }
 bool Configuration::heartbeat_anywhere() const { return m_->heartbeat_anywhere_;}
 bool Configuration::heartbeat_qso_pause() const { return m_->heartbeat_qso_pause_;}
-bool Configuration::heartbeat_ack_snr() const { return m_->heartbeat_ack_snr_;}
+bool Configuration::heartbeat_ack_snr() const {
+#if JS8_HB_ACK_SNR_CONFIGURABLE
+    return m_->heartbeat_ack_snr_;
+#else
+    return true;
+#endif
+}
 bool Configuration::relay_off() const { return m_->relay_disabled_; }
 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_;}
diff --git a/Configuration.ui b/Configuration.ui
index a818316..d38f1d5 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -876,6 +876,7 @@ text message.</string>
                   </item>
                   <item>
                    <widget class="QCheckBox" name="heartbeat_ack_snr_check_box">
+                    <property name="visible"><bool>false</bool></property>
                     <property name="text">
                      <string>Send SNR report when acknowledging heartbeats</string>
                     </property>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 61e13f6..27ddce2 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -8167,9 +8167,13 @@ void MainWindow::sendHeartbeat(){
 }
 
 void MainWindow::sendHeartbeatAck(QString to, int snr, QString extra){
+#if JS8_HB_ACK_SNR_CONFIGURABLE
     auto message = m_config.heartbeat_ack_snr() ?
         QString("%1 SNR %2 %3").arg(to).arg(Varicode::formatSNR(snr)).arg(extra).trimmed() :
         QString("%1 ACK %2").arg(to).arg(extra).trimmed();
+#else
+    auto message = QString("%1 SNR %2 %3").arg(to).arg(Varicode::formatSNR(snr)).arg(extra).trimmed();
+#endif
 
     auto f = m_config.heartbeat_anywhere() ? -1 : findFreeFreqOffset(500, 1000, 50);