don't allow sideload to complete until notecard dfu is completed

Author: rayozzie

notecard/dfu.go

@@ -268,8 +268,8 @@ func loadBin(filetype string, filename string, bin []byte, binaryMax int) (err e
 				// {dfu-not-ready} shows up when the DFU is ready, but the Notecard hasn't synced yet.
 				// The DFU should kick off after the next successful sync.
 				if (note.ErrorContains(err, note.ErrDFUNotReady) ||
-				    note.ErrorContains(err, "firmware update is in progress") ||
-				    note.ErrorContains(err, note.ErrDFUInProgress)) && lenRemaining == 0 {
+					note.ErrorContains(err, "firmware update is in progress") ||
+					note.ErrorContains(err, note.ErrDFUInProgress)) && lenRemaining == 0 {
 					err = nil
 					break
 				}
@@ -280,10 +280,22 @@ func loadBin(filetype string, filename string, bin []byte, binaryMax int) (err e
 		}
 
 	}
-	elapsedSecs := (time.Now().UTC().Unix() - beganSecs) + 1
-	fmt.Printf("%d seconds (%.0f Bps)\n", elapsedSecs, float64(totalLen)/float64(elapsedSecs))
+
+	// Wait until the DFU has completed.  This is particularly important for notecard
+	// sideloads where we must restart the module.
+	if filetype == notehub.HubFileTypeCardFirmware {
+		for i := 0; i < 90; i++ {
+			rsp, err = card.TransactionRequest(notecard.Request{Req: "dfu.status", Name: "card"})
+			if err == nil && !rsp.Pending {
+				break
+			}
+			time.Sleep(1000 * time.Millisecond)
+		}
+	}
 
 	// Done
+	elapsedSecs := (time.Now().UTC().Unix() - beganSecs) + 1
+	fmt.Printf("%d seconds (%.0f Bps)\n", elapsedSecs, float64(totalLen)/float64(elapsedSecs))
 	return
 
 }