mirror of https://github.com/saitohirga/WSJT-X.git
More progress toward switching to (i3,n3). wsjtx runs without crashing now.
This commit is contained in:
parent
c39dd63f79
commit
91b7544ba1
|
@ -16,7 +16,7 @@ subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym)
|
||||||
hisgrid=hisgrid6(1:4)
|
hisgrid=hisgrid6(1:4)
|
||||||
if(index(hisgrid," ").eq.0) hisgrid="AA00"
|
if(index(hisgrid," ").eq.0) hisgrid="AA00"
|
||||||
msg=mycall//' '//hiscall//' '//hisgrid
|
msg=mycall//' '//hiscall//' '//hisgrid
|
||||||
i3=0 ! ### TEMPORARY ??? ###
|
i3=1 ! ### TEMPORARY ??? ###
|
||||||
n3=0 !TEMPORARY
|
n3=0 !TEMPORARY
|
||||||
call genft8(msg,mygrid6,bcontest,i3,n3,msgsent,msgbits,itone)
|
call genft8(msg,mygrid6,bcontest,i3,n3,msgsent,msgbits,itone)
|
||||||
apsym=2*msgbits-1
|
apsym=2*msgbits-1
|
||||||
|
|
|
@ -16,8 +16,9 @@ subroutine ft8apset_174_91(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym)
|
||||||
hisgrid=hisgrid6(1:4)
|
hisgrid=hisgrid6(1:4)
|
||||||
if(index(hisgrid," ").eq.0) hisgrid="AA00"
|
if(index(hisgrid," ").eq.0) hisgrid="AA00"
|
||||||
msg=mycall//' '//hiscall//' '//hisgrid
|
msg=mycall//' '//hiscall//' '//hisgrid
|
||||||
i5bit=0 ! ### TEMPORARY ??? ###
|
i3=1 ! ### TEMPORARY ??? ###
|
||||||
call genft8_174_91(msg,mygrid6,bcontest,i5bit,msgsent,msgbits,itone)
|
n3=0
|
||||||
|
call genft8_174_91(msg,mygrid6,bcontest,i3,n3,msgsent,msgbits,itone)
|
||||||
apsym=2*msgbits-1
|
apsym=2*msgbits-1
|
||||||
return
|
return
|
||||||
end subroutine ft8apset_174_91
|
end subroutine ft8apset_174_91
|
||||||
|
|
|
@ -380,8 +380,10 @@ subroutine ft8b_1(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
|
||||||
if(i3bit.eq.1) decoded(57:)=0
|
if(i3bit.eq.1) decoded(57:)=0
|
||||||
call extractmessage174(decoded,message,ncrcflag)
|
call extractmessage174(decoded,message,ncrcflag)
|
||||||
decoded=decoded0
|
decoded=decoded0
|
||||||
! This needs fixing for messages with i3bit=1:
|
! This needs fixing for messages with i3bit=1:
|
||||||
call genft8(message,mygrid6,bcontest,i3bit,0,msgsent,msgbits,itone)
|
i3=1 !TEMPORARY
|
||||||
|
n3=0
|
||||||
|
call genft8(message,mygrid6,bcontest,i3,0,msgsent,msgbits,itone)
|
||||||
if(lsubtract) call subtractft8(dd0,itone,f1,xdt2)
|
if(lsubtract) call subtractft8(dd0,itone,f1,xdt2)
|
||||||
xsig=0.0
|
xsig=0.0
|
||||||
xnoi=0.0
|
xnoi=0.0
|
||||||
|
|
|
@ -20,6 +20,7 @@ subroutine genft8(msg,mygrid,bcontest,i3,n3,msgsent,msgbits,itone)
|
||||||
itype=1
|
itype=1
|
||||||
if( ( i3.eq.0 .and. n3.ge.2) .or. i3.ge.2 ) itype=2
|
if( ( i3.eq.0 .and. n3.ge.2) .or. i3.ge.2 ) itype=2
|
||||||
write(*,*) 'generating type ',itype,' message'
|
write(*,*) 'generating type ',itype,' message'
|
||||||
|
write(*,*) 'msg ',msg
|
||||||
if(itype.eq.2 ) goto 900
|
if(itype.eq.2 ) goto 900
|
||||||
|
|
||||||
call packmsg(msg,i4Msg6BitWords,itype,bcontest) !Pack into 12 6-bit bytes
|
call packmsg(msg,i4Msg6BitWords,itype,bcontest) !Pack into 12 6-bit bytes
|
||||||
|
|
Loading…
Reference in New Issue