Release 1.5

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

Author: QuantAsylum

.gitignore

@@ -5,6 +5,8 @@
 *.ico
 *.png
 Exclude.txt
+Setup*/
+MSP430 Workspace - Copy*/
 
 #
 # Visual Studio

Application/QA350/QA350/Bootloader.cs

@@ -29,22 +29,47 @@ static class Bootloader
 
         static public void EnterBootloader()
         {
+            const string bootstrapFile = "RAM_BSL.00.07.08.38.bsl";
+
             OpenFileDialog ofd = new OpenFileDialog();
-            ofd.Filter = "Text Files|*.txt";
+            ofd.Filter = "Boot Files|*.boot";
             ofd.Title = "Enter flash file";
             ofd.CheckFileExists = true;
+            ofd.FileName = "QA350.boot";
+            ofd.InitialDirectory = AppDomain.CurrentDomain.BaseDirectory;
 
             if (ofd.ShowDialog() != System.Windows.Forms.DialogResult.OK)
                 return;
 
+            // Make sure boottloader is valid
+            if (VerifyValidBootloader(ofd.FileName) == false)
+            {
+                MessageBox.Show("This doesn't appear to be a valid bootloader file. Reflash will be aborted.");
+                return;
+            }
+
+            // Make sure the bootloader boostrap exists
+            if (File.Exists(bootstrapFile) == false)
+            {
+                MessageBox.Show("The bootstrap file is missing. Reflash will be aborted.");
+                return;
+            }
+
+            if (VerifyValidBootstrap(bootstrapFile) == false)
+            {
+                MessageBox.Show("This doesn't appear to be a valid bootsrap file. Reflash will be aborted.");
+                return;
+            }
+
             // Tell the device to enter BSL if we're already connected
             if (Hardware.IsConnected && Hardware.USBSendData(new byte[] { 0xFF, 0x00 }))
             {
                 Thread.Sleep(4000);
             }
 
-
-            // Now reconnect with BL
+            // Now reconnect with BL. Do not enter this section of code if 
+            // everything you need isn't verified. Becuase failure inside here
+            // probably means a bricked device.
             try
             {
                 Hardware.OpenBSL();
@@ -53,8 +78,10 @@ static public void EnterBootloader()
                 SubmitPassword();  // This might fail and perform mass erase
                 SubmitPassword();  // This will always succeed and perform mass erase
 
+                // Once we are mass-erased, then the bootloader will always run at start
+
                 // Load ram-based BSL
-                WriteFlash("RAM_BSL.00.07.08.38.txt", true);
+                WriteFlash(bootstrapFile, true);
 
                 // Run ram-based BSL
                 SetPC(0x2504);
@@ -74,6 +101,7 @@ static public void EnterBootloader()
             catch (Exception ex)
             {
                 Debug.WriteLine("Exception during update: " + ex.Message);
+                MessageBox.Show("An exception occured during reflash: " + ex.Message);
             }
         }
 
@@ -150,6 +178,26 @@ static void MassErase()
 
         }
 
+        static bool VerifyValidBootstrap(string fileName)
+        {
+            string[] lines = File.ReadAllLines(fileName);
+
+            if (lines[0] == "@2500" && lines[lines.Length - 1] == "q")
+                return true;
+            else
+                return false;
+        }
+
+        static bool VerifyValidBootloader(string fileName)
+        {
+            string[] lines = File.ReadAllLines(fileName);
+
+            if (lines[0] == "@4400" && lines[lines.Length-1] == "q")
+                return true;
+            else
+                return false;
+        }
+
         /// <summary>
         /// Parses the specified ram-based bootloader file (provided by TI) and sends
         /// it down to the MSP430, and then execute the ram-based file. This is needed

Application/QA350/QA350/Constants.cs

@@ -11,5 +11,9 @@ class Constants
         static public string DataFilePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\QuantAsylum\QA350\";
         static public string CalibrationFile = DataFilePath + "CalibrationData.xml";
         static public string SettingsFile = DataFilePath + "QA350Settings.xml";
+
+        static public double Version = 1.5;
+
+        static public Int32 RequiredFwVersion = 6;
     }
 }

Application/QA350/QA350/DlgEditStats.Designer.cs

@@ -42,7 +42,7 @@ public DlgEditStats(Settings settings) : this()
             numericUpDown4.Value = Convert.ToDecimal(AppSettings.HistoBinInUV);
             numericUpDown5.Value = Convert.ToDecimal(AppSettings.HistoBinInMV);
 
-            numericUpDown6.Value = Convert.ToDecimal(AppSettings.BinCount);
+            numericUpDown6.Value = Convert.ToDecimal(AppSettings.SampleHistory);
 
         }
 
@@ -72,7 +72,7 @@ private void button4_Click(object sender, EventArgs e)
             AppSettings.HistoBinInUV = Convert.ToInt32(numericUpDown4.Value);
             AppSettings.HistoBinInMV = Convert.ToInt32(numericUpDown5.Value);
 
-            AppSettings.BinCount = Convert.ToInt32(numericUpDown6.Value);
+            AppSettings.SampleHistory = Convert.ToInt32(numericUpDown6.Value);
 
             Close();
         }