w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 19:55:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only send local station info to PSK Reporter when necessary

Browse Source 
Remove unneeded debug trace messages.
This commit is contained in:
Bill Somerville 2020-08-18 12:47:17 +01:00
parent b1c53bc332
commit d1860df190
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Network/PSKReporter.cpp
View File

@ -21,7 +21,6 @@
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
#include <QRandomGenerator> #include <QRandomGenerator>
#endif #endif
#include <QDebug>
#include "Configuration.hpp" #include "Configuration.hpp"
#include "pimpl_impl.hpp" #include "pimpl_impl.hpp"
@ -95,11 +94,11 @@ public:
// handle re-opening asynchronously // handle re-opening asynchronously
auto connection = QSharedPointer<QMetaObject::Connection>::create (); auto connection = QSharedPointer<QMetaObject::Connection>::create ();
*connection = connect (socket_.data (), &QAbstractSocket::disconnected, [this, connection] () { *connection = connect (socket_.data (), &QAbstractSocket::disconnected, [this, connection] () {
qDebug () << "PSKReporter::impl::check_connection: disconnected, socket state:" << socket_->state ();
disconnect (*connection); disconnect (*connection);
check_connection (); check_connection ();
}); });
// close gracefully // close gracefully
send_report (true);
socket_->close (); socket_->close ();
} }
else else
@ -122,7 +121,6 @@ public:
default: default:
spots_.clear (); spots_.clear ();
qDebug () << "PSKReporter::impl::handle_socket_error:" << socket_->errorString ();
Q_EMIT self_->errorOccurred (socket_->errorString ()); Q_EMIT self_->errorOccurred (socket_->errorString ());
break; break;
} }
@ -268,7 +266,6 @@ void PSKReporter::impl::build_preamble (QDataStream& message)
<< ++sequence_number_ // Sequence Number << ++sequence_number_ // Sequence Number
<< observation_id_; // Observation Domain ID << observation_id_; // Observation Domain ID
// qDebug () << "PSKReporter::impl::build_preamble: send_descriptors_:" << send_descriptors_;
if (send_descriptors_) if (send_descriptors_)
{ {
--send_descriptors_; --send_descriptors_;
@ -333,7 +330,6 @@ void PSKReporter::impl::build_preamble (QDataStream& message)
} }
} }
// qDebug () << "PSKReporter::impl::build_preamble: send_receiver_data_:" << send_receiver_data_;
// if (send_receiver_data_) // if (send_receiver_data_)
{ {
// --send_receiver_data_; // --send_receiver_data_;
@ -361,8 +357,6 @@ void PSKReporter::impl::build_preamble (QDataStream& message)
void PSKReporter::impl::send_report (bool send_residue) void PSKReporter::impl::send_report (bool send_residue)
{ {
check_connection ();
// qDebug () << "PSKReporter::impl::send_report: send_residue:" << send_residue;
if (QAbstractSocket::ConnectedState != socket_->state ()) return; if (QAbstractSocket::ConnectedState != socket_->state ()) return;
QDataStream message {&payload_, QIODevice::WriteOnly | QIODevice::Append}; QDataStream message {&payload_, QIODevice::WriteOnly | QIODevice::Append};
@ -370,13 +364,11 @@ void PSKReporter::impl::send_report (bool send_residue)
if (!payload_.size ()) if (!payload_.size ())
{ {
// qDebug () << "PSKReporter::impl::send_report: building header";
// Build header, optional descriptors, and receiver information // Build header, optional descriptors, and receiver information
build_preamble (message); build_preamble (message);
} }
auto flush = flushing () || send_residue; auto flush = flushing () || send_residue;
// qDebug () << "PSKReporter::impl::send_report: flush:" << flush;
while (spots_.size () || flush) while (spots_.size () || flush)
{ {
if (!payload_.size ()) if (!payload_.size ())
@ -391,7 +383,6 @@ void PSKReporter::impl::send_report (bool send_residue)
tx_out tx_out
<< quint16 (0x50e3) // Template ID << quint16 (0x50e3) // Template ID
<< quint16 (0u); // Length (place-holder) << quint16 (0u); // Length (place-holder)
// qDebug () << "PSKReporter::impl::send_report: set data set header";
} }
// insert any residue // insert any residue
@ -399,7 +390,6 @@ void PSKReporter::impl::send_report (bool send_residue)
{ {
tx_out.writeRawData (tx_residue_.constData (), tx_residue_.size ()); tx_out.writeRawData (tx_residue_.constData (), tx_residue_.size ());
tx_residue_.clear (); tx_residue_.clear ();
// qDebug () << "PSKReporter::impl::send_report: inserted data residue";
} }
while (spots_.size () || flush) while (spots_.size () || flush)
@ -408,7 +398,6 @@ void PSKReporter::impl::send_report (bool send_residue)
if (spots_.size ()) if (spots_.size ())
{ {
auto const& spot = spots_.dequeue (); auto const& spot = spots_.dequeue ();
// qDebug () << "PSKReporter::impl::send_report: processing spotted call:" << spot.call_;
// Sender information // Sender information
writeUtfString (tx_out, spot.call_); writeUtfString (tx_out, spot.call_);
@ -440,7 +429,6 @@ void PSKReporter::impl::send_report (bool send_residue)
if (len <= MAX_PAYLOAD_LENGTH) if (len <= MAX_PAYLOAD_LENGTH)
{ {
tx_data_size = tx_data_.size (); tx_data_size = tx_data_.size ();
// qDebug () << "PSKReporter::impl::send_report: sending short payload:" << tx_data_size;
} }
QByteArray tx {tx_data_.left (tx_data_size)}; QByteArray tx {tx_data_.left (tx_data_size)};
QDataStream out {&tx, QIODevice::WriteOnly | QIODevice::Append}; QDataStream out {&tx, QIODevice::WriteOnly | QIODevice::Append};
@ -462,7 +450,6 @@ void PSKReporter::impl::send_report (bool send_residue)
// Send data to PSK Reporter site // Send data to PSK Reporter site
socket_->write (payload_); // TODO: handle errors socket_->write (payload_); // TODO: handle errors
// qDebug () << "PSKReporter::impl::send_report: sent payload:" << payload_.size () << "observation id:" << observation_id_;
flush = false; // break loop flush = false; // break loop
message.device ()->seek (0u); message.device ()->seek (0u);
payload_.clear (); // Fresh message payload_.clear (); // Fresh message
@ -470,7 +457,6 @@ void PSKReporter::impl::send_report (bool send_residue)
tx_residue_ = tx_data_.right (tx_data_.size () - tx_data_size); tx_residue_ = tx_data_.right (tx_data_.size () - tx_data_size);
tx_out.device ()->seek (0u); tx_out.device ()->seek (0u);
tx_data_.clear (); tx_data_.clear ();
// qDebug () << "PSKReporter::impl::send_report: payload sent residue length:" << tx_residue_.size ();
break; break;
} }
} }
@ -523,6 +509,7 @@ bool PSKReporter::addRemoteStation (QString const& call, QString const& grid, Ra
void PSKReporter::sendReport (bool last) void PSKReporter::sendReport (bool last)
{ {
m_->check_connection ();
if (m_->socket_ && QAbstractSocket::ConnectedState == m_->socket_->state ()) if (m_->socket_ && QAbstractSocket::ConnectedState == m_->socket_->state ())
{ {
m_->send_report (true); m_->send_report (true);

1
widgets/mainwindow.cpp
View File

@ -3624,7 +3624,6 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
} }
int snr = decodedtext.snr(); int snr = decodedtext.snr();
Frequency frequency = m_freqNominal + audioFrequency; Frequency frequency = m_freqNominal + audioFrequency;
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;
if (!m_psk_Reporter.addRemoteStation (deCall, grid, frequency, msgmode, snr)) if (!m_psk_Reporter.addRemoteStation (deCall, grid, frequency, msgmode, snr))