w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-24 14:15:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Another fix for communication between Q65W and WSJT-X.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-16 14:01:22 -05:00
parent 2fcf6c45fe
commit 042ff589fb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
q65w/mainwindow.cpp
View File

@ -744,6 +744,9 @@ void MainWindow::decoderFinished() //diskWriteFinished
ui->DecodeButton->setStyleSheet(""); ui->DecodeButton->setStyleSheet("");
decodeBusy(false); decodeBusy(false);
decodes_.nQDecoderDone=1; decodes_.nQDecoderDone=1;
mem_q65w.lock();
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_));
mem_q65w.unlock();
QString t1; QString t1;
t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand); t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand);
lab5->setText(t1); lab5->setText(t1);
@ -960,9 +963,6 @@ void MainWindow::guiUpdate()
ui->decodedTextBrowser->append(t.trimmed()); ui->decodedTextBrowser->append(t.trimmed());
m_fetched++; m_fetched++;
} }
mem_q65w.lock();
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_));
mem_q65w.unlock();
} }
if(nsec != m_sec0) { //Once per second if(nsec != m_sec0) { //Once per second

11
widgets/mainwindow.cpp
View File

@ -4824,7 +4824,7 @@ void MainWindow::guiUpdate()
if(m_transmitting) n=1; if(m_transmitting) n=1;
ipc_q65w[4]=n; ipc_q65w[4]=n;
if(ipc_q65w[0] > m_fetched) { //ndecodes if(ipc_q65w[0] > m_fetched) { //ndecodes
memcpy(&q65wcom, (char*)ipc_q65w, sizeof(q65wcom)); memcpy(&q65wcom, (char*)ipc_q65w, sizeof(q65wcom)); //Fetch the new decode(s)
readWidebandDecodes(); readWidebandDecodes();
} }
mem_q65w.unlock(); mem_q65w.unlock();
@ -4832,7 +4832,8 @@ void MainWindow::guiUpdate()
//Once per second (onesec) //Once per second (onesec)
if(nsec != m_sec0) { if(nsec != m_sec0) {
// qDebug() << "AAA" << nsec << ipc_q65w[0] << ipc_q65w[1]; // qDebug() << "AAA" << nsec << ipc_q65w[0] << ipc_q65w[1] << ipc_q65w[2]
// << ipc_q65w[3] << ipc_q65w[4] << m_fetched;
if(m_mode=="FST4") chk_FST4_freq_range(); if(m_mode=="FST4") chk_FST4_freq_range();
m_currentBand=m_config.bands()->find(m_freqNominal); m_currentBand=m_config.bands()->find(m_freqNominal);
@ -9290,7 +9291,11 @@ void MainWindow::readWidebandDecodes()
m_ActiveStationsWidget->displayRecentStations(m_mode,t); m_ActiveStationsWidget->displayRecentStations(m_mode,t);
m_ActiveStationsWidget->setClickOK(true); m_ActiveStationsWidget->setClickOK(true);
} }
if(q65wcom.nQDecoderDone==1) m_fetched=0; if(ipc_q65w[2]==1) {
m_fetched=0;
ipc_q65w[0]=0;
ipc_q65w[2]=0;
}
} }
// -------------------------- Code for FT8 DXpedition Mode --------------------------- // -------------------------- Code for FT8 DXpedition Mode ---------------------------