Release 1.77

Signed-off-by: QuantAsylum <git@quantasylum.com>

Author: QuantAsylum

Application/QA350/QA350/Bootloader.cs

@@ -70,9 +70,9 @@ static public void EnterBootloader(FlashStatusCallback statusUpdate)
             }
 
             // Tell the device to enter BSL if we're already connected
-            if (Hardware.IsConnected && Hardware.USBSendData(new byte[] { 0xFF, 0x00 }))
+            if (Hardware.IsConnected)
             {
-                Thread.Sleep(4000);
+                Hardware.EnterBSL();
             }
 
             // Now reconnect with BL. Do not enter this section of code if 
@@ -81,7 +81,6 @@ static public void EnterBootloader(FlashStatusCallback statusUpdate)
             try
             {
                 Hardware.OpenBSL();
-                Thread.Sleep(1000);
 
                 SubmitPassword();  // This might fail and perform mass erase
                 SubmitPassword();  // This will always succeed and perform mass erase
@@ -93,9 +92,8 @@ static public void EnterBootloader(FlashStatusCallback statusUpdate)
 
                 // Run ram-based BSL
                 SetPC(0x2504);
-                Thread.Sleep(4000);
-                Hardware.OpenBSL();
                 Thread.Sleep(1000);
+                Hardware.OpenBSL();
                 Debug.WriteLine("BSL Version: " + GetBSLVersion().ToString("X"));
 
                 // Erase everything

Application/QA350/QA350/Constants.cs

@@ -12,7 +12,7 @@ class Constants
         static public string CalibrationFile = DataFilePath + "CalibrationData.xml";
         static public string SettingsFile = DataFilePath + "QA350Settings.xml";
 
-        static public double Version = 1.76;
+        static public double Version = 1.77;
 
         static public Int32 RequiredFwVersion = 12;
     }

Application/QA350/QA350/Form1.cs

@@ -784,7 +784,7 @@ private void reflashToolStripMenuItem_Click(object sender, EventArgs e)
             LEDKickerTimer.Enabled = false;
             SetUsbStatus("Reflashing...");
 
-            if (MessageBox.Show("You are about to reflash the firmware. If you proceed, it will take 3-4 minutes wihtout any updates until the end. Proceed?", "Important!", MessageBoxButtons.OKCancel) != DialogResult.OK)
+            if (MessageBox.Show("You are about to reflash the firmware. If you proceed, it will take 3-4 minutes without any updates until the end. Proceed?", "Important!", MessageBoxButtons.OKCancel) != DialogResult.OK)
             {
                 LEDKickerTimer.Enabled = true;
                 AcqTimer.Enabled = true;
@@ -793,8 +793,6 @@ private void reflashToolStripMenuItem_Click(object sender, EventArgs e)
 
             AcqTimer.Enabled = false;
             LEDKickerTimer.Enabled = false;
-            Hardware.EnterBSL();
-            Thread.Sleep(2000);
             Bootloader.EnterBootloader(FlashStatusUpdate);
 
             MessageBox.Show("Restart the application and replug the hardware");
@@ -810,6 +808,8 @@ private void reflashToolStripMenuItem_Click(object sender, EventArgs e)
         private void flashVirginDeviceToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Bootloader.EnterBootloader(FlashStatusUpdate);
+            MessageBox.Show("Restart the application and replug the hardware");
+            Close();
         }
 
         /// <summary>

Application/QA350/QA350/Hardware.cs

@@ -34,7 +34,7 @@ static class Hardware
         /// </summary>
         static HidDevice Msp430;
 
-        static int timeout = 50;
+        static int Timeout = 50;
 
         static public bool IsConnected = false;
 
@@ -52,7 +52,7 @@ static public bool Open()
             // See if we can see the USB ID of this product
             Msp430 = HidDevices.Enumerate(0x2047, 0x0301).FirstOrDefault();
 
-            timeout = 50;
+            Timeout = 50;
 
             if (Msp430 != null)
             {
@@ -74,18 +74,27 @@ static public bool Open()
         /// that the product ID differs when in bootloader mode
         /// </summary>
         /// <returns></returns>
-        static public bool OpenBSL()
+        static public bool OpenBSL(int secondsToTry = 15)
         {
-            // See if we can see the USB ID of this product
-            Msp430 = HidDevices.Enumerate(0x2047, 0x200).FirstOrDefault();
-            timeout = 8000;
+            DateTime start = DateTime.Now;
 
-            if (Msp430 != null)
+            while (DateTime.Now.Subtract(start).TotalSeconds < secondsToTry)
             {
-                // Device ID is connected. Open it.
-                Msp430.OpenDevice();
-                IsConnected = true;
-                return true;
+                // See if we can see the USB ID of this product
+                Msp430 = HidDevices.Enumerate(0x2047, 0x200).FirstOrDefault();
+                Timeout = 8000;
+
+                if (Msp430 != null)
+                {
+                    // Device ID is connected. Open it.
+                    Msp430.OpenDevice();
+                    IsConnected = true;
+                    Thread.Sleep(1000);
+                    return true;
+                }
+
+                Thread.Sleep(1000);
+                Debug.WriteLine("Looping in OpenBsl");
             }
 
             // Device ID wasn't connected. No need to try and open
@@ -347,7 +356,7 @@ static public bool USBSendData(byte[] data)
 
             Array.Copy(data, 0, frame, 2, data.Length);
 
-            bool retVal = Msp430.FastWrite(frame, timeout);
+            bool retVal = Msp430.FastWrite(frame, Timeout);
             return retVal;
 
         }
@@ -368,7 +377,7 @@ static public bool USBRecvData(out byte[] buffer)
         {
             buffer = new byte[0];
 
-            HidDeviceData hdd = Msp430.FastRead(timeout);   
+            HidDeviceData hdd = Msp430.FastRead(Timeout);   
 
             if (hdd != null)
             {

Application/QA350/QA350/Releases.txt

@@ -1,4 +1,7 @@
-1.76 (May 2019)
+1.77 (June 2019)
+- Increased USB timeout period
+
+1.76 (May 2019)
 - Added QA350 CPU temp display in status bar and logging. Temp accuracy will bounce around +/- 1 degree
 - Firmware version must match release, otherwise a reminder is shown at launch
 - This requires FW release 12