mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-09-02 21:27:52 -04:00
Further WIP toward communication between WSJT-X and Q65W.
This commit is contained in:
parent
a60edeb607
commit
31524396d2
@ -958,11 +958,7 @@ void MainWindow::guiUpdate()
|
|||||||
m_fetched++;
|
m_fetched++;
|
||||||
}
|
}
|
||||||
mem_q65w.lock();
|
mem_q65w.lock();
|
||||||
|
|
||||||
// char *from = (char*) decodes_.ndecodes;
|
|
||||||
// char *from = (char*) &decodes_;
|
|
||||||
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_));
|
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_));
|
||||||
|
|
||||||
mem_q65w.unlock();
|
mem_q65w.unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4817,17 +4817,22 @@ void MainWindow::guiUpdate()
|
|||||||
|
|
||||||
mem_q65w.lock();
|
mem_q65w.lock();
|
||||||
memcpy(&q65wcom, (char*)ipc_q65w, sizeof(q65wcom));
|
memcpy(&q65wcom, (char*)ipc_q65w, sizeof(q65wcom));
|
||||||
qDebug() << "AAA" << nsec << q65wcom.ndecodes << q65wcom.ncand << m_fetched;
|
// qDebug() << "AAA" << nsec << q65wcom.ndecodes << q65wcom.ncand << m_fetched;
|
||||||
QString t0=QString::fromLatin1(q65wcom.result[0]);
|
// QString t0=QString::fromLatin1(q65wcom.result[0]);
|
||||||
QString t1=QString::fromLatin1(q65wcom.result[1]);
|
// QString t1=QString::fromLatin1(q65wcom.result[1]);
|
||||||
qDebug() << "BBB" << t0 << "\n" << t1;
|
// qDebug() << "BBB" << t0 << "\n" << t1;
|
||||||
mem_q65w.unlock();
|
mem_q65w.unlock();
|
||||||
|
if(q65wcom.ndecodes>m_fetched) {
|
||||||
|
readWidebandDecodes();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
QFileInfo fi(m_appDir+"/q65w_decodes.txt");
|
QFileInfo fi(m_appDir+"/q65w_decodes.txt");
|
||||||
QDateTime fileTime=fi.lastModified();
|
QDateTime fileTime=fi.lastModified();
|
||||||
QDateTime now = QDateTime::currentDateTimeUtc ();
|
QDateTime now = QDateTime::currentDateTimeUtc ();
|
||||||
int age=fileTime.msecsTo(now)/1000;
|
int age=fileTime.msecsTo(now)/1000;
|
||||||
if(age==1) readWidebandDecodes();
|
if(age==1) readWidebandDecodes();
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_mode=="FST4") chk_FST4_freq_range();
|
if(m_mode=="FST4") chk_FST4_freq_range();
|
||||||
@ -9210,32 +9215,28 @@ void MainWindow::write_transmit_entry (QString const& file_name)
|
|||||||
void MainWindow::readWidebandDecodes()
|
void MainWindow::readWidebandDecodes()
|
||||||
{
|
{
|
||||||
if(m_ActiveStationsWidget==NULL) return;
|
if(m_ActiveStationsWidget==NULL) return;
|
||||||
// Update "m_wEMECall" by reading q65w_decodes.txt
|
|
||||||
int nhr=0;
|
int nhr=0;
|
||||||
int nmin=0;
|
int nmin=0;
|
||||||
QFile f(m_appDir+"/q65w_decodes.txt");
|
while(m_fetched < q65wcom.ndecodes) {
|
||||||
f.open(QIODevice::ReadOnly);
|
QString line=QString::fromLatin1(q65wcom.result[m_fetched]);
|
||||||
if(f.isOpen()) {
|
nhr=line.mid(0,2).toInt();
|
||||||
QTextStream in(&f);
|
nmin=line.mid(2,2).toInt();
|
||||||
QString line,callsign;
|
double fsked=line.mid(4,9).toDouble();
|
||||||
for(int i=0; i<99999; i++) {
|
QString msg=line.mid(27,-1);
|
||||||
line=in.readLine();
|
int i1=msg.indexOf(" ");
|
||||||
if(line.length()<=0) break;
|
int i2=i1 +1 + msg.mid(i1+1,-1).indexOf(" ");
|
||||||
nhr=line.mid(0,2).toInt();
|
QString dxcall=msg.mid(i1+1,i2-i1-1);
|
||||||
nmin=line.mid(2,2).toInt();
|
QString w3=msg.mid(i2+1,-1);
|
||||||
double fsked=line.mid(4,9).toDouble();
|
m_EMECall[dxcall].fsked=fsked;
|
||||||
QString msg=line.mid(27,-1);
|
m_EMECall[dxcall].t=60*nhr + nmin;
|
||||||
int i1=msg.indexOf(" ");
|
m_EMECall[dxcall].worked=false; //### TEMPORARY ###
|
||||||
int i2=i1 +1 + msg.mid(i1+1,-1).indexOf(" ");
|
if(w3.contains(grid_regexp)) m_EMECall[dxcall].grid4=w3;
|
||||||
QString dxcall=msg.mid(i1+1,i2-i1-1);
|
qDebug() << "aa" << q65wcom.ndecodes << m_fetched << line;
|
||||||
QString w3=msg.mid(i2+1,-1);
|
m_fetched++;
|
||||||
m_EMECall[dxcall].fsked=fsked;
|
}
|
||||||
m_EMECall[dxcall].t=60*nhr + nmin;
|
|
||||||
m_EMECall[dxcall].worked=false; //### TEMPORARY ###
|
|
||||||
if(w3.contains(grid_regexp)) m_EMECall[dxcall].grid4=w3;
|
|
||||||
}
|
|
||||||
f.close();
|
|
||||||
|
|
||||||
|
// Update "m_wEMECall" by reading q65w_decodes.txt
|
||||||
QMap<QString,EMECall>::iterator i;
|
QMap<QString,EMECall>::iterator i;
|
||||||
QString t="";
|
QString t="";
|
||||||
QString t1;
|
QString t1;
|
||||||
@ -9282,7 +9283,7 @@ void MainWindow::readWidebandDecodes()
|
|||||||
m_ActiveStationsWidget->erase();
|
m_ActiveStationsWidget->erase();
|
||||||
m_ActiveStationsWidget->displayRecentStations(m_mode,t);
|
m_ActiveStationsWidget->displayRecentStations(m_mode,t);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- Code for FT8 DXpedition Mode ---------------------------
|
// -------------------------- Code for FT8 DXpedition Mode ---------------------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user