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

Better beacon scheduling when receiving a directed message

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-13 21:59:44 -04:00
parent 4de968d2f0
commit 369b5fd73a
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mainwindow.cpp
View File

@ -1071,6 +1071,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
auto frames = buildFT8MessageFrames("OH8STN:KN4CRD?"); auto frames = buildFT8MessageFrames("OH8STN:KN4CRD?");
qDebug() << frames.first() << Varicode::unpackDirectedMessage(frames.first()); qDebug() << frames.first() << Varicode::unpackDirectedMessage(frames.first());
qDebug() << Varicode::packGrid("EM73tu") << Varicode::unpackGrid(Varicode::packGrid("EM73tu"));
#endif #endif
// this must be the last statement of constructor // this must be the last statement of constructor
@ -7967,14 +7968,15 @@ void MainWindow::displayActivity(bool force){
// Command Activity // Command Activity
if(m_txFrameQueue.isEmpty()){ if(m_txFrameQueue.isEmpty() && !m_rxCommandQueue.isEmpty()){
int f; int f = ui->TxFreqSpinBox->value(); // ew
bool processed = false;
while(!m_rxCommandQueue.isEmpty()){ while(!m_rxCommandQueue.isEmpty()){
auto d = m_rxCommandQueue.head(); auto d = m_rxCommandQueue.dequeue();
m_rxCommandQueue.pop_front();
qDebug() << "processing command" << d.from << d.to << d.command; qDebug() << "processing command" << d.from << d.to << d.command << d.freq;
// we're only processing queries at this point // we're only processing queries at this point
if(d.command != "?"){ if(d.command != "?"){
@ -7988,9 +7990,8 @@ void MainWindow::displayActivity(bool force){
// TODO: jsherer - check to make sure we haven't replied to their allcall recently // TODO: jsherer - check to make sure we haven't replied to their allcall recently
// construct reply // construct reply
auto reply = QString("%1 %2 %3").arg(d.from).arg(d.to).arg(d.snr); auto reply = QString("%1 %2 %3").arg(d.from).arg(m_config.my_callsign()).arg(d.snr);
addMessageText(reply); addMessageText(reply);
// use the last frequency // use the last frequency
@ -8000,12 +8001,17 @@ void MainWindow::displayActivity(bool force){
if(d.to == "ALLCALL"){ if(d.to == "ALLCALL"){
f = findFreeFreqOffset(qMax(0, f-100), qMin(f+100, 2500), 50); f = findFreeFreqOffset(qMax(0, f-100), qMin(f+100, 2500), 50);
} }
processed = true;
} }
// if we have beacon turned on, and it's more than 15 seconds away, automatically reply now if(processed){
if(QDateTime::currentDateTimeUtc().secsTo(m_nextBeacon) > 15){ // if we have beacon turned on, and it's more than 15 seconds away, automatically reply now, and bump the beacon
setFreq4(f, f); if(QDateTime::currentDateTimeUtc().secsTo(m_nextBeacon) >= 15){
ui->startTxButton->setChecked(true); setFreq4(f, f);
ui->startTxButton->setChecked(true);
scheduleBeacon(false);
}
} }
} }