w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change the Q65 value of nsps from 7680 to 7200.

Browse Source
This commit is contained in:
Joe Taylor 2020-10-25 14:10:38 -04:00
parent 9b452e8f99
commit 7a22e6a2e1
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/q65_decode.f90
View File

@ -71,7 +71,7 @@ contains
else if(ntrperiod.eq.30) then else if(ntrperiod.eq.30) then
nsps=3600 nsps=3600
else if(ntrperiod.eq.60) then else if(ntrperiod.eq.60) then
nsps=7680 nsps=7200
else if(ntrperiod.eq.120) then else if(ntrperiod.eq.120) then
nsps=16000 nsps=16000
else if(ntrperiod.eq.300) then else if(ntrperiod.eq.300) then

2
lib/qra/qra65/q65sim.f90
View File

@ -54,7 +54,7 @@ program q65sim
else if(ntrperiod.eq.30) then else if(ntrperiod.eq.30) then
nsps=3600 nsps=3600
else if(ntrperiod.eq.60) then else if(ntrperiod.eq.60) then
nsps=7680 nsps=7200
else if(ntrperiod.eq.120) then else if(ntrperiod.eq.120) then
nsps=16000 nsps=16000
else if(ntrperiod.eq.300) then else if(ntrperiod.eq.300) then

2
lib/qra_loops.f90
View File

@ -118,7 +118,7 @@ subroutine qra_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
ndist=ndistx ndist=ndistx
endif endif
200 if(mode.eq.65 .and. nsps.eq.7680/2) xdt=xdt+0.4 !### Empirical -- WHY ??? ### 200 if(mode.eq.65 .and. nsps.eq.7200/2) xdt=xdt+0.4 !### Empirical -- WHY ??? ###
if(irc.ge.0) then if(irc.ge.0) then
navg=nsave navg=nsave

2
lib/test_q65.f90
View File

@ -38,7 +38,7 @@ program test_q65
nsps=3600 nsps=3600
i50=-24 i50=-24
else if(ntrperiod.eq.60) then else if(ntrperiod.eq.60) then
nsps=7680 nsps=7200
i50=-28 i50=-28
else if(ntrperiod.eq.120) then else if(ntrperiod.eq.120) then
nsps=16000 nsps=16000

2
lib/test_qra64.f90
View File

@ -31,7 +31,7 @@ program test_qra64
call getarg(9,arg) call getarg(9,arg)
read(arg,*) nsnr read(arg,*) nsnr
nsps=7680 nsps=6192
i50=-28 i50=-28
ia=-20 ia=-20
ib=-33 ib=-33

4
widgets/mainwindow.cpp
View File

@ -3730,7 +3730,7 @@ void MainWindow::guiUpdate()
if(m_modeTx=="Q65") { // Q65 if(m_modeTx=="Q65") { // Q65
if(m_TRperiod==15) txDuration=0.5 + 85*1800/12000.0; if(m_TRperiod==15) txDuration=0.5 + 85*1800/12000.0;
if(m_TRperiod==30) txDuration=0.5 + 85*3600/12000.0; if(m_TRperiod==30) txDuration=0.5 + 85*3600/12000.0;
if(m_TRperiod==60) txDuration=1.0 + 85*7680/12000.0; if(m_TRperiod==60) txDuration=1.0 + 85*7200/12000.0;
if(m_TRperiod==120) txDuration=1.0 + 85*16000/12000.0; if(m_TRperiod==120) txDuration=1.0 + 85*16000/12000.0;
if(m_TRperiod==300) txDuration=1.0 + 85*41472/12000.0; if(m_TRperiod==300) txDuration=1.0 + 85*41472/12000.0;
} }
@ -7315,7 +7315,7 @@ void MainWindow::transmit (double snr)
if (m_modeTx == "Q65") { if (m_modeTx == "Q65") {
int nsps=1800; int nsps=1800;
if(m_TRperiod==30) nsps=3600; if(m_TRperiod==30) nsps=3600;
if(m_TRperiod==60) nsps=7680; if(m_TRperiod==60) nsps=7200;
if(m_TRperiod==120) nsps=16000; if(m_TRperiod==120) nsps=16000;
if(m_TRperiod==300) nsps=41472; if(m_TRperiod==300) nsps=41472;
int mode65=pow(2.0,double(m_nSubMode)); int mode65=pow(2.0,double(m_nSubMode));

2
widgets/plotter.cpp
View File

@ -475,7 +475,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
int h=int(pow(2.0,m_nSubMode)); int h=int(pow(2.0,m_nSubMode));
int nsps=1800; int nsps=1800;
if(m_TRperiod==30) nsps=3600; if(m_TRperiod==30) nsps=3600;
if(m_TRperiod==60) nsps=7680; if(m_TRperiod==60) nsps=7200;
if(m_TRperiod==120) nsps=16000; if(m_TRperiod==120) nsps=16000;
if(m_TRperiod==300) nsps=41472; if(m_TRperiod==300) nsps=41472;
float baud=12000.0/nsps; float baud=12000.0/nsps;