Merge branch 'devel'

Author: facchinm

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "arduino"]
-	path = arduino
-	url = https://github.com/facchinm/arduino-flash-tools

README.md

@@ -23,7 +23,7 @@ Please use the current latest version:
 
 ## Submitting an issue
 
-Please attach the output of the commands running at http://localhost:8989 if useful.
+Please attach the output of the commands running at the debug console if useful.
 
 ## Submitting a pull request
 

arduino

@@ -5,7 +5,7 @@ import (
 //"time"
 )
 
-var availableBufferAlgorithms = []string{"default"}
+var availableBufferAlgorithms = []string{"default", "timed"}
 
 type BufferMsg struct {
 	Cmd                string
@@ -16,6 +16,7 @@ type BufferMsg struct {
 }
 
 type Bufferflow interface {
+	Init()
 	BlockUntilReady(cmd string, id string) (bool, bool) // implement this method
 	//JustQueue(cmd string, id string) bool                     // implement this method
 	OnIncomingData(data string)                               // implement this method

bufferflow.go

@@ -0,0 +1,101 @@
+package main
+
+import (
+	"encoding/json"
+	"time"
+
+	log "github.com/Sirupsen/logrus"
+)
+
+type BufferflowTimed struct {
+	Name   string
+	Port   string
+	Output chan []byte
+	Input  chan string
+	ticker *time.Ticker
+}
+
+var (
+	bufferedOutput string
+)
+
+func (b *BufferflowTimed) Init() {
+	log.Println("Initting timed buffer flow (output once every 16ms)")
+	bufferedOutput = ""
+
+	go func() {
+		for data := range b.Input {
+			bufferedOutput = bufferedOutput + data
+		}
+	}()
+
+	go func() {
+		b.ticker = time.NewTicker(16 * time.Millisecond)
+		for _ = range b.ticker.C {
+			if bufferedOutput != "" {
+				m := SpPortMessage{bufferedOutput}
+				buf, _ := json.Marshal(m)
+				b.Output <- []byte(buf)
+				bufferedOutput = ""
+			}
+		}
+	}()
+
+}
+
+func (b *BufferflowTimed) BlockUntilReady(cmd string, id string) (bool, bool) {
+	//log.Printf("BlockUntilReady() start\n")
+	return true, false
+}
+
+func (b *BufferflowTimed) OnIncomingData(data string) {
+	b.Input <- data
+}
+
+// Clean out b.sem so it can truly block
+func (b *BufferflowTimed) ClearOutSemaphore() {
+}
+
+func (b *BufferflowTimed) BreakApartCommands(cmd string) []string {
+	return []string{cmd}
+}
+
+func (b *BufferflowTimed) Pause() {
+	return
+}
+
+func (b *BufferflowTimed) Unpause() {
+	return
+}
+
+func (b *BufferflowTimed) SeeIfSpecificCommandsShouldSkipBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimed) SeeIfSpecificCommandsShouldPauseBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimed) SeeIfSpecificCommandsShouldUnpauseBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimed) SeeIfSpecificCommandsShouldWipeBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimed) SeeIfSpecificCommandsReturnNoResponse(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimed) ReleaseLock() {
+}
+
+func (b *BufferflowTimed) IsBufferGloballySendingBackIncomingData() bool {
+	return true
+}
+
+func (b *BufferflowTimed) Close() {
+	b.ticker.Stop()
+	close(b.Input)
+}

bufferflow_timed.go

@@ -32,7 +32,7 @@ createZipEmbeddableFileArduino()
     cp fakecerts/*.pem arduino/
 	mv arduino/arduino/tools* arduino/arduino/tools
 	cd arduino
-	zip -r arduino.zip arduino/* config.ini *.pem > /dev/null
+	zip -r arduino.zip config.ini *.pem > /dev/null
 	cd ..
 	#cat arduino/arduino.zip >> $3
 	#zip  --adjust-sfx $3

compile_webidebridge.sh

@@ -1,4 +1,3 @@
-addr = :8989  # http service address
 configUpdateInterval = 0  # Update interval for re-reading config file set via -config flag. Zero disables config file re-reading.
 gc = std  # Type of garbage collection. std = Normal garbage collection allowing system to decide (this has been known to cause a stop the world in the middle of a CNC job which can cause lost responses from the CNC controller and thus stalled jobs. use max instead to solve.), off = let memory grow unbounded (you have to send in the gc command manually to garbage collect or you will run out of RAM eventually), max = Force garbage collection on each recv or send on a serial port (this minimizes stop the world events and thus lost serial responses, but increases CPU usage)
 hostname = unknown-hostname  # Override the hostname we get from the OS

config.ini

@@ -110,8 +110,10 @@ func spDownloadTool(name string, url string) {
 		log.Info("Tool already present, skipping download")
 	}
 
-	// will be something like ${tempfolder}/avrdude/bin/avrdude
-	globalToolsMap["{runtime.tools."+name+".path}"] = filepath.ToSlash(tempToolsPath + "/" + name)
+	folders, _ := ioutil.ReadDir(tempToolsPath)
+	for _, f := range folders {
+		globalToolsMap["{runtime.tools."+f.Name()+".path}"] = filepath.ToSlash(tempToolsPath + "/" + f.Name())
+	}
 
 	log.Info("Map Updated")
 	mapD := map[string]string{"DownloadStatus": "Success", "Msg": "Map Updated"}

download.go

@@ -197,6 +197,7 @@ func checkCmd(m []byte) {
 	} else if strings.HasPrefix(sl, "broadcast") {
 		go broadcast(s)
 	} else if strings.HasPrefix(sl, "restart") {
+		log.Println("Received restart from the daemon. Why? Boh")
 		restart("")
 	} else if strings.HasPrefix(sl, "exit") {
 		exit()
@@ -266,6 +267,7 @@ func exit() {
 }
 
 func restart(path string) {
+	log.Println("called restart", path)
 	// relaunch ourself and exit
 	// the relaunch works because we pass a cmdline in
 	// that has serial-port-json-server only initialize 5 seconds later
@@ -321,7 +323,7 @@ func restart(path string) {
 		hiberString = "-hibernate"
 	}
 
-	cmd = exec.Command(exePath, "-ls", "-addr", *addr, "-regex", *regExpFilter, "-gc", *gcType, hiberString)
+	cmd = exec.Command(exePath, "-ls", "-regex", *regExpFilter, "-gc", *gcType, hiberString)
 
 	fmt.Println(cmd)
 

hub.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"github.com/gin-gonic/gin"
+)
+
+func infoHandler(c *gin.Context) {
+	c.JSON(200, gin.H{
+		"http":  "http://localhost" + port,
+		"https": "https://localhost" + port,
+		"ws":    "ws://localhost" + port,
+		"wss":   "wss://localhost" + portSSL,
+	})
+}

info.go

@@ -5,18 +5,20 @@ package main
 
 import (
 	"flag"
-	log "github.com/Sirupsen/logrus"
-	"github.com/carlescere/scheduler"
-	"github.com/gin-gonic/gin"
-	"github.com/itsjamie/gin-cors"
-	"github.com/kardianos/osext"
-	"github.com/vharitonsky/iniflags"
 	"os"
 	"os/user"
 	"path/filepath"
 	"runtime/debug"
+	"strconv"
 	"text/template"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/carlescere/scheduler"
+	"github.com/gin-gonic/gin"
+	"github.com/itsjamie/gin-cors"
+	"github.com/kardianos/osext"
+	"github.com/vharitonsky/iniflags"
 	//"github.com/sanbornm/go-selfupdate/selfupdate" #included in update.go to change heavily
 )
 
@@ -26,8 +28,6 @@ var (
 	embedded_autoupdate  = true
 	embedded_autoextract = false
 	hibernate            = flag.Bool("hibernate", false, "start hibernated")
-	addr                 = flag.String("addr", ":8989", "http service address")
-	addrSSL              = flag.String("addrSSL", ":8990", "https service address")
 	verbose              = flag.Bool("v", true, "show debug logging")
 	//verbose = flag.Bool("v", false, "show debug logging")
 	isLaunchSelf = flag.Bool("ls", false, "launch self 5 seconds later")
@@ -41,6 +41,8 @@ var (
 	appName        = flag.String("appName", "", "")
 	globalToolsMap = make(map[string]string)
 	tempToolsPath  = createToolsDir()
+	port           string
+	portSSL        string
 )
 
 type NullWriter int
@@ -137,7 +139,6 @@ func main() {
 				}
 			}
 
-			f := flag.Lookup("addr")
 			log.Println("Version:" + version)
 
 			// hostname
@@ -159,11 +160,6 @@ func main() {
 				debug.SetGCPercent(-1)
 			}
 
-			ip := "0.0.0.0"
-			log.Print("Starting server and websocket on " + ip + "" + f.Value.String())
-
-			log.Println("The Arduino Create Agent is now running")
-
 			// see if they provided a regex filter
 			if len(*regExpFilter) > 0 {
 				log.Printf("You specified a serial port regular expression filter: %v\n", *regExpFilter)
@@ -214,17 +210,43 @@ func main() {
 			r.POST("/socket.io/", socketHandler)
 			r.Handle("WS", "/socket.io/", socketHandler)
 			r.Handle("WSS", "/socket.io/", socketHandler)
+			r.GET("/info", infoHandler)
 			go func() {
-				if err := r.RunTLS(*addrSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem")); err != nil {
-					log.Printf("Error trying to bind to port: %v, so exiting...", err)
-					log.Fatal("Error ListenAndServe:", err)
+				start := 8990
+				end := 9000
+				i := start
+				for i < end {
+					i = i + 1
+					portSSL = ":" + strconv.Itoa(i)
+					if err := r.RunTLS(portSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem")); err != nil {
+						log.Printf("Error trying to bind to port: %v, so exiting...", err)
+						continue
+					} else {
+						ip := "0.0.0.0"
+						log.Print("Starting server and websocket (SSL) on " + ip + "" + port)
+						break
+					}
+				}
+			}()
+
+			go func() {
+				start := 8990
+				end := 9000
+				i := start
+				for i < end {
+					i = i + 1
+					port = ":" + strconv.Itoa(i)
+					if err := r.Run(port); err != nil {
+						log.Printf("Error trying to bind to port: %v, so exiting...", err)
+						continue
+					} else {
+						ip := "0.0.0.0"
+						log.Print("Starting server and websocket on " + ip + "" + port)
+						break
+					}
 				}
 			}()
 
-			if err := r.Run(*addr); err != nil {
-				log.Printf("Error trying to bind to port: %v, so exiting...", err)
-				log.Fatal("Error ListenAndServe:", err)
-			}
 		}()
 	}
 	setupSysTray()

main.go

@@ -24,6 +24,8 @@ func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 		port_hash := strings.Trim(ports[index].Name, "/dev/tty.usbmodem")
 		port_hash = strings.Trim(port_hash, "/dev/tty.usbserial-")
 
+		port_hash = strings.ToLower(port_hash)
+
 		usbcmd := exec.Command("system_profiler", "SPUSBDataType")
 		grepcmd := exec.Command("grep", "Location ID: 0x"+port_hash[:len(port_hash)-1], "-B6")
 		cmdOutput, _ := pipe_commands(usbcmd, grepcmd)

seriallist_darwin.go

@@ -340,9 +340,15 @@ func spHandlerOpen(portname string, baud int, buftype string, isSecondary bool)
 	// we can go up to 256,000 lines of gcode in the buffer
 	p := &serport{sendBuffered: make(chan Cmd, 256000), sendNoBuf: make(chan Cmd), portConf: conf, portIo: sp, BufferType: buftype, IsPrimary: isPrimary, IsSecondary: isSecondary}
 
-	bw := &BufferflowDefault{}
+	var bw Bufferflow
+
+	if buftype == "timed" {
+		bw = &BufferflowTimed{Name: "timed", Port: portname, Output: h.broadcastSys, Input: make(chan string)}
+	} else {
+		bw = &BufferflowDefault{Port: portname}
+	}
+
 	bw.Init()
-	bw.Port = portname
 	p.bufferwatcher = bw
 
 	sh.register <- p

serialport.go

@@ -55,6 +55,7 @@ func addRebootTrayElement() {
 		<-reboot_tray.ClickedCh
 		systray.Quit()
 		log.Println("Restarting now...")
+		log.Println("Restart because addReebotTrayElement")
 		restart("")
 	}()
 }
@@ -78,6 +79,7 @@ func setupSysTrayReal() {
 		}
 		systray.Quit()
 		*hibernate = true
+		log.Println("Restart becayse setup went wrong?")
 		restart("")
 	}()
 
@@ -91,7 +93,7 @@ func setupSysTrayReal() {
 		for {
 			<-mDebug.ClickedCh
 			logAction("log on")
-			open.Start("http://localhost:8989")
+			open.Start("http://localhost" + port)
 		}
 	}()
 
@@ -113,6 +115,7 @@ func setupSysTrayHibernate() {
 	go func() {
 		<-mOpen.ClickedCh
 		*hibernate = false
+		log.Println("Restart for hubernation")
 		restart("")
 	}()
 

skel/ArduinoCreateAgent.app.zip

@@ -325,6 +325,8 @@ func (u *Updater) update() error {
 	//shutil.CopyFile(*configIni, *configIni+".bak", false)
 	//os.Remove(*configIni)
 
+	log.Println("Restarting because update!")
+
 	restart(path)
 	//addRebootTrayElement()