From e1c74fd828aac69a6893bdd82b8c32dc2b5d4df6 Mon Sep 17 00:00:00 2001
From: Steve Franke <s.j.franke@icloud.com>
Date: Thu, 20 Sep 2018 09:49:42 -0500
Subject: [PATCH 1/3] Fix message lengths in genmsk40. Also some tweaks to
 msk144sim.f90.

---
 lib/genmsk40.f90  | 2 +-
 lib/msk144sim.f90 | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/genmsk40.f90 b/lib/genmsk40.f90
index 3310b1066..80411819f 100644
--- a/lib/genmsk40.f90
+++ b/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)
diff --git a/lib/msk144sim.f90 b/lib/msk144sim.f90
index 32da98f72..0bc64764f 100644
--- a/lib/msk144sim.f90
+++ b/lib/msk144sim.f90
@@ -38,8 +38,13 @@ program msk144sim
   ichk=0
   itype=1
   call genmsk_128_90(msg,ichk,msgsent,itone,itype) 
+  write(*,*) 'Requested message: ',msg
+  write(*,*) 'Message sent     : ',msgsent
+  write(*,*) 'Tones: '
+  write(*,'(72i1)') itone(1:72)
+  write(*,'(72i1)') itone(72:144)
+  write(*,*) itype
   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

From 981c0122ae399111ce9286a8d0277babaebe8235 Mon Sep 17 00:00:00 2001
From: Steve Franke <s.j.franke@icloud.com>
Date: Thu, 20 Sep 2018 10:10:29 -0500
Subject: [PATCH 2/3] Tweak msk144sim.f90

---
 lib/msk144sim.f90 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/msk144sim.f90 b/lib/msk144sim.f90
index 0bc64764f..fe2959cea 100644
--- a/lib/msk144sim.f90
+++ b/lib/msk144sim.f90
@@ -41,9 +41,9 @@ program msk144sim
   write(*,*) 'Requested message: ',msg
   write(*,*) 'Message sent     : ',msgsent
   write(*,*) 'Tones: '
-  write(*,'(72i1)') itone(1:72)
-  write(*,'(72i1)') itone(72:144)
-  write(*,*) itype
+  write(*,'(1x,72i1)') itone(1:72)
+  write(*,'(1x,72i1)') itone(73:144)
+
   twopi=8.d0*atan(1.d0)
   nsym=144
   nsps=6*nslow

From fa44270d5f9cf6156277e4e99bc720078af0ec41 Mon Sep 17 00:00:00 2001
From: Steve Franke <s.j.franke@icloud.com>
Date: Thu, 20 Sep 2018 10:38:36 -0500
Subject: [PATCH 3/3] Don't display DXpedition, Field Day, or ARRL RTTY
 messages in MSK144.

---
 lib/msk144decodeframe.f90 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/msk144decodeframe.f90 b/lib/msk144decodeframe.f90
index e72e94289..c3531673f 100644
--- a/lib/msk144decodeframe.f90
+++ b/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