w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 13:30:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change nmode to nBaseSubmode, and don't allow for a JT65 mode.

Browse Source
This commit is contained in:
Joe Taylor 2023-12-09 13:25:07 -05:00
parent 91c0e43ef6
commit 5d94775c7d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmap/commons.h
View File

@ -30,7 +30,7 @@ extern struct { //This is "common/datcom/..." in Fortran
int junk_1; int junk_1;
int nfsample; //Input sample rate int nfsample; //Input sample rate
int nxpol; //1 if using xpol antennas, 0 otherwise int nxpol; //1 if using xpol antennas, 0 otherwise
int nmode; //nmode = 10*m_modeQ65 + m_modeJT65 int nBaseSubmode; //Base submode for Q65-60x (aka m_modeQ65)
int ndop00; //EME Self Doppler int ndop00; //EME Self Doppler
int nsave; //Number of s3(64,63) spectra saved int nsave; //Number of s3(64,63) spectra saved
int max_drift; //Maximum Q65 drift: units symbol_rate/TxT int max_drift; //Maximum Q65 drift: units symbol_rate/TxT
@ -70,7 +70,7 @@ extern struct { //This is "common/datcom/..." in Fortran
int junk_1; int junk_1;
int nfsample; //Input sample rate int nfsample; //Input sample rate
int nxpol; //1 if using xpol antennas, 0 otherwise int nxpol; //1 if using xpol antennas, 0 otherwise
int nmode; //nmode = 10*m_modeQ65 + m_modeJT65 int nBaseSubmode; //Base submode for Q65-60x (aka m_modeQ65)
int ndop00; //EME Self Doppler int ndop00; //EME Self Doppler
int nsave; //Number of s3(64,63) spectra saved int nsave; //Number of s3(64,63) spectra saved
int max_drift; //Maximum Q65 drift: units symbol_rate/TxT int max_drift; //Maximum Q65 drift: units symbol_rate/TxT

4
qmap/libqmap/qmapa.f90
View File

@ -1,6 +1,6 @@
subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
mousedf,mousefqso,nagain,nfshift,max_drift,offset,nfcal,mycall, & mousedf,mousefqso,nagain,nfshift,max_drift,offset,nfcal,mycall, &
hiscall,hisgrid,nfsample,nmode,ndepth,datetime,ndop00,fselected) hiscall,hisgrid,nfsample,nBaseSubmode,ndepth,datetime,ndop00,fselected)
! Processes timf2 data received from Linrad to find and decode Q65 signals. ! Processes timf2 data received from Linrad to find and decode Q65 signals.
@ -36,7 +36,7 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
nkhz_center=nint(1000.0*(fcenter-int(fcenter))) nkhz_center=nint(1000.0*(fcenter-int(fcenter)))
mfa=nfa-nkhz_center+48 mfa=nfa-nkhz_center+48
mfb=nfb-nkhz_center+48 mfb=nfb-nkhz_center+48
mode_q65=nmode/10 mode_q65=nBaseSubmode
nts_q65=2**(mode_q65-1) !Q65 tone separation factor nts_q65=2**(mode_q65-1) !Q65 tone separation factor
f0_selected=fselected - nkhz_center + 48.0 f0_selected=fselected - nkhz_center + 48.0

2
qmap/mainwindow.cpp
View File

@ -857,7 +857,7 @@ void MainWindow::decode() //decode()
datcom_.nfsample=96000; datcom_.nfsample=96000;
if(!m_fs96000) datcom_.nfsample=95238; if(!m_fs96000) datcom_.nfsample=95238;
datcom_.nxpol=0; datcom_.nxpol=0;
datcom_.nmode=10*m_modeQ65; datcom_.nBaseSubmode=m_modeQ65;
datcom_.nsave=m_nsave; datcom_.nsave=m_nsave;
datcom_.max_drift=ui->sbMaxDrift->value(); datcom_.max_drift=ui->sbMaxDrift->value();
datcom_.offset=ui->sbOffset->value(); datcom_.offset=ui->sbOffset->value();