Start porting avrdude for uno wifi rev2

Author: facchinm

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

@@ -0,0 +1,201 @@
+package avrdude
+
+import (
+	"bytes"
+	"errors"
+	"io/ioutil"
+	"log"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
+	serial "go.bug.st/serial.v1"
+	//"go.bug.st/serial.v1/enumerator"
+	"time"
+)
+
+type Avrdude struct {
+}
+
+func (b *Avrdude) Flash(ctx *context.Context, filename string) error {
+	log.Println("Flashing " + filename)
+
+	err := invokeAvrdude([]string{ctx.ProgrammerPath, "-C" + filepath.Join(filepath.Dir(ctx.ProgrammerPath), "..", "etc/avrdude.conf"), "-v", "-patmega4809", "-cxplainedmini_updi", "-Pusb", "-b115200", "-e", "-D", "-Uflash:w:" + filename + ":i"})
+
+	time.Sleep(3 * time.Second)
+	return err
+}
+
+func (b *Avrdude) DumpAndFlash(ctx *context.Context, filename string) (string, error) {
+	log.Println("Flashing " + filename)
+	dir, err := ioutil.TempDir("", "wifiFlasher_dump")
+	err = invokeAvrdude([]string{ctx.ProgrammerPath, "-C" + filepath.Join(filepath.Dir(ctx.ProgrammerPath), "..", "etc/avrdude.conf"), "-v", "-patmega4809", "-cxplainedmini_updi", "-Pusb", "-b115200", "-D", "-Uflash:r:" + filepath.Join(dir, "dump.bin") + ":i"})
+	log.Println("Original sketch saved at " + filepath.Join(dir, "dump.bin"))
+	if err != nil {
+		return "", err
+	}
+	err = invokeAvrdude([]string{ctx.ProgrammerPath, "-C" + filepath.Join(filepath.Dir(ctx.ProgrammerPath), "..", "etc/avrdude.conf"), "-v", "-patmega4809", "-cxplainedmini_updi", "-Pusb", "-b115200", "-e", "-D", "-Uflash:w:" + filename + ":i"})
+	time.Sleep(3 * time.Second)
+
+	return filepath.Join(dir, "dump.bin"), err
+}
+
+func invokeAvrdude(args []string) error {
+	cmd := exec.Command(args[0], args[1:]...)
+	var out bytes.Buffer
+	var stderr bytes.Buffer
+	cmd.Stdout = &out
+	cmd.Stderr = &stderr
+	err := cmd.Run()
+	log.Println(out.String())
+	log.Println(stderr.String())
+	return err
+}
+
+func touchSerialPortAt1200bps(port string) error {
+	log.Println("Touching port " + port + " at 1200bps")
+
+	// Open port
+	p, err := serial.Open(port, &serial.Mode{BaudRate: 1200})
+	if err != nil {
+		return errors.New("Open port " + port)
+	}
+	defer p.Close()
+
+	// Set DTR
+	err = p.SetDTR(false)
+	log.Println("Set DTR off")
+	if err != nil {
+		return errors.New("Can't set DTR")
+	}
+
+	// Wait a bit to allow restart of the board
+	time.Sleep(200 * time.Millisecond)
+
+	return nil
+}
+
+// reset opens the port at 1200bps. It returns the new port name (which could change
+// sometimes) and an error (usually because the port listing failed)
+func reset(port string, wait bool) (string, error) {
+	log.Println("Restarting in bootloader mode")
+
+	// Get port list before reset
+	ports, err := serial.GetPortsList()
+	log.Println("Get port list before reset")
+	if err != nil {
+		return "", errors.New("Get port list before reset")
+	}
+
+	// Touch port at 1200bps
+	err = touchSerialPortAt1200bps(port)
+	if err != nil {
+		return "", errors.New("1200bps Touch")
+	}
+
+	// Wait for port to disappear and reappear
+	if wait {
+		port = waitReset(ports, port)
+	}
+
+	return port, nil
+}
+
+// waitReset is meant to be called just after a reset. It watches the ports connected
+// to the machine until a port disappears and reappears. The port name could be different
+// so it returns the name of the new port.
+func waitReset(beforeReset []string, originalPort string) string {
+	var port string
+	timeout := false
+
+	go func() {
+		time.Sleep(10 * time.Second)
+		timeout = true
+	}()
+
+	for {
+		ports, _ := serial.GetPortsList()
+		port = differ(ports, beforeReset)
+
+		if port != "" {
+			break
+		}
+		if timeout {
+			break
+		}
+		time.Sleep(time.Millisecond * 100)
+	}
+
+	// Wait for the port to reappear
+	log.Println("Wait for the port to reappear")
+	afterReset, _ := serial.GetPortsList()
+	for {
+		ports, _ := serial.GetPortsList()
+		port = differ(ports, afterReset)
+		if port != "" {
+			time.Sleep(time.Millisecond * 500)
+			break
+		}
+		if timeout {
+			break
+		}
+		time.Sleep(time.Millisecond * 100)
+	}
+
+	// try to upload on the existing port if the touch was ineffective
+	if port == "" {
+		port = originalPort
+	}
+
+	return port
+}
+
+func waitPort(beforeReset []string, originalPort string) string {
+	var port string
+	timeout := false
+
+	go func() {
+		time.Sleep(10 * time.Second)
+		timeout = true
+	}()
+
+	for {
+		ports, _ := serial.GetPortsList()
+		port = differ(ports, beforeReset)
+
+		if port != "" {
+			break
+		}
+		if timeout {
+			break
+		}
+		time.Sleep(time.Millisecond * 100)
+	}
+
+	// try to upload on the existing port if the touch was ineffective
+	if port == "" {
+		port = originalPort
+	}
+
+	return port
+}
+
+// differ returns the first item that differ between the two input slices
+func differ(slice1 []string, slice2 []string) string {
+	m := map[string]int{}
+
+	for _, s1Val := range slice1 {
+		m[s1Val] = 1
+	}
+	for _, s2Val := range slice2 {
+		m[s2Val] = m[s2Val] + 1
+	}
+
+	for mKey, mVal := range m {
+		if mVal == 1 {
+			return mKey
+		}
+	}
+
+	return ""
+}

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

@@ -237,8 +237,8 @@ func (flasher *Flasher) Md5sum(data []byte) error {
 
 func OpenSerial(portName string) (serial.Port, error) {
 	mode := &serial.Mode{
-		BaudRate: 230400,
-		Vtimeout: 200,
+		BaudRate: 115200,
+		Vtimeout: 255,
 		Vmin:     0,
 	}
 
@@ -257,5 +257,7 @@ func OpenFlasher(portName string) (*Flasher, error) {
 		port: port,
 	}
 
+	time.Sleep(2 * time.Second)
+
 	return flasher, err
 }

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

@@ -21,15 +21,16 @@ package nina
 
 import (
 	"fmt"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac"
-	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
-	//"github.com/arduino-libraries/WiFi101-FirmwareUpdater/avrdude"
+
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/avrdude"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/bossac"
+	"github.com/arduino-libraries/WiFi101-FirmwareUpdater/context"
 )
 
 var f *Flasher
@@ -43,6 +44,9 @@ func Run(ctx context.Context) {
 	if strings.Contains(filepath.Base(ctx.ProgrammerPath), "bossac") {
 		programmer = &bossac.Bossac{}
 	}
+	if strings.Contains(filepath.Base(ctx.ProgrammerPath), "avrdude") {
+		programmer = &avrdude.Avrdude{}
+	}
 
 	if ctx.FWUploaderBinary != "" {
 		log.Println("Flashing firmware uploader")