Merging code for v1.1 back into the main wsjtx branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2013-07-08 13:17:22 +00:00
parent ba61cfde6a
commit 3dc6abc0c1
75 changed files with 4807 additions and 3514 deletions
+4 -13
View File
@@ -39,10 +39,10 @@ PSK_Reporter::PSK_Reporter(QObject *parent) :
void PSK_Reporter::setLocalStation(QString call, QString gridSquare, QString programInfo)
{
m_rxCall = call;
m_rxGrid = gridSquare;
m_progId = programInfo;
reportTimer->start(5*60*1000); // 5 minutes;
m_rxCall = call;
m_rxGrid = gridSquare;
m_progId = programInfo;
reportTimer->start(5*60*1000); // 5 minutes;
}
void PSK_Reporter::addRemoteStation(QString call, QString grid, QString freq, QString mode, QString snr, QString time )
@@ -99,15 +99,6 @@ void PSK_Reporter::sendReport()
// Get IP address for pskreporter.info and send report via UDP
QHostInfo info = QHostInfo::fromName("report.pskreporter.info");
m_udpSocket->writeDatagram(report,info.addresses().at(0),4739);
/*
qDebug() << header_h;
qDebug() << m_rxInfoDescriptor_h;
qDebug() << m_txInfoDescriptor_h;
qDebug() << rxInfoData_h;
qDebug() << txInfoData_h;
qDebug() << report.toHex();
*/
}