diff --git a/qmap/libqmap/decode0.f90 b/qmap/libqmap/decode0.f90 index a11c2dccd..4870c1f13 100644 --- a/qmap/libqmap/decode0.f90 +++ b/qmap/libqmap/decode0.f90 @@ -22,7 +22,7 @@ subroutine decode0(dd,ss,savg) nQDecoderDone=0 if(newdat.ne.0) then - nz=96000*nhsym/5.3833 + nz=96000*nhsym*0.15 hist=0 do i=1,nz j1=min(abs(dd(1,i)),32768.0) diff --git a/qmap/libqmap/q65_sync.f90 b/qmap/libqmap/q65_sync.f90 index 1157cce5e..7c0a1a0c4 100644 --- a/qmap/libqmap/q65_sync.f90 +++ b/qmap/libqmap/q65_sync.f90 @@ -15,9 +15,9 @@ subroutine q65_sync(ss,i0,nts_q65,sync_ok,snr,xdt) data first/.true./ save first,isync - tstep=2048.0/11025.0 !0.185760 s: 0.5*tsym_jt65, 0.3096*tsym_q65 + tstep=0.15 !0.5*tsym_Q65-30x, 0.25*tsys_Q65-60x if(first) then - fac=0.6/tstep !3.230 + fac=0.6/tstep do i=1,22 !Expand the Q65 sync stride isync(i)=nint((isync(i)-1)*fac) + 1 enddo diff --git a/qmap/libqmap/symspec.f90 b/qmap/libqmap/symspec.f90 index 574dc8b63..0ef92d759 100644 --- a/qmap/libqmap/symspec.f90 +++ b/qmap/libqmap/symspec.f90 @@ -38,7 +38,7 @@ subroutine symspec(k,ndiskdat,nb,nbslider,nfsample, & enddo endif - hsym=2048.d0*96000.d0/11025.d0 !Samples per JT65 half-symbol + hsym=0.15d0*96000.d0 !Samples per Q65-30x half-symbol if(k.lt.k0) then ts=1.d0 - hsym diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index d89390a44..8ebe2b627 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -705,9 +705,10 @@ void MainWindow::diskDat() //diskDat() //These may be redundant?? m_diskData=true; datcom_.newdat=1; - hsym=2048.0*96000.0/11025.0; //Samples per JT65 half-symbol - for(int i=0; i<304; i++) { // Do the half-symbol FFTs - int k = i*hsym + 2048.5; + hsym=0.15*96000.0; //Samples per Q65-30x half-symbol or Q65-60x quarter-symbol + for(int i=0; i<380; i++) { // Do the half-symbol FFTs + int k = i*hsym + 0.5; + if(k > 56*96000) break; dataSink(k); qApp->processEvents(); // Allow the waterfall to update } diff --git a/qmap/mainwindow.h b/qmap/mainwindow.h index e5551c8ec..2709278ac 100644 --- a/qmap/mainwindow.h +++ b/qmap/mainwindow.h @@ -113,7 +113,7 @@ private: qint32 m_modeQ65; qint32 m_dB; qint32 m_fetched=0; - qint32 m_hsymStop=302; + qint32 m_hsymStop=371; qint32 m_nTransmitted=0; qint32 m_nDoubleClicked=0;