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

Add parameters for FT8 and Ft2 to wavhdr.f90.

Browse Source
This commit is contained in:
Joe Taylor 2019-01-18 07:45:59 -05:00
parent 9b483d5ee1
commit c6bc3c64bb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/wavhdr.f90
View File

@ -37,17 +37,17 @@ module wavhdr
subroutine set_wsjtx_wav_params(fMHz,mode,nsubmode,ntrperiod,id2) subroutine set_wsjtx_wav_params(fMHz,mode,nsubmode,ntrperiod,id2)
parameter (NBANDS=23,NMODES=11) parameter (NBANDS=23,NMODES=13)
character*8 mode,modes(NMODES) character*8 mode,modes(NMODES)
integer*2 id2(4) integer*2 id2(4)
integer iperiod(7) integer iperiod(8)
real fband(NBANDS) real fband(NBANDS)
data fband/0.137,0.474,1.8,3.5,5.1,7.0,10.14,14.0,18.1,21.0,24.9, & data fband/0.137,0.474,1.8,3.5,5.1,7.0,10.14,14.0,18.1,21.0,24.9, &
28.0,50.0,144.0,222.0,432.0,902.0,1296.0,2304.0,3400.0, & 28.0,50.0,144.0,222.0,432.0,902.0,1296.0,2304.0,3400.0, &
5760.0,10368.0,24048.0/ 5760.0,10368.0,24048.0/
data modes/'Echo','FSK441','ISCAT','JT4','JT65','JT6M','JT9', & data modes/'Echo','FSK441','ISCAT','JT4','JT65','JT6M','JT9', &
'JT9+JT65','JTMS','JTMSK','WSPR'/ 'JT9+JT65','JTMS','JTMSK','WSPR','FT8','FT2'/
data iperiod/5,10,15,30,60,120,900/ data iperiod/5,10,15,30,60,120,900,0/
dmin=1.e30 dmin=1.e30
iband=0 iband=0
@ -64,7 +64,7 @@ module wavhdr
enddo enddo
ip=0 ip=0
do i=1,7 do i=1,8
if(ntrperiod.eq.iperiod(i)) ip=i if(ntrperiod.eq.iperiod(i)) ip=i
enddo enddo
@ -78,15 +78,15 @@ module wavhdr
subroutine get_wsjtx_wav_params(id2,band,mode,nsubmode,ntrperiod,ok) subroutine get_wsjtx_wav_params(id2,band,mode,nsubmode,ntrperiod,ok)
parameter (NBANDS=23,NMODES=11) parameter (NBANDS=23,NMODES=13)
character*8 mode,modes(NMODES) character*8 mode,modes(NMODES)
character*6 band,bands(NBANDS) character*6 band,bands(NBANDS)
integer*2 id2(4) integer*2 id2(4)
integer iperiod(7) integer iperiod(8)
logical ok logical ok
data modes/'Echo','FSK441','ISCAT','JT4','JT65','JT6M','JT9', & data modes/'Echo','FSK441','ISCAT','JT4','JT65','JT6M','JT9', &
'JT9+JT65','JTMS','JTMSK','WSPR'/ 'JT9+JT65','JTMS','JTMSK','WSPR','FT8','FT2'/
data iperiod/5,10,15,30,60,120,900/ data iperiod/5,10,15,30,60,120,900,0/
data bands/'2190m','630m','160m','80m','60m','40m','30m','20m', & data bands/'2190m','630m','160m','80m','60m','40m','30m','20m', &
'17m','15m','12m','10m','6m','2m','1.25m','70cm','33cm', & '17m','15m','12m','10m','6m','2m','1.25m','70cm','33cm', &
'23cm','13cm','9cm','6cm','3cm','1.25cm'/ '23cm','13cm','9cm','6cm','3cm','1.25cm'/
@ -95,7 +95,7 @@ module wavhdr
if(id2(1).lt.1 .or. id2(1).gt.NBANDS) ok=.false. if(id2(1).lt.1 .or. id2(1).gt.NBANDS) ok=.false.
if(id2(2).lt.1 .or. id2(2).gt.NMODES) ok=.false. if(id2(2).lt.1 .or. id2(2).gt.NMODES) ok=.false.
if(id2(3).lt.1 .or. id2(3).gt.8) ok=.false. if(id2(3).lt.1 .or. id2(3).gt.8) ok=.false.
if(id2(4).lt.1 .or. id2(4).gt.7) ok=.false. if(id2(4).lt.1 .or. id2(4).gt.8) ok=.false.
if(ok) then if(ok) then
band=bands(id2(1)) band=bands(id2(1))