sequencer stuff to accommodate wsjtx

Author: Wayne, W5XD. Round Rock

AssemblyVersionInfo.cs

@@ -9,7 +9,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.0.3")]
-[assembly: AssemblyFileVersion("2.6.0.3")]
+[assembly: AssemblyVersion("2.6.0.4")]
+[assembly: AssemblyFileVersion("2.6.0.4")]
 //    If you plan to give the built files ot another Op, please add your callsign in the Version string.
-[assembly: AssemblyInformationalVersion("2.6.0.3 BETA built by - YOURCALLSIGN")]
+[assembly: AssemblyInformationalVersion("2.6.0.4 BETA built by - YOURCALLSIGN")]

InstallDigiRite/Product.wxs

@@ -17,7 +17,7 @@
 !!
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-    <?define VersionNumber = 206.0.3.0 ?>
+    <?define VersionNumber = 206.0.4.0 ?>
     <?define BuildersName = PUT YOUR NAME HERE ?>
     <!--The numbering convention depends on the number of the WSJTX build DigiRite is derived from. Call that number A.B.C.
         For DigiRite, this installer version number is AB.C.D.0 where AB is 100 times A plus B, and D is the

InstallDigiRiteX64/ProductX64.wxs

@@ -4,7 +4,7 @@ GUIDS: UpgradeCode MUST match between x64 and x86
 All other GUIDs must NOT match.
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-    <?define VersionNumber = 206.0.3.0 ?>
+    <?define VersionNumber = 206.0.4.0 ?>
     <?define BuildersName = PUT YOUR NAME HERE ?>
     <!--The numbering convention depends on the number of the WSJTX build DigiRite is derived from. Call that number A.B.C.
         For DigiRite, this installer version number is AB.C.D.0 where AB is 100 time A plus B, and D is the

Qso2MessageExchange.cs

@@ -124,6 +124,7 @@ public interface IQsoSequencerCallbacks
         private bool haveLoggedReport = false;
         private bool haveSentReport = false;
         private bool haveSentGrid = false;
+        private bool haveReceivedQsl = false;
         private bool haveReceivedWrongExchange = false;
         private string ackOfAckGrid;
         private int AckMoreAcks = 0;
@@ -183,7 +184,7 @@ public void OnReceived(bool directlyToMe, CallQsled callQsled, XDpack77.Pack77Me
                 if (!String.IsNullOrEmpty(gs))
                 {   // received a grid
                     haveGrid = true;
-                    if (!msgHasR)
+                    if (!msgHasR && !directlyToMe && !haveReceivedQsl)
                         eToSend = () => cb.SendExchange(ExchangeTypes.GRID_SQUARE, haveGrid & haveReport, () =>
                             { haveSentGrid = true; });
                 }
@@ -192,7 +193,7 @@ public void OnReceived(bool directlyToMe, CallQsled callQsled, XDpack77.Pack77Me
                     if (rp > XDpack77.Pack77Message.Message.NO_DB)
                     {   // received a dB report
                         haveReport = true;
-                        if (!msgHasR)
+                        if (!msgHasR && !haveReceivedQsl)
                             eToSend = () => cb.SendExchange(ExchangeTypes.DB_REPORT, haveReport & haveGrid, () =>
                                 { haveSentReport = true; });
                     }
@@ -214,10 +215,10 @@ public void OnReceived(bool directlyToMe, CallQsled callQsled, XDpack77.Pack77Me
             if (eToSend == null && !haveReceivedWrongExchange)
             {
                 if (!haveReport)
-                    eToSend = () => cb.SendExchange(ExchangeTypes.DB_REPORT, haveReport, () =>
+                    eToSend = () => cb.SendExchange(ExchangeTypes.DB_REPORT, haveReport & haveGrid, () =>
                         { haveSentReport = true; });
                 else if (!haveGrid)
-                    eToSend = () => cb.SendExchange(ExchangeTypes.GRID_SQUARE, haveGrid, () =>
+                    eToSend = () => cb.SendExchange(ExchangeTypes.GRID_SQUARE, haveReport & haveGrid, () =>
                         { haveSentGrid = true; });
                 else if (directlyToMe && haveSentReport)
                 {
@@ -231,10 +232,12 @@ public void OnReceived(bool directlyToMe, CallQsled callQsled, XDpack77.Pack77Me
                     };
                 }
             }
+            if (msgHasR)
+                haveReceivedQsl = true;
             bool isMe = callQsled == CallQsled.IsMe || directlyToMe;
             XDpack77.Pack77Message.QSL qsl = msg as XDpack77.Pack77Message.QSL;
             // is this message a QSL to end the QSO?
-            if (callQsled != CallQsled.None)
+            if (callQsled != CallQsled.None || haveReceivedQsl)
             {
                 if (haveReceivedWrongExchange)
                     return;
@@ -261,6 +264,7 @@ public void OnReceived(bool directlyToMe, CallQsled callQsled, XDpack77.Pack77Me
                         return;
                     }
                 };
+                haveReceivedQsl = true;
                 // do it now? or wait to see if multi-streaming partner sends a message directlyToMe
                 if (isMe)
                     toDoOnAck();