Apply gofmt on all files

Author: facchinm

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac/bossac.go

@@ -2,61 +2,61 @@ package bossac
 
 import (
 	"bytes"
-  "errors"
-  "path/filepath"
-  "log"
-  "os/exec"
-	"io/ioutil"
+	"errors"
 	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
-  serial "go.bug.st/serial.v1"
+	serial "go.bug.st/serial.v1"
+	"io/ioutil"
+	"log"
+	"os/exec"
+	"path/filepath"
 	//"go.bug.st/serial.v1/enumerator"
-  "time"
+	"time"
 )
 
 type Bossac struct {
 }
 
 func (b *Bossac) Flash(ctx context.Context, filename string) error {
-  log.Println("Flashing " + filename)
+	log.Println("Flashing " + filename)
 
-  port, err := reset(ctx.PortName, true)
-  if err != nil {
-    return err
-  }
-  err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w" , filename})
+	port, err := reset(ctx.PortName, true)
+	if err != nil {
+		return err
+	}
+	err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w", filename})
 
-  ports, err := serial.GetPortsList()
-  port = waitReset(ports, port)
+	ports, err := serial.GetPortsList()
+	port = waitReset(ports, port)
 
-  return err
+	return err
 }
 
-func (b *Bossac)DumpAndFlash(ctx context.Context, filename string) (string, error) {
-  log.Println("Flashing " + filename)
-  dir, err := ioutil.TempDir("", "wifiFlasher_dump")
-  port, err := reset(ctx.PortName, true)
-  if err != nil {
-    return "", err
-  }
+func (b *Bossac) DumpAndFlash(ctx context.Context, filename string) (string, error) {
+	log.Println("Flashing " + filename)
+	dir, err := ioutil.TempDir("", "wifiFlasher_dump")
+	port, err := reset(ctx.PortName, true)
+	if err != nil {
+		return "", err
+	}
 	err = invokeBossac([]string{ctx.ProgrammerPath, "-u", "-r", "-p", port, filepath.Join(dir, "dump.bin")})
 	log.Println("Original sketch saved at " + filepath.Join(dir, "dump.bin"))
 	if err != nil {
 		return "", err
 	}
-  err = invokeBossac([]string{ctx.ProgrammerPath, "-e",  "-R", "-p", port, "-w" , filename})
+	err = invokeBossac([]string{ctx.ProgrammerPath, "-e", "-R", "-p", port, "-w", filename})
 
-  ports, err := serial.GetPortsList()
-  port = waitReset(ports, port)
+	ports, err := serial.GetPortsList()
+	port = waitReset(ports, port)
 
-  return filepath.Join(dir, "dump.bin"), err
+	return filepath.Join(dir, "dump.bin"), err
 }
 
 func invokeBossac(args []string) error {
-  cmd := exec.Command(args[0], args[1:]...)
-  var out bytes.Buffer
+	cmd := exec.Command(args[0], args[1:]...)
+	var out bytes.Buffer
 	cmd.Stdout = &out
 	err := cmd.Run()
-  log.Println(out.String())
+	log.Println(out.String())
 	return err
 }
 

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/main.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"flag"
-	"log"
-	"strings"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
 	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/nina"
 	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/winc"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
+	"log"
+	"strings"
 )
 
 var ctx context.Context

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/context/context.go

@@ -16,18 +16,18 @@ func (af *addressFlags) Set(value string) error {
 }
 
 type Context struct {
-	PortName 			string
-	RootCertDir 	string
-	Addresses 		addressFlags
-	FirmwareFile 	string
+	PortName         string
+	RootCertDir      string
+	Addresses        addressFlags
+	FirmwareFile     string
 	FWUploaderBinary string
-	ReadAll 			bool
-	BinaryToRestore string
-	ProgrammerPath string
-	Model string
+	ReadAll          bool
+	BinaryToRestore  string
+	ProgrammerPath   string
+	Model            string
 }
 
 type Programmer interface {
-  DumpAndFlash(ctx Context, filename string) (string, error)
+	DumpAndFlash(ctx Context, filename string) (string, error)
 	Flash(ctx Context, filename string) error
 }

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/nina/certificates.go

@@ -21,12 +21,12 @@ package nina
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/pem"
 	"errors"
 	"io/ioutil"
 	"log"
 	"path"
 	"path/filepath"
-	"encoding/pem"
 )
 
 type CertEntry []byte

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/nina/flasher.go

@@ -20,10 +20,10 @@
 package nina
 
 import (
+	"crypto/md5"
 	"encoding/binary"
-	"time"
 	"log"
-	"crypto/md5"
+	"time"
 
 	serial "github.com/facchinm/go-serial"
 )
@@ -196,7 +196,7 @@ func (flasher *Flasher) sendCommand(command byte, address uint32, val uint32, pa
 
 func (flasher *Flasher) Md5sum(data []byte) error {
 	hasher := md5.New()
-  hasher.Write(data)
+	hasher.Write(data)
 
 	log.Println("Checking firmware integrity")
 
@@ -223,11 +223,11 @@ func (flasher *Flasher) Md5sum(data []byte) error {
 	md5sumfromdevice := hasher.Sum(nil)
 
 	i := 0
-  for (i<16) {
+	for i < 16 {
 		if md5sumfromdevice[i] != md5sum[i] {
-				return &FlasherError{err: "MD5sum failed"}
-			}
-			i++
+			return &FlasherError{err: "MD5sum failed"}
+		}
+		i++
 	}
 
 	log.Println("Integrity ok")
@@ -239,7 +239,7 @@ func OpenSerial(portName string) (serial.Port, error) {
 	mode := &serial.Mode{
 		BaudRate: 230400,
 		Vtimeout: 100,
-		Vmin: 0,
+		Vmin:     0,
 	}
 
 	return serial.Open(portName, mode)

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/nina/main.go

@@ -20,15 +20,15 @@
 package nina
 
 import (
+	"fmt"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
 	"io/ioutil"
 	"log"
-	"fmt"
 	"os"
-	"strings"
-	"strconv"
 	"path/filepath"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac"
+	"strconv"
+	"strings"
 	//"github.com/arduino-libraries/WiFi101-FirmwareUpdater/avrdude"
 )
 
@@ -52,7 +52,7 @@ func Run(ctx context.Context) {
 			err = programmer.Flash(ctx, ctx.FWUploaderBinary)
 		}
 		if err != nil {
-				log.Fatal(err)
+			log.Fatal(err)
 		}
 	}
 
@@ -101,11 +101,11 @@ func Run(ctx context.Context) {
 		}
 	}
 
-	if (ctx.BinaryToRestore != "") {
+	if ctx.BinaryToRestore != "" {
 		log.Println("Restoring previous sketch")
 		f.Close()
 
-		if err := programmer.Flash(ctx, ctx.BinaryToRestore) ; err != nil {
+		if err := programmer.Flash(ctx, ctx.BinaryToRestore); err != nil {
 			log.Fatal(err)
 		}
 
@@ -142,7 +142,7 @@ func flashCerts(ctx context.Context) error {
 	}
 
 	// pad certificatesData to flash page
-	for len(certificatesData) % int(payloadSize) != 0 {
+	for len(certificatesData)%int(payloadSize) != 0 {
 		certificatesData = append(certificatesData, 0)
 	}
 
@@ -186,7 +186,7 @@ func flashChunk(offset int, buffer []byte, doChecksum bool) error {
 
 	fmt.Println("")
 
-	if (doChecksum) {
+	if doChecksum {
 		return f.Md5sum(buffer)
 	} else {
 		return nil

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/winc/flasher.go

@@ -21,8 +21,8 @@ package winc
 
 import (
 	"encoding/binary"
-	"log"
 	serial "github.com/facchinm/go-serial"
+	"log"
 	"time"
 )
 
@@ -192,13 +192,11 @@ func (flasher *Flasher) sendCommand(command byte, address uint32, val uint32, pa
 	return nil
 }
 
-
-
 func OpenSerial(portName string) (serial.Port, error) {
 	mode := &serial.Mode{
 		BaudRate: 1000000,
 		Vtimeout: 100,
-		Vmin: 0,
+		Vmin:     0,
 	}
 
 	return serial.Open(portName, mode)

src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/winc/main.go

@@ -22,13 +22,13 @@ package winc
 import (
 	"bytes"
 	"errors"
+	"fmt"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
 	"io/ioutil"
 	"log"
-	"fmt"
 	"os"
 	"strconv"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac"
 )
 
 var f *Flasher
@@ -48,7 +48,7 @@ func Run(ctx context.Context) {
 			err = programmer.Flash(ctx, ctx.FWUploaderBinary)
 		}
 		if err != nil {
-				log.Fatal(err)
+			log.Fatal(err)
 		}
 	}
 
@@ -97,11 +97,11 @@ func Run(ctx context.Context) {
 		}
 	}
 
-	if (ctx.BinaryToRestore != "") {
+	if ctx.BinaryToRestore != "" {
 		log.Println("Restoring previous sketch")
 		f.Close()
 
-		if err := programmer.Flash(ctx, ctx.BinaryToRestore) ; err != nil {
+		if err := programmer.Flash(ctx, ctx.BinaryToRestore); err != nil {
 			log.Fatal(err)
 		}