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,
+	})
+}