...

luni64 · Jul 5, 2015 · e844594 · e844594
1 parent 98013e9
commit e844594
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/01_TeensyWatcherConsole/Program.cs b/01_TeensyWatcherConsole/Program.cs
@@ -24,7 +24,7 @@ static void Main(string[] args)
             }
 
             // Here is a good place to construct a SerialPort Object
-            // for the sake of simplicity lets take the first one from the list
+            // For the sake of simplicity lets take the first one from the list
             var myTeensy = Watcher.ConnectedDevices.FirstOrDefault();
             if (myTeensy != null && myTeensy.Type == USB_Device.type.UsbSerial)
             {

diff --git a/TeensySharp/SharpUploader.cs b/TeensySharp/SharpUploader.cs
@@ -39,12 +39,14 @@ public static int Upload(byte[] Image, PJRC_Board board, uint Serialnumber, bool
 
             var BoardDef = BoardDefinitions[board];
             int addr = 0;
+
+            //Slice the flash image in dataBlocks and transfer the blocks if they are not empty (!=0xFF)
             foreach (var dataBlock in Image.Batch(BoardDef.BlockSize))
             {
                 if (dataBlock.Any(d => d != 0xFF) || addr == 0) //skip empty blocks but always write first block to erase chip
                 {
                     var report = PrepareReport(addr, dataBlock.ToArray(), BoardDef);
-                    if (!device.WriteReport(report))  //if first write fails (happens) wait and retry once
+                    if (!device.WriteReport(report))  //if write fails (happens if teensy still busy) wait and retry once
                     {
                         Thread.Sleep(10);
                         if (!device.WriteReport(report)) return 2;
@@ -55,6 +57,7 @@ public static int Upload(byte[] Image, PJRC_Board board, uint Serialnumber, bool
                 addr += BoardDef.BlockSize;
             }
 
+            // Reboot the device to start the downloaded firmware
             if (reboot)
             {
                 var rebootReport = device.CreateReport();
@@ -85,8 +88,7 @@ public static bool StartHalfKay(uint Serialnumber)
                 //Start HalfKay                 
                 using (var port = new SerialPort(Teensy.Port))
                 {
-                    port.Open();
-                    int previousBR = port.BaudRate;
+                    port.Open();                  
                     port.BaudRate = 134; //This will switch the board to HalfKay. Don't try to access port after this...                   
                 }
             }