minor optimizations

Author: umbynos

cli/firmware/flash.go

@@ -171,7 +171,6 @@ func run(cmd *cobra.Command, args []string) {
 	// Flash loader Sketch
 	programmerOut := new(bytes.Buffer)
 	programmerErr := new(bytes.Buffer)
-	// var err error
 	if feedback.GetFormat() == feedback.JSON {
 		err = programmer.Flash(commandLine, programmerOut, programmerErr)
 	} else {

flasher/nina.go

@@ -86,13 +86,12 @@ func (f *NinaFlasher) FlashFirmware(firmwareFile *paths.Path) error {
 	}
 
 	logrus.Debugf("Checking md5")
-	err = f.md5sum(data)
-	if err != nil {
+	if err := f.md5sum(data); err != nil {
 		logrus.Error(err)
 		return err
 	}
-	logrus.Debugf("Flashed all the things")
-	return nil
+	logrus.Infof("Flashed all the things")
+	return err //should be nil
 }
 
 func (f *NinaFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs []string) error {

flasher/sara.go

@@ -101,7 +101,8 @@ func (f *SaraFlasher) FlashFirmware(firmwareFile *paths.Path) error {
 	if err != nil {
 		logrus.Error(err)
 	}
-	return err
+	logrus.Infof("Flashed all the things")
+	return err //should be nil
 }
 
 func (f *SaraFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs []string) error {

flasher/winc.go

@@ -27,7 +27,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 
@@ -68,7 +67,12 @@ func (f *WincFlasher) FlashFirmware(firmwareFile *paths.Path) error {
 		return err
 	}
 	firmwareOffset := 0x0000
-	return f.flashChunk(firmwareOffset, data)
+	if err = f.flashChunk(firmwareOffset, data); err != nil {
+		logrus.Error(err)
+		return err
+	}
+	logrus.Infof("Flashed all the things")
+	return err //should be nil
 }
 
 func (f *WincFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs []string) error {
@@ -431,7 +435,7 @@ func (f *WincFlasher) erase(address uint32, length uint32) error {
 		return err
 	}
 
-	log.Printf("Erasing %d bytes from address 0x%X\n", length, address)
+	logrus.Debugf("Erasing %d bytes from address 0x%X\n", length, address)
 
 	// wait acknowledge
 	ack := make([]byte, 2)