diff --git a/mainwindow.cpp b/mainwindow.cpp
index d1ec8ad..1b4fa3f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6875,6 +6875,10 @@ void MainWindow::on_actionOpen_log_directory_triggered ()
QDesktopServices::openUrl (QUrl::fromLocalFile (m_config.writeable_data_dir ().absolutePath ()));
}
+void MainWindow::on_actionOpen_Save_Directory_triggered(){
+ QDesktopServices::openUrl (QUrl::fromLocalFile (m_config.save_directory().absolutePath ()));
+}
+
void MainWindow::on_bandComboBox_currentIndexChanged (int index)
{
auto const& frequencies = m_config.frequencies ();
@@ -9280,8 +9284,8 @@ void MainWindow::processCommandActivity() {
auto d = m_rxCommandQueue.dequeue();
bool isAllCall = isAllCallIncluded(d.to);
- bool isGroupCall = isGroupCallIncluded(d.to);
- bool isNear = abs(d.freq - currentFreqOffset()) <= 150;
+ bool isNear = abs(d.freq - currentFreqOffset()) <= 110; // 100Hz + a 10Hz buffer
+ bool isGroupCall = isGroupCallIncluded(d.to) && isNear;
qDebug() << "try processing command" << d.from << d.to << d.cmd << d.freq << d.grid << d.extra;
@@ -9310,11 +9314,11 @@ void MainWindow::processCommandActivity() {
logCallActivity(cd, true);
// we're only responding to allcall, groupcalls near us, and our callsign at this point, so we'll end after logging the callsigns we've heard
- if (!isAllCall && !toMe && !(isGroupCall && isNear)) {
+ if (!isAllCall && !toMe && !isGroupCall) {
continue;
}
- // if selcal is enabled and this isnt directed to us, take no action.
+ // if selcal is enabled and this is an allcall, take no action.
if (isAllCall && ui->selcalButton->isChecked()) {
continue;
}
@@ -9483,7 +9487,7 @@ void MainWindow::processCommandActivity() {
#endif
// PROCESS RELAY
- else if (d.cmd == ">" && !isAllCall) {
+ else if (d.cmd == ">" && !isAllCall && !isGroupCall) {
// 1. see if there are any more hops to process
// 2. if so, forward
@@ -9536,7 +9540,7 @@ void MainWindow::processCommandActivity() {
}
// PROCESS AGN
- else if (d.cmd == " AGN?" && !isAllCall && !m_lastTxMessage.isEmpty()) {
+ else if (d.cmd == " AGN?" && !isAllCall && !isGroupCall && !m_lastTxMessage.isEmpty()) {
reply = m_lastTxMessage;
}
diff --git a/mainwindow.h b/mainwindow.h
index 73bfc27..b752371 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -200,6 +200,7 @@ private slots:
void on_actionDecode_remaining_files_in_directory_triggered();
void on_actionDelete_all_wav_files_in_SaveDir_triggered();
void on_actionOpen_log_directory_triggered ();
+ void on_actionOpen_Save_Directory_triggered();
void on_actionNone_triggered();
void on_actionSave_all_triggered();
void on_actionKeyboard_shortcuts_triggered();
diff --git a/mainwindow.ui b/mainwindow.ui
index 3986806..e3c1549 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -798,69 +798,6 @@ background-color: #6699ff;
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 75
- 30
-
-
-
-
- 0
- 30
-
-
-
- <html><head/><body><p>Enable or disable the automatic beacon</p></body></html>
-
-
- QPushButton {
-font-family: helvetica;
-font-weight: bold;
-background-color: lightgray;
-color: black;
-border-style: solid;
-border-radius:2px;
-border-width:0px;
-border-color: gray;
-font-size:90%;
-min-width:75px;
-min-height:30px;
-/*max-width:60px;*/
-max-height:30px;
-}
-QPushButton[state="error"] {
-background-color: red;
-}
-QPushButton[state="warning"] {
-background-color: orange;
-}
-QPushButton[state="ok"] {
-background-color: #00ff00;
-}
-QPushButton:checked {
-background-color: #6699ff;
-}
-
-
- BEACON
-
-
- true
-
-
-
-
@@ -924,72 +861,6 @@ background-color: #6699ff;
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 75
- 30
-
-
-
-
- 0
- 30
-
-
-
- true
-
-
- <html><head/><body><p>Enable or disable selective calling (i.e., only directed messages to you will be displayed in the RX area)</p></body></html>
-
-
- QPushButton {
-font-family: helvetica;
-font-weight: bold;
-background-color: lightgray;
-color: black;
-border-style: solid;
-border-radius:2px;
-border-width:0px;
-border-color: gray;
-font-size:90%;
-min-width:75px;
-min-height:30px;
-/*max-width:60px;*/
-max-height:30px;
-}
-QPushButton[state="error"] {
-background-color: red;
-}
-QPushButton[state="warning"] {
-background-color: orange;
-}
-QPushButton[state="ok"] {
-background-color: #00ff00;
-}
-QPushButton:checked {
-background-color: #6699ff;
-}
-
-
- SELCAL
-
-
- true
-
-
-
-
@@ -1113,6 +984,135 @@ background-color: #00ff00;
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 30
+
+
+
+
+ 0
+ 30
+
+
+
+ <html><head/><body><p>Enable or disable the automatic beacon</p></body></html>
+
+
+ QPushButton {
+font-family: helvetica;
+font-weight: bold;
+background-color: lightgray;
+color: black;
+border-style: solid;
+border-radius:2px;
+border-width:0px;
+border-color: gray;
+font-size:90%;
+min-width:75px;
+min-height:30px;
+/*max-width:60px;*/
+max-height:30px;
+}
+QPushButton[state="error"] {
+background-color: red;
+}
+QPushButton[state="warning"] {
+background-color: orange;
+}
+QPushButton[state="ok"] {
+background-color: #00ff00;
+}
+QPushButton:checked {
+background-color: #6699ff;
+}
+
+
+ BEACON
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 30
+
+
+
+
+ 0
+ 30
+
+
+
+ true
+
+
+ <html><head/><body><p>Enable or disable selective calling (i.e., only directed messages to you will be displayed in the RX area)</p></body></html>
+
+
+ QPushButton {
+font-family: helvetica;
+font-weight: bold;
+background-color: lightgray;
+color: black;
+border-style: solid;
+border-radius:2px;
+border-width:0px;
+border-color: gray;
+font-size:90%;
+min-width:75px;
+min-height:30px;
+/*max-width:60px;*/
+max-height:30px;
+}
+QPushButton[state="error"] {
+background-color: red;
+}
+QPushButton[state="warning"] {
+background-color: orange;
+}
+QPushButton[state="ok"] {
+background-color: #00ff00;
+}
+QPushButton:checked {
+background-color: #6699ff;
+}
+
+
+ SELCAL
+
+
+ true
+
+
+
@@ -4644,6 +4644,8 @@ list. The list can be maintained in Settings (F2).
+
+