binary support (WIP)

Author: umbynos

bufferflow.go

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

bufferflow_default.go

@@ -20,6 +20,10 @@ func (b *BufferflowDefault) BlockUntilReady(cmd string, id string) (bool, bool)
 	return true, false
 }
 
+// not implemented, we are gonna use OnIncomingData
+func (b *BufferflowDefault) OnIncomingDataBinary(data []byte) {
+}
+
 func (b *BufferflowDefault) OnIncomingData(data string) {
 	//log.Printf("OnIncomingData() start. data:%v\n", data)
 }

bufferflow_timed.go

@@ -18,7 +18,7 @@ type BufferflowTimed struct {
 
 var (
 	bufferedOutput string
-	sPort string
+	sPort          string
 )
 
 func (b *BufferflowTimed) Init() {
@@ -61,6 +61,10 @@ func (b *BufferflowTimed) BlockUntilReady(cmd string, id string) (bool, bool) {
 	return true, false
 }
 
+// not implemented, we are gonna use OnIncomingData
+func (b *BufferflowTimed) OnIncomingDataBinary(data []byte) {
+}
+
 func (b *BufferflowTimed) OnIncomingData(data string) {
 	b.Input <- data
 }

bufferflow_timedbinary.go

@@ -0,0 +1,114 @@
+package main
+
+import (
+	"encoding/json"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type BufferflowTimedBinary struct {
+	Name   string
+	Port   string
+	Output chan []byte
+	Input  chan []byte
+	done   chan bool
+	ticker *time.Ticker
+}
+
+var (
+	bufferedOutputBinary []byte
+	sPortBinary          string
+)
+
+func (b *BufferflowTimedBinary) Init() {
+	log.Println("Initting timed buffer binary flow (output once every 16ms)")
+	bufferedOutputBinary = nil
+	sPortBinary = ""
+
+	go func() {
+		b.ticker = time.NewTicker(16 * time.Millisecond)
+		b.done = make(chan bool)
+	Loop:
+		for {
+			select {
+			case data := <-b.Input:
+				bufferedOutputBinary = append(bufferedOutputBinary, []byte(data)...)
+				sPortBinary = b.Port
+			case <-b.ticker.C:
+				if bufferedOutputBinary != nil {
+					m := SpPortMessageRaw{sPortBinary, bufferedOutputBinary}
+					buf, _ := json.Marshal(m)
+					b.Output <- []byte(buf)
+					bufferedOutputBinary = nil
+					sPortBinary = ""
+				}
+			case <-b.done:
+				break Loop
+			}
+		}
+
+		close(b.Input)
+	}()
+}
+
+func (b *BufferflowTimedBinary) BlockUntilReady(cmd string, id string) (bool, bool) {
+	//log.Printf("BlockUntilReady() start\n")
+	return true, false
+}
+
+func (b *BufferflowTimedBinary) OnIncomingDataBinary(data []byte) {
+	b.Input <- data
+}
+
+// not implemented, we are gonna use OnIncomingDataBinary
+func (b *BufferflowTimedBinary) OnIncomingData(data string) {
+}
+
+// Clean out b.sem so it can truly block
+func (b *BufferflowTimedBinary) ClearOutSemaphore() {
+}
+
+func (b *BufferflowTimedBinary) BreakApartCommands(cmd string) []string {
+	return []string{cmd}
+}
+
+func (b *BufferflowTimedBinary) Pause() {
+	return
+}
+
+func (b *BufferflowTimedBinary) Unpause() {
+	return
+}
+
+func (b *BufferflowTimedBinary) SeeIfSpecificCommandsShouldSkipBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimedBinary) SeeIfSpecificCommandsShouldPauseBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimedBinary) SeeIfSpecificCommandsShouldUnpauseBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimedBinary) SeeIfSpecificCommandsShouldWipeBuffer(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimedBinary) SeeIfSpecificCommandsReturnNoResponse(cmd string) bool {
+	return false
+}
+
+func (b *BufferflowTimedBinary) ReleaseLock() {
+}
+
+func (b *BufferflowTimedBinary) IsBufferGloballySendingBackIncomingData() bool {
+	return true
+}
+
+func (b *BufferflowTimedBinary) Close() {
+	b.ticker.Stop()
+	close(b.Input)
+}

bufferflow_timedraw.go

@@ -59,6 +59,10 @@ func (b *BufferflowTimedRaw) BlockUntilReady(cmd string, id string) (bool, bool)
 	return true, false
 }
 
+// not implemented, we are gonna use OnIncomingData
+func (b *BufferflowTimedRaw) OnIncomingDataBinary(data []byte) {
+}
+
 func (b *BufferflowTimedRaw) OnIncomingData(data string) {
 	b.Input <- data
 }

serialport.go

@@ -148,7 +148,11 @@ func (p *serport) reader(buftype string) {
 			// writes to the serialport. each bufferflow type will decide
 			// this on its own based on its logic, i.e. tinyg vs grbl vs others
 			//p.b.bufferwatcher..OnIncomingData(data)
-			p.bufferwatcher.OnIncomingData(data)
+			if buftype == "timedbinary" {
+				p.bufferwatcher.OnIncomingDataBinary(ch[:n])
+			} else {
+				p.bufferwatcher.OnIncomingData(data)
+			}
 
 			// see if the OnIncomingData handled the broadcast back
 			// to the user. this option was added in case the OnIncomingData wanted
@@ -330,6 +334,8 @@ func spHandlerOpen(portname string, baud int, buftype string) {
 		bw = &BufferflowTimed{Name: "timed", Port: portname, Output: h.broadcastSys, Input: make(chan string)}
 	} else if buftype == "timedraw" {
 		bw = &BufferflowTimedRaw{Name: "timedraw", Port: portname, Output: h.broadcastSys, Input: make(chan string)}
+	} else if buftype == "timedbinary" {
+		bw = &BufferflowTimedBinary{Name: "timedbinary", Port: portname, Output: h.broadcastSys, Input: make(chan []byte)}
 	} else {
 		bw = &BufferflowDefault{Port: portname}
 	}