Version 1.7 with IDs and sendjson

johnlauer · johnlauer · commit a58f40502a41 · 2014-08-31T09:52:15.000-07:00
Former-commit-id: ba61d3df0d6c33a61aa2aa0af71e7bdcae686fab [formerly 75a0dcc4f0a6181341e0c1e48410e566dc7e2266]
Former-commit-id: 5702d3421495aa894136f1ece15fe0a2620c4359
diff --git a/bufferflow.go b/bufferflow.go
@@ -16,7 +16,7 @@ type BufferMsg struct {
 }
 
 type Bufferflow interface {
-	BlockUntilReady(cmd string, id string) bool // implement this method
+	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
 	ClearOutSemaphore()                                       // implement this method
diff --git a/bufferflow_default.go b/bufferflow_default.go
@@ -18,9 +18,9 @@ func (b *BufferflowDefault) Init() {
 	log.Println("Initting default buffer flow (which means no buffering)")
 }
 
-func (b *BufferflowDefault) BlockUntilReady(cmd string, id string) bool {
+func (b *BufferflowDefault) BlockUntilReady(cmd string, id string) (bool, bool) {
 	//log.Printf("BlockUntilReady() start\n")
-	return true
+	return true, false
 }
 
 func (b *BufferflowDefault) OnIncomingData(data string) {
diff --git a/bufferflow_dummypause.go b/bufferflow_dummypause.go
@@ -15,15 +15,15 @@ type BufferflowDummypause struct {
 func (b *BufferflowDummypause) Init() {
 }
 
-func (b *BufferflowDummypause) BlockUntilReady(cmd string, id string) bool {
+func (b *BufferflowDummypause) BlockUntilReady(cmd string, id string) (bool, bool) {
 	log.Printf("BlockUntilReady() start. numLines:%v\n", b.NumLines)
 	log.Printf("buffer:%v\n", b)
 	//for b.Paused {
 	log.Println("We are paused for 3 seconds. Yeilding send.")
 	time.Sleep(3000 * time.Millisecond)
 	//}
 	log.Printf("BlockUntilReady() end\n")
-	return true
+	return true, false
 }
 
 func (b *BufferflowDummypause) OnIncomingData(data string) {
diff --git a/bufferflow_grbl.go.REMOVED.git-id b/bufferflow_grbl.go.REMOVED.git-id
@@ -1 +1 @@
-307d46d66f254ab5c1c8b1f8ed29b4c9a8f3fbca
+4cda5be4c183f72b5e41b33015621aa839bc931f
diff --git a/bufferflow_tinyg.go.REMOVED.git-id b/bufferflow_tinyg.go.REMOVED.git-id
@@ -1 +1 @@
-02b57c77bf5180132ca681cea0429d81fdb06d0e
+ca040c9d6b6e1743c8e71d251dedb419c0b54dc5
diff --git a/hub.go.REMOVED.git-id b/hub.go.REMOVED.git-id
@@ -1 +1 @@
-eb73b03bd2eeb82911409cbc82bf6fad2d901361
+b420a182db1f1a34cd42bc436dce78840cf0ab8b
diff --git a/main.go.REMOVED.git-id b/main.go.REMOVED.git-id
@@ -1 +1 @@
-37b8e99e5897f7c1fda929af9997c9ff9a78a06f
+f6ac111d794b21743dab1bf5371790b1be639d99
diff --git a/serial.go.REMOVED.git-id b/serial.go.REMOVED.git-id
@@ -1 +1 @@
-f5b2d4a727f069bc2e63da5ed3ae26c62c85fb0a
+be6abdc2e1bb47d9a1c05c8c9136a8a3d1c2cfb7
diff --git a/serialport.go.REMOVED.git-id b/serialport.go.REMOVED.git-id
@@ -1 +1 @@
-3025b9ac6f925c64a5fc5403a63d12d8e468d0bc
+bad767991821ac316d077a2705dc2a51af74388b

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ type BufferMsg struct {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`type Bufferflow interface {`
`19`		`- BlockUntilReady(cmd string, id string) bool // implement this method`
	`19`	`+ BlockUntilReady(cmd string, id string) (bool, bool) // implement this method`
`20`	`20`	`//JustQueue(cmd string, id string) bool // implement this method`
`21`	`21`	`OnIncomingData(data string) // implement this method`
`22`	`22`	`ClearOutSemaphore() // implement this method`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ func (b *BufferflowDefault) Init() {`
`18`	`18`	`log.Println("Initting default buffer flow (which means no buffering)")`
`19`	`19`	`}`
`20`	`20`
`21`		`-func (b *BufferflowDefault) BlockUntilReady(cmd string, id string) bool {`
	`21`	`+func (b *BufferflowDefault) BlockUntilReady(cmd string, id string) (bool, bool) {`
`22`	`22`	`//log.Printf("BlockUntilReady() start\n")`
`23`		`- return true`
	`23`	`+ return true, false`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func (b *BufferflowDefault) OnIncomingData(data string) {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-307d46d66f254ab5c1c8b1f8ed29b4c9a8f3fbca`
	`1`	`+4cda5be4c183f72b5e41b33015621aa839bc931f`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-02b57c77bf5180132ca681cea0429d81fdb06d0e`
	`1`	`+ca040c9d6b6e1743c8e71d251dedb419c0b54dc5`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-eb73b03bd2eeb82911409cbc82bf6fad2d901361`
	`1`	`+b420a182db1f1a34cd42bc436dce78840cf0ab8b`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-37b8e99e5897f7c1fda929af9997c9ff9a78a06f`
	`1`	`+f6ac111d794b21743dab1bf5371790b1be639d99`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f5b2d4a727f069bc2e63da5ed3ae26c62c85fb0a`
	`1`	`+be6abdc2e1bb47d9a1c05c8c9136a8a3d1c2cfb7`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3025b9ac6f925c64a5fc5403a63d12d8e468d0bc`
	`1`	`+bad767991821ac316d077a2705dc2a51af74388b`