Merge branch 'hotfix-wsjtx-2.0.0-rc2' of bitbucket.org:k1jt/wsjtx into hotfix-wsjtx-2.0.0-rc2

lib/genmsk40.f90

@@ -1,7 +1,7 @@
 subroutine genmsk40(msg,msgsent,ichk,itone,itype)
 
   use hashing
-  character*22 msg,msgsent,hashmsg
+  character*37 msg,msgsent,hashmsg
   character*4 crpt,rpt(0:15)
   logical first
   integer*4 itone(144)

lib/msk144decodeframe.f90

@@ -101,8 +101,13 @@ subroutine msk144decodeframe(c,softbits,msgreceived,nsuccess,recent_calls,nrecen
   if( nharderror .ge. 0 .and. nharderror .lt. 18 ) then
     nsuccess=1
     write(c77,'(77i1)') decoded77
-    call unpack77(c77,msgreceived,unpk77_success)
-    if(.not.unpk77_success) nsuccess=0
+    read(c77(72:77),'(2b3)'),n3,i3
+    if( (i3.eq.0.and.(n3.eq.1 .or. n3.eq.3 .or. n3.eq.4 .or. n3.gt.5)) .or. i3.eq.3 .or. i3.gt.4 ) then
+        nsuccess=0 
+    else 
+        call unpack77(c77,msgreceived,unpk77_success)
+        if(.not.unpk77_success) nsuccess=0
+    endif
   endif
 
   return

lib/msk144sim.f90

@@ -38,8 +38,13 @@ program msk144sim
   ichk=0
   itype=1
   call genmsk_128_90(msg,ichk,msgsent,itone,itype) 
-  twopi=8.d0*atan(1.d0)
+  write(*,*) 'Requested message: ',msg
+  write(*,*) 'Message sent     : ',msgsent
+  write(*,*) 'Tones: '
+  write(*,'(1x,72i1)') itone(1:72)
+  write(*,'(1x,72i1)') itone(73:144)
 
+  twopi=8.d0*atan(1.d0)
   nsym=144
   nsps=6*nslow
   if( itone(41) .lt. 0 ) nsym=40
@@ -49,7 +54,7 @@ program msk144sim
   phi=0.0
   k=0
   nreps=NMAX/(nsym*nsps)
-  print*,nsym,nslow,nsps,baud,freq
+
   do jrep=1,nreps
     do i=1,nsym
       if( itone(i) .eq. 0 ) then