diff --git a/lib/ft8/ft8apset.f90 b/lib/ft8/ft8apset.f90 index 08dff8012..c7e5cbe18 100644 --- a/lib/ft8/ft8apset.f90 +++ b/lib/ft8/ft8apset.f90 @@ -16,7 +16,7 @@ subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym) hisgrid=hisgrid6(1:4) if(index(hisgrid," ").eq.0) hisgrid="AA00" msg=mycall//' '//hiscall//' '//hisgrid - i3=0 ! ### TEMPORARY ??? ### + i3=1 ! ### TEMPORARY ??? ### n3=0 !TEMPORARY call genft8(msg,mygrid6,bcontest,i3,n3,msgsent,msgbits,itone) apsym=2*msgbits-1 diff --git a/lib/ft8/ft8apset_174_91.f90 b/lib/ft8/ft8apset_174_91.f90 index f2f2aeb77..11f427f8e 100644 --- a/lib/ft8/ft8apset_174_91.f90 +++ b/lib/ft8/ft8apset_174_91.f90 @@ -16,8 +16,9 @@ subroutine ft8apset_174_91(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym) hisgrid=hisgrid6(1:4) if(index(hisgrid," ").eq.0) hisgrid="AA00" msg=mycall//' '//hiscall//' '//hisgrid - i5bit=0 ! ### TEMPORARY ??? ### - call genft8_174_91(msg,mygrid6,bcontest,i5bit,msgsent,msgbits,itone) + i3=1 ! ### TEMPORARY ??? ### + n3=0 + call genft8_174_91(msg,mygrid6,bcontest,i3,n3,msgsent,msgbits,itone) apsym=2*msgbits-1 return end subroutine ft8apset_174_91 diff --git a/lib/ft8/ft8b_1.f90 b/lib/ft8/ft8b_1.f90 index 05b0ac12c..d2ed64dda 100644 --- a/lib/ft8/ft8b_1.f90 +++ b/lib/ft8/ft8b_1.f90 @@ -380,8 +380,10 @@ subroutine ft8b_1(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & if(i3bit.eq.1) decoded(57:)=0 call extractmessage174(decoded,message,ncrcflag) decoded=decoded0 -! This needs fixing for messages with i3bit=1: - call genft8(message,mygrid6,bcontest,i3bit,0,msgsent,msgbits,itone) +! This needs fixing for messages with i3bit=1: + i3=1 !TEMPORARY + n3=0 + call genft8(message,mygrid6,bcontest,i3,0,msgsent,msgbits,itone) if(lsubtract) call subtractft8(dd0,itone,f1,xdt2) xsig=0.0 xnoi=0.0 diff --git a/lib/ft8/genft8.f90 b/lib/ft8/genft8.f90 index 9400293a2..6d66b5cda 100644 --- a/lib/ft8/genft8.f90 +++ b/lib/ft8/genft8.f90 @@ -20,6 +20,7 @@ subroutine genft8(msg,mygrid,bcontest,i3,n3,msgsent,msgbits,itone) itype=1 if( ( i3.eq.0 .and. n3.ge.2) .or. i3.ge.2 ) itype=2 write(*,*) 'generating type ',itype,' message' +write(*,*) 'msg ',msg if(itype.eq.2 ) goto 900 call packmsg(msg,i4Msg6BitWords,itype,bcontest) !Pack into 12 6-bit bytes