Merge pull request #509 from arduino/rsora/systray-update-mainstream

Module systray update to mainstream

Author: Roberto Sora

Gopkg.lock

@@ -34,9 +34,6 @@ required = ["goa.design/goa/codegen/generator"]
   name = "github.com/blang/semver"
   version = "3.5.1"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/facchinm/systray"
 
 [[constraint]]
   name = "github.com/gin-gonic/gin"
@@ -98,6 +95,10 @@ required = ["goa.design/goa/codegen/generator"]
   branch = "master"
   name = "golang.org/x/crypto"
 
+[[override]]
+  branch = "master"
+  name = "github.com/lxn/walk"
+
 [[constraint]]
   branch = "v0"
   name = "gopkg.in/inconshreveable/go-update.v0"

Gopkg.toml

@@ -95,13 +95,12 @@ type SpPortMessageRaw struct {
 func (p *serport) reader() {
 
 	//var buf bytes.Buffer
+	ch := make([]byte, 1024)
 	timeCheckOpen := time.Now()
 	var buffered_ch bytes.Buffer
 
 	for {
 
-		ch := make([]byte, 1024)
-
 		n, err := p.portIo.Read(ch)
 
 		//if we detect that port is closing, break out o this for{} loop.
@@ -128,9 +127,12 @@ func (p *serport) reader() {
 			for i, w := 0, 0; i < n; i += w {
 				runeValue, width := utf8.DecodeRune(ch[i:n])
 				if runeValue == utf8.RuneError {
-					buffered_ch.Write(ch[i:n])
+					buffered_ch.Write(append(ch[i:n]))
 					break
 				}
+				if i == n {
+					buffered_ch.Reset()
+				}
 				data += string(runeValue)
 				w = width
 			}

serialport.go

@@ -36,7 +36,7 @@ import (
 	"runtime"
 
 	"github.com/arduino/arduino-create-agent/icon"
-	"github.com/facchinm/systray"
+	"github.com/getlantern/systray"
 	"github.com/go-ini/ini"
 	"github.com/kardianos/osext"
 	log "github.com/sirupsen/logrus"
@@ -47,9 +47,9 @@ import (
 func setupSysTray() {
 	runtime.LockOSThread()
 	if *hibernate == true {
-		systray.Run(setupSysTrayHibernate)
+		systray.Run(setupSysTrayHibernate,nil)
 	} else {
-		systray.Run(setupSysTrayReal)
+		systray.Run(setupSysTrayReal,nil)
 	}
 }