w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 12:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Must update m_fAdd in QMAP's SoundInThread, after devsetup finishes.

Browse Source
This commit is contained in:
Joe Taylor 2023-02-24 09:35:26 -05:00
parent df2728efb4
commit 80d7de8839
3 changed files with 6 additions and 3 deletions

4
qmap/astro.cpp
View File

@ -71,6 +71,7 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid,
&dgrd, &poloffset, &xnr, 6, 6); &dgrd, &poloffset, &xnr, 6, 6);
datcom_.ndop00=ndop00; //Send self Doppler to decoder, via datcom datcom_.ndop00=ndop00; //Send self Doppler to decoder, via datcom
// qDebug() << "aa" << isec << datcom_.fcenter << nfreq << ndop00;
sprintf(cc, sprintf(cc,
"Az: %6.1f\n" "Az: %6.1f\n"
"El: %6.1f\n" "El: %6.1f\n"
@ -81,11 +82,12 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid,
"Dec: %6.1f\n" "Dec: %6.1f\n"
"SunAz: %6.1f\n" "SunAz: %6.1f\n"
"SunEl: %6.1f\n" "SunEl: %6.1f\n"
"Freq: %6d\n"
"Tsky: %6d\n" "Tsky: %6d\n"
"MNR: %6.1f\n" "MNR: %6.1f\n"
"Dgrd: %6.1f", "Dgrd: %6.1f",
azmoon,elmoon,ndop00,azmoondx,elmoondx,ndop,decmoon,azsun,elsun, azmoon,elmoon,ndop00,azmoondx,elmoondx,ndop,decmoon,azsun,elsun,
ntsky,xnr,dgrd); nfreq,ntsky,xnr,dgrd);
ui->astroTextBrowser->setText(" "+ date + "\nUTC: " + utc + "\n" + cc); ui->astroTextBrowser->setText(" "+ date + "\nUTC: " + utc + "\n" + cc);
double azOffset=0.0; double azOffset=0.0;

3
qmap/mainwindow.cpp
View File

@ -457,6 +457,7 @@ void MainWindow::on_actionSettings_triggered()
m_timeout=dlg.m_timeout; m_timeout=dlg.m_timeout;
m_fCal=dlg.m_fCal; m_fCal=dlg.m_fCal;
m_fAdd=dlg.m_fAdd; m_fAdd=dlg.m_fAdd;
soundInThread.setFadd(m_fAdd);
m_wide_graph_window->setFcal(m_fCal); m_wide_graph_window->setFcal(m_fCal);
m_fs96000=dlg.m_fs96000; m_fs96000=dlg.m_fs96000;
m_network=dlg.m_network; m_network=dlg.m_network;
@ -469,7 +470,6 @@ void MainWindow::on_actionSettings_triggered()
soundInThread.wait(1000); soundInThread.wait(1000);
soundInThread.setNetwork(m_network); soundInThread.setNetwork(m_network);
soundInThread.setRate(96000.0); soundInThread.setRate(96000.0);
soundInThread.setFadd(m_fAdd);
soundInThread.setNrx(1); soundInThread.setNrx(1);
soundInThread.start(QThread::HighestPriority); soundInThread.start(QThread::HighestPriority);
} }
@ -946,6 +946,7 @@ void MainWindow::guiUpdate()
ui->labFreq->setText(t1); ui->labFreq->setText(t1);
if(nsec != m_sec0) { //Once per second if(nsec != m_sec0) { //Once per second
// qDebug() << "AAA" << nsec << m_fAdd;
static int n60z=99; static int n60z=99;
int n60=nsec%60; int n60=nsec%60;
int itest[5]; int itest[5];

2
qmap/soundin.cpp
View File

@ -211,7 +211,7 @@ void SoundInThread::inputUDP()
int nsam=-1; int nsam=-1;
recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8); recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8);
datcom_.fcenter=b.cfreq + m_fAdd; datcom_.fcenter=b.cfreq + m_fAdd;
// qDebug() << "aaa" << b.cfreq << m_fAdd << datcom_.fcenter; // qDebug() << "bb" << b.cfreq << m_fAdd << datcom_.fcenter;
} }
m_hsym=(k-2048)*11025.0/(2048.0*m_rate); m_hsym=(k-2048)*11025.0/(2048.0*m_rate);