w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-27 07:36:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implementing new Type 5 messages for EU VHF contests.

Browse Source
This commit is contained in:
Joe Taylor 2020-04-21 13:48:47 -04:00
parent b847d6b32b
commit 00e8027c29
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ft8/ft8b.f90
View File

@ -422,9 +422,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, &
write(c77,'(77i1)') message77 write(c77,'(77i1)') message77
read(c77(72:74),'(b3)') n3 read(c77(72:74),'(b3)') n3
read(c77(75:77),'(b3)') i3 read(c77(75:77),'(b3)') i3
if(i3.gt.4 .or. (i3.eq.0.and.n3.gt.5)) then if(i3.gt.5 .or. (i3.eq.0.and.n3.gt.6)) cycle
cycle
endif
call unpack77(c77,1,msg37,unpk77_success) call unpack77(c77,1,msg37,unpk77_success)
if(.not.unpk77_success) then if(.not.unpk77_success) then
cycle cycle

3
lib/ft8/ft8sim.f90
View File

@ -27,6 +27,7 @@ program ft8sim_gfsk
print*,'Examples: ft8sim "K1ABC W9XYZ EN37" 1500.0 0.0 0.1 1.0 10 -18' print*,'Examples: ft8sim "K1ABC W9XYZ EN37" 1500.0 0.0 0.1 1.0 10 -18'
print*,' ft8sim "WA9XYZ/R KA1ABC/R FN42" 1500.0 0.0 0.1 1.0 10 -18' print*,' ft8sim "WA9XYZ/R KA1ABC/R FN42" 1500.0 0.0 0.1 1.0 10 -18'
print*,' ft8sim "K1ABC RR73; W9XYZ <KH1/KH7Z> -11" 300 0 0 0 25 1 -10' print*,' ft8sim "K1ABC RR73; W9XYZ <KH1/KH7Z> -11" 300 0 0 0 25 1 -10'
print*,' ft8sim "<G4ABC/P> <PA9XYZ> R 570007 JO22DB" 1500 0 0 0 1 -10'
go to 999 go to 999
endif endif
call getarg(1,msg37) !Message to be transmitted call getarg(1,msg37) !Message to be transmitted
@ -71,7 +72,7 @@ program ft8sim_gfsk
call gen_ft8wave(itone,NN,NSPS,bt,fs,f0,cwave,xjunk,1,NWAVE) !Generate complex cwave call gen_ft8wave(itone,NN,NSPS,bt,fs,f0,cwave,xjunk,1,NWAVE) !Generate complex cwave
write(*,*) write(*,*)
write(*,'(a23,a37,3x,a7,i1,a1,i1)') 'New Style FT8 Message: ',msgsent37,'i3.n3: ',i3,'.',n3 write(*,'(a23,a37,3x,a7,i1,a1,i1)') 'Decoded message: ',msgsent37,'i3.n3: ',i3,'.',n3
write(*,1000) f0,xdt,txt,snrdb,bw write(*,1000) f0,xdt,txt,snrdb,bw
1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, & 1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, &
' BW:',f4.1) ' BW:',f4.1)