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

Log directed FT8Call messages to PSKReporter

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-20 23:09:17 -04:00
parent b2e2b91d31
commit d4c2d9a871
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mainwindow.cpp
View File

@ -3270,6 +3270,13 @@ void MainWindow::readFromStdout() //readFromStdout
cd.freq = decodedtext.frequencyOffset(); cd.freq = decodedtext.frequencyOffset();
cd.utcTimestamp = d.utcTimestamp; cd.utcTimestamp = d.utcTimestamp;
m_callActivity[cd.call] = cd; m_callActivity[cd.call] = cd;
int nsec=QDateTime::currentMSecsSinceEpoch()/1000-m_secBandChanged;
bool okToPost=(nsec>(4*m_TRperiod)/5);
if (okToPost){
pskSetLocal();
pskLogReport("FT8Call", d.freq, d.snr, d.from, "");
}
} }
} }
} }
@ -3484,15 +3491,29 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
audioFrequency=decodedtext.string().mid(16,4).toInt(); audioFrequency=decodedtext.string().mid(16,4).toInt();
} }
int snr = decodedtext.snr(); int snr = decodedtext.snr();
Frequency frequency = m_freqNominal + audioFrequency;
pskSetLocal (); pskSetLocal ();
if(grid.contains (grid_regexp)) { if(grid.contains (grid_regexp)) {
// qDebug() << "To PSKreporter:" << deCall << grid << frequency << msgmode << snr; // qDebug() << "To PSKreporter:" << deCall << grid << frequency << msgmode << snr;
psk_Reporter->addRemoteStation(deCall,grid,QString::number(frequency),msgmode, // psk_Reporter->addRemoteStation(deCall,grid,QString::number(frequency),msgmode,
QString::number(snr),QString::number(QDateTime::currentDateTime().toTime_t())); // QString::number(snr),QString::number(QDateTime::currentDateTime().toTime_t()));
pskLogReport(msgmode, audioFrequency, snr, deCall, grid);
} }
} }
void MainWindow::pskLogReport(QString mode, int offset, int snr, QString callsign, QString grid){
if(!m_config.spot_to_psk_reporter()) return;
Frequency frequency = m_freqNominal + offset;
psk_Reporter->addRemoteStation(
callsign,
grid,
QString::number(frequency),
mode,
QString::number(snr),
QString::number(QDateTime::currentDateTime().toTime_t()));
}
void MainWindow::killFile () void MainWindow::killFile ()
{ {
if (m_fnameWE.size () && if (m_fnameWE.size () &&

1
mainwindow.h
View File

@ -754,6 +754,7 @@ private:
void rigFailure (QString const& reason); void rigFailure (QString const& reason);
void pskSetLocal (); void pskSetLocal ();
void pskPost(DecodedText const& decodedtext); void pskPost(DecodedText const& decodedtext);
void pskLogReport(QString mode, int offset, int snr, QString callsign, QString grid);
void displayDialFrequency (); void displayDialFrequency ();
void transmitDisplay (bool); void transmitDisplay (bool);
void processMessage(DecodedText const&, Qt::KeyboardModifiers = 0); void processMessage(DecodedText const&, Qt::KeyboardModifiers = 0);