chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configurable HB ACKs vs SNR is a future consideration, not for 2.2

Browse Source
This commit is contained in:
Jordan Sherer 2020-03-30 14:27:36 -04:00
parent dd3efd15a1
commit 79acdfccd3
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Configuration.cpp
View File

@ -813,7 +813,13 @@ bool Configuration::autoreply_on_at_startup () const {
bool Configuration::autoreply_confirmation() const { return m_->autoreply_confirmation_; } bool Configuration::autoreply_confirmation() const { return m_->autoreply_confirmation_; }
bool Configuration::heartbeat_anywhere() const { return m_->heartbeat_anywhere_;} bool Configuration::heartbeat_anywhere() const { return m_->heartbeat_anywhere_;}
bool Configuration::heartbeat_qso_pause() const { return m_->heartbeat_qso_pause_;} 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::relay_off() const { return m_->relay_disabled_; }
bool Configuration::monitor_off_at_startup () const {return m_->monitor_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::monitor_last_used () const {return m_->rig_is_dummy_ || m_->monitor_last_used_;}

1
Configuration.ui
View File

@ -876,6 +876,7 @@ text message.</string>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="heartbeat_ack_snr_check_box"> <widget class="QCheckBox" name="heartbeat_ack_snr_check_box">
<property name="visible"><bool>false</bool></property>
<property name="text"> <property name="text">
<string>Send SNR report when acknowledging heartbeats</string> <string>Send SNR report when acknowledging heartbeats</string>
</property> </property>

4
mainwindow.cpp
View File

@ -8167,9 +8167,13 @@ void MainWindow::sendHeartbeat(){
} }
void MainWindow::sendHeartbeatAck(QString to, int snr, QString extra){ void MainWindow::sendHeartbeatAck(QString to, int snr, QString extra){
#if JS8_HB_ACK_SNR_CONFIGURABLE
auto message = m_config.heartbeat_ack_snr() ? auto message = m_config.heartbeat_ack_snr() ?
QString("%1 SNR %2 %3").arg(to).arg(Varicode::formatSNR(snr)).arg(extra).trimmed() : QString("%1 SNR %2 %3").arg(to).arg(Varicode::formatSNR(snr)).arg(extra).trimmed() :
QString("%1 ACK %2").arg(to).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); auto f = m_config.heartbeat_anywhere() ? -1 : findFreeFreqOffset(500, 1000, 50);