From 5d94775c7de85573171456b6e0bc60b864d455f7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 9 Dec 2023 13:25:07 -0500 Subject: [PATCH] Change nmode to nBaseSubmode, and don't allow for a JT65 mode. --- qmap/commons.h | 4 ++-- qmap/libqmap/qmapa.f90 | 4 ++-- qmap/mainwindow.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qmap/commons.h b/qmap/commons.h index ad77fb396..328c14f6e 100644 --- a/qmap/commons.h +++ b/qmap/commons.h @@ -30,7 +30,7 @@ extern struct { //This is "common/datcom/..." in Fortran int junk_1; int nfsample; //Input sample rate 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 nsave; //Number of s3(64,63) spectra saved 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 nfsample; //Input sample rate 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 nsave; //Number of s3(64,63) spectra saved int max_drift; //Maximum Q65 drift: units symbol_rate/TxT diff --git a/qmap/libqmap/qmapa.f90 b/qmap/libqmap/qmapa.f90 index b1caa9413..e16dc4faf 100644 --- a/qmap/libqmap/qmapa.f90 +++ b/qmap/libqmap/qmapa.f90 @@ -1,6 +1,6 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & 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. @@ -36,7 +36,7 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & nkhz_center=nint(1000.0*(fcenter-int(fcenter))) mfa=nfa-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 f0_selected=fselected - nkhz_center + 48.0 diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 42b1ac0d9..519e66b20 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -857,7 +857,7 @@ void MainWindow::decode() //decode() datcom_.nfsample=96000; if(!m_fs96000) datcom_.nfsample=95238; datcom_.nxpol=0; - datcom_.nmode=10*m_modeQ65; + datcom_.nBaseSubmode=m_modeQ65; datcom_.nsave=m_nsave; datcom_.max_drift=ui->sbMaxDrift->value(); datcom_.offset=ui->sbOffset->value();