Added some decoder logging and js8 tone generation tweaks to ensure the right costas is getting generated for the right submode

2020-01-04 15:55:20 -05:00
parent ecf77ba04e
commit 3875de4950
13 changed files with 39 additions and 127 deletions
@@ -1,31 +0,0 @@
-subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym,iaptype)
-  parameter(NAPM=4,KK=87)
-  character*12 mycall12,hiscall12
-  character*22 msg,msgsent
-  character*6 mycall,hiscall
-  character*6 mygrid6,hisgrid6
-  character*4 hisgrid
-  logical bcontest
-  integer apsym(KK)
-  integer*1 msgbits(KK)
-  integer itone(KK)
-  
-!  mycall=mycall12(1:6)
-!  hiscall=hiscall12(1:6)
-!  hisgrid=hisgrid6(1:4)
-!  if(len_trim(hiscall).eq.0) then
-!    iaptype=1
-!    hiscall="K9AN"
-!  else 
-!    iaptype=2
-!  endif
-!  hisgrid=hisgrid6(1:4)
-!!  if(len_trim(hisgrid).eq.0) hisgrid="EN50"
-!  if(index(hisgrid," ").eq.0) hisgrid="EN50"
-  msg='tZQpZP-slh4+'                            ! HELLO WORLD
-  i3bit=0                                       ! ### TEMPORARY ??? ###
-  call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone)
-  apsym=2*msgbits-1
-  
-  return
-end subroutine ft8apset
@@ -1,69 +0,0 @@
-subroutine genft8(msg,mygrid,bcontest,i3bit,msgsent,msgbits,itone)
-
-! Encode an FT8 message, producing array itone().
-  
-  use crc
-  use packjt
-  include 'ft8_params.f90'
-  character*68 alphabet
-  character*22 msg,msgsent
-  character*6 mygrid
-  character*87 cbits
-  logical bcontest,checksumok
-  integer*4 i4Msg6BitWords(12)                !72-bit message as 6-bit words
-  integer*1 msgbits(KK),codeword(3*ND)
-  integer*1, target:: i1Msg8BitBytes(11)
-  integer itone(NN)
-  integer icos7(0:6)
-  data icos7/4,2,5,6,1,3,0/                   !Costas 7x7 tone pattern
-
-  alphabet='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-+/?.'
-  
-  itype=6
-  do i=1,12
-    v=index(alphabet, msg(i:i))
-    if(v.eq.0) exit
-    i4Msg6BitWords(i)=v - 1
-  enddo
-  msgsent='                      '
-  msgsent(1:12)=msg(1:12)
-
-  ! call packmsg(msg,i4Msg6BitWords,itype,bcontest) !Pack into 12 6-bit bytes
-  ! call unpackmsg(i4Msg6BitWords,msgsent,bcontest,mygrid) !Unpack to get msgsent
-
-  write(cbits,1000) i4Msg6BitWords,32*i3bit
-1000 format(12b6.6,b8.8)
-  read(cbits,1001) i1Msg8BitBytes(1:10)
-1001 format(10b8)
-  i1Msg8BitBytes(10)=iand(i1Msg8BitBytes(10),transfer(128+64+32,0_1))
-  i1Msg8BitBytes(11)=0
-  icrc12=crc12(c_loc(i1Msg8BitBytes),11)
-  icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here
-
-! For reference, here's how to check the CRC
-!  i1Msg8BitBytes(10)=icrc12/256
-!  i1Msg8BitBytes(11)=iand (icrc12,255)
-!  checksumok = crc12_check(c_loc (i1Msg8BitBytes), 11)
-!  if( checksumok ) write(*,*) 'Good checksum'
-
-  write(cbits,1003) i4Msg6BitWords,i3bit,icrc12
-1003 format(12b6.6,b3.3,b12.12)
-  read(cbits,1004) msgbits
-1004 format(87i1)
-
-  call encode174(msgbits,codeword)      !Encode the test message
-
-! Message structure: S7 D29 S7 D29 S7
-  itone(1:7)=icos7
-  itone(36+1:36+7)=icos7
-  itone(NN-6:NN)=icos7
-  k=7
-  do j=1,ND
-     i=3*j -2
-     k=k+1
-     if(j.eq.30) k=k+7
-     itone(k)=codeword(i)*4 + codeword(i+1)*2 + codeword(i+2)
-  enddo
-
-  return
-end subroutine genft8