enabled -scan 'batch mode' for updating notecard firmware

notecard/dfu.go

@@ -281,21 +281,28 @@ func loadBin(filetype string, filename string, bin []byte, binaryMax int) (err e
 
 	}
 
+	// Display summary
+	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 {
+		first := true
 		for i := 0; i < 90; i++ {
 			rsp, err = card.TransactionRequest(notecard.Request{Req: "dfu.status", Name: "card"})
 			if err == nil && !rsp.Pending {
 				break
 			}
+			if first {
+				first = false
+				fmt.Printf("waiting for firmware update to complete\n")
+			}
 			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
 
 }

notecard/main.go

@@ -556,7 +556,7 @@ func main() {
 		lib.ConfigSetHub(actionHub)
 	}
 
-	if err == nil && actionSideload != "" {
+	if err == nil && actionSideload != "" && actionScan == "" {
 		err = dfuSideload(actionSideload, actionVerbose)
 	}
 
@@ -669,7 +669,7 @@ func main() {
 	}
 
 	if err == nil && actionScan != "" {
-		err = scan(actionVerbose, actionFactory, actionSetup, actionSetupSKU, actionProvision, actionFactory, actionScan)
+		err = scan(actionVerbose, actionFactory, actionSetup, actionSetupSKU, actionProvision, actionFactory, actionSideload, actionScan)
 	}
 
 	if err == nil && actionCommtest {

notecard/scan.go

@@ -43,7 +43,7 @@ type ScannedSIM struct {
 }
 
 // Scan of a set of notecards, appending to JSON file.  Press ^C when done.
-func scan(debugEnabled bool, init bool, fnSetup string, fnSetupSKU string, carrierProvision string, factoryReset bool, outfile string) (err error) {
+func scan(debugEnabled bool, init bool, fnSetup string, fnSetupSKU string, carrierProvision string, factoryReset bool, sideload string, outfile string) (err error) {
 
 	// Only allow one of the two
 	if fnSetup != "" && fnSetupSKU != "" {
@@ -205,6 +205,14 @@ func scan(debugEnabled bool, init bool, fnSetup string, fnSetupSKU string, carri
 			}
 		}
 
+		// If a sideload, do it
+		if sideload != "" {
+			err = dfuSideload(sideload, debugEnabled)
+			if err != nil {
+				break
+			}
+		}
+
 		// If requests were specified, process them
 		if len(requests) > 0 {
 			// Process the requests