mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-04-11 05:48:33 -04:00
SuperFox messages are now properly assembled at uset level. Next, need to encode.
This commit is contained in:
parent
4c0d34477d
commit
34b97b53f8
@ -17,7 +17,6 @@ subroutine foxgen2(nslots,cmsg)
|
||||
! 4 Call_1 RR73; Call_2 <MyCall> rpt_2
|
||||
|
||||
if(nslots.lt.1 .or. nslots.gt.5) return
|
||||
print*,' '
|
||||
k=0
|
||||
do i=1,nslots
|
||||
hiscall_1=''
|
||||
@ -57,17 +56,85 @@ subroutine foxgen2(nslots,cmsg)
|
||||
!3001 format(i1,2x,a37,1x,a6,1x,a4,1x,a6,1x,a4,1x,a6,1x,a4)
|
||||
|
||||
k=k+1
|
||||
if(ntype.le.3) write(*,3002) i,k,msg(1:22)
|
||||
3002 format(i1,i3,1x,a22)
|
||||
if(ntype.le.3) call sfox_assemble(ntype,k,msg(1:22),mycall,mygrid)
|
||||
if(ntype.eq.4) then
|
||||
sfmsg=w(1)(1:nw(1))//' '//mycall(1:len(trim(mycall))+1)//'RR73'
|
||||
write(*,3002) i,k,sfmsg
|
||||
call sfox_assemble(2,k,sfmsg,mycall,mygrid)
|
||||
sfmsg=w(3)(1:nw(3))//' '//mycall(1:len(trim(mycall))+1)//w(5)(1:3)
|
||||
k=k+1
|
||||
write(*,3002) i,k,sfmsg
|
||||
call sfox_assemble(3,k,sfmsg,mycall,mygrid)
|
||||
endif
|
||||
|
||||
enddo
|
||||
call sfox_assemble(ntype,11,msg(1:22),mycall,mygrid) !k=11 to finish up
|
||||
|
||||
return
|
||||
end subroutine foxgen2
|
||||
|
||||
subroutine sfox_assemble(ntype,k,msg,mycall0,mygrid0)
|
||||
|
||||
character*22 msg
|
||||
character*22 msg0,msg1,msg2(10),msg3(5)
|
||||
character*12 mycall0,mycall
|
||||
character*4 mygrid0,mygrid
|
||||
integer ntype !Message type: 0 Free Text
|
||||
! 1 CQ MyCall MyGrid
|
||||
! 2 Call_1 MyCall RR73
|
||||
! 3 Call_1 MyCall rpt
|
||||
integer nmsg(0:3) !Number of messages of type ntype
|
||||
data nmsg/0,0,0,0/,nbits/0/,ntx/0/
|
||||
save
|
||||
! save mycall,mygrid,nmsg,nbits,ntx
|
||||
|
||||
if(mycall0(1:1).ne.' ') mycall=mycall0
|
||||
if(mygrid0(1:1).ne.' ') mygrid=mygrid0
|
||||
if(k.le.10) then
|
||||
if(ntype.eq.0) then
|
||||
if(nbits.le.262) then
|
||||
nmsg(ntype)=nmsg(ntype)+1
|
||||
nbits=nbits+71
|
||||
msg0=msg
|
||||
endif
|
||||
else if(ntype.eq.1) then
|
||||
if(nbits.le.290) then
|
||||
nmsg(ntype)=nmsg(ntype)+1
|
||||
nbits=nbits+43
|
||||
msg1=msg
|
||||
endif
|
||||
else if(ntype.eq.2) then
|
||||
if(nbits.le.305) then
|
||||
nmsg(ntype)=nmsg(ntype)+1
|
||||
nbits=nbits+28
|
||||
j=nmsg(ntype)
|
||||
msg2(j)=msg
|
||||
endif
|
||||
else
|
||||
if(nbits.le.300) then
|
||||
nmsg(ntype)=nmsg(ntype)+1
|
||||
nbits=nbits+33
|
||||
j=nmsg(ntype)
|
||||
msg3(j)=msg
|
||||
endif
|
||||
endif
|
||||
return
|
||||
endif
|
||||
|
||||
if(k.ge.11) then
|
||||
ntx=ntx+1 !Transmission number
|
||||
write(*,3002) ntx,ntype,nmsg(0:3),nbits
|
||||
3002 format(i3,i5,2x,4i3,i6)
|
||||
if(nmsg(0).ge.1) write(*,3010) ntx,msg0
|
||||
3010 format(i3,2x,a22)
|
||||
if(nmsg(1).ge.1) write(*,3010) ntx,msg1
|
||||
do i=1,nmsg(2)
|
||||
write(*,3010) ntx,msg2(i)
|
||||
enddo
|
||||
do i=1,nmsg(3)
|
||||
write(*,3010) ntx,msg3(i)
|
||||
enddo
|
||||
nmsg=0
|
||||
nbits=0
|
||||
endif
|
||||
|
||||
return
|
||||
end subroutine sfox_assemble
|
||||
|
Loading…
Reference in New Issue
Block a user