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

Fixed beacon scheduling

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-06 16:19:22 -04:00
parent 56869d16a9
commit aa1871dc66
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mainwindow.cpp
View File

@ -3862,7 +3862,7 @@ void MainWindow::guiUpdate()
t.time().toString() + " ";
ui->labUTC->setText(utc);
auto delta = t.msecsTo(m_nextBeacon)/1000;
auto delta = t.secsTo(m_nextBeacon);
auto beacon = ui->beaconButton->isChecked() ? delta > 0 ? QString("%1 s").arg(delta) : "queued!" : "disabled";
ui->labBeacon->setText(QString("Next Beacon: %1").arg(beacon));
@ -5297,8 +5297,22 @@ bool MainWindow::prepareNextMessageFrame()
}
void MainWindow::scheduleBeacon(bool first){
int timestamp = QDateTime::currentDateTimeUtc().addSecs(first ? 15 : 300).toMSecsSinceEpoch();
m_nextBeacon = QDateTime::fromMSecsSinceEpoch(roundUp(timestamp, 15) + 1, QTimeZone::utc());
auto timestamp = QDateTime::currentDateTimeUtc(); //.addSecs(first ? 15 : 300);
auto orig = timestamp;
// remove milliseconds
auto t = timestamp.time();
t.setHMS(t.hour(), t.minute(), t.second());
timestamp.setTime(t);
// round to 15 second increment
int secondsSinceEpoch = (timestamp.toMSecsSinceEpoch()/1000);
int delta = roundUp(secondsSinceEpoch, 15) + 1 + (first ? m_txFirst ? 15 : 30 : 300) - secondsSinceEpoch;
timestamp = timestamp.addSecs(delta);
// set the next beacon timestamp and timer
m_nextBeacon = timestamp;
beaconTimer.start(QDateTime::currentDateTimeUtc().msecsTo(m_nextBeacon) - 2*1000);
}
@ -5307,7 +5321,7 @@ void MainWindow::prepareBeacon(){
return;
}
if(QDateTime::currentDateTimeUtc().msecsTo(m_nextBeacon) > 15*1000){
if(QDateTime::currentDateTimeUtc().secsTo(m_nextBeacon) > 15){
return;
}