diff --git a/lib/ft8/chkcrc12a.f90 b/lib/ft8/chkcrc12a.f90 index c8b2c88..8188863 100644 --- a/lib/ft8/chkcrc12a.f90 +++ b/lib/ft8/chkcrc12a.f90 @@ -16,7 +16,7 @@ subroutine chkcrc12a(decoded,nbadcrc) i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32) i1Dec8BitBytes(11)=0 icrc12=crc12(c_loc(i1Dec8BitBytes),11) !CRC12 computed from 75 msg bits - ! icrc12=xor(icrc12, 41) ! TODO: jsherer - could change the crc here + icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here nbadcrc=1 if(ncrc12.eq.icrc12) nbadcrc=0 diff --git a/lib/ft8/extractmessage174.f90 b/lib/ft8/extractmessage174.f90 index 7086973..4221f38 100644 --- a/lib/ft8/extractmessage174.f90 +++ b/lib/ft8/extractmessage174.f90 @@ -22,9 +22,9 @@ subroutine extractmessage174(decoded,msgreceived,ncrcflag) i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32) i1Dec8BitBytes(11)=0 icrc12=crc12(c_loc(i1Dec8BitBytes),11) !CRC12 computed from 75 msg bits -! icrc12=xor(icrc12, 41) ! TODO: jsherer - could change the crc here + icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here - if(ncrc12.eq.icrc12 .or. sum(decoded(57:87)).eq.0) then !### Kludge ### + if(ncrc12.eq.icrc12) then ! .or. sum(decoded(57:87)).eq.0) then !### Kludge ### ! CRC12 checks out --- unpack 72-bit message do ibyte=1,12 itmp=0 diff --git a/lib/ft8/genft8.f90 b/lib/ft8/genft8.f90 index a8ad7fb..6575b22 100644 --- a/lib/ft8/genft8.f90 +++ b/lib/ft8/genft8.f90 @@ -38,7 +38,7 @@ subroutine genft8(msg,mygrid,bcontest,i3bit,msgsent,msgbits,itone) i1Msg8BitBytes(10)=iand(i1Msg8BitBytes(10),128+64+32) i1Msg8BitBytes(11)=0 icrc12=crc12(c_loc(i1Msg8BitBytes),11) -! icrc12=xor(icrc12, 41) ! TODO: jsherer - could change the crc here + icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here ! For reference, here's how to check the CRC ! i1Msg8BitBytes(10)=icrc12/256 diff --git a/lib/ft8/ldpcsim174.f90 b/lib/ft8/ldpcsim174.f90 index f153db3..53a6b10 100644 --- a/lib/ft8/ldpcsim174.f90 +++ b/lib/ft8/ldpcsim174.f90 @@ -91,7 +91,7 @@ allocate ( rxdata(N), llr(N) ) i1Msg8BitBytes(10:11)=0 checksum = crc12 (c_loc (i1Msg8BitBytes), 11) -! checksum = xor(checksum, 41) ! TODO: jsherer - could change the crc here + checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here ! For reference, the next 3 lines show how to check the CRC i1Msg8BitBytes(10)=checksum/256 i1Msg8BitBytes(11)=iand (checksum,255)