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

Fixed bug in beacon that prevented it from kicking off if AUTO was disabled

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-06 17:24:42 -04:00
parent aa9014f2f5
commit a08858a3f1
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mainwindow.cpp
View File

@ -6036,15 +6036,27 @@ bool MainWindow::prepareNextMessageFrame()
} }
bool MainWindow::isFreqOffsetFree(int f, int bw){ bool MainWindow::isFreqOffsetFree(int f, int bw){
// TODO: jsherer - figure out a better way to determine if the frequency is suitable for tx // if this frequency is our current frequency, it's always "free"
if(currentFreq() == f){
return true;
}
#if 0
foreach(int offset, m_bandActivity.keys()){ foreach(int offset, m_bandActivity.keys()){
auto d = m_bandActivity[offset];
if(d.isEmpty()){
continue;
}
// if we last received on this more than 30 seconds ago, it's free
if(d.last().utcTimestamp.secsTo(QDateTime::currentDateTimeUtc()) >= 30){
continue;
}
// otherwise, if this is an occupied slot within our 60Hz of where we'd like to transmit... it's not free...
if(qAbs(offset - f) < bw){ if(qAbs(offset - f) < bw){
return false; return false;
} }
} }
#endif
return true; return true;
} }
@ -8681,8 +8693,8 @@ void MainWindow::processTxQueue(){
// add the message to the outgoing message text box // add the message to the outgoing message text box
addMessageText(message.message, true); addMessageText(message.message, true);
// check to see if we have autoreply enabled... // check to see if we have autoreply enabled...(or if this is a beacon and the beacon button is enabled)
if(ui->autoReplyButton->isChecked()){ if(ui->autoReplyButton->isChecked() || (ui->beaconButton->isChecked() && message.message.contains("BEACON"))){
// then try to set the frequency... // then try to set the frequency...
setFreqForRestore(f, true); setFreqForRestore(f, true);