Slot counter approach

johnlauer · johnlauer · commit 616f27921458 · 2014-08-11T10:07:03.000-07:00
Former-commit-id: bf475c754634324063dbb5c587b82a4ca94e72a9 [formerly 8559b18ed3032aa39a5b348c5d8624a88628f754]
Former-commit-id: 057de0de009d8573738889433dd17ba671eeb668
diff --git a/bufferflow.go b/bufferflow.go
@@ -16,7 +16,7 @@ type BufferMsg struct {
 }
 
 type Bufferflow interface {
-	BlockUntilReady() bool                                    // implement this method
+	BlockUntilReady(cmd string) bool                          // implement this method
 	OnIncomingData(data string)                               // implement this method
 	BreakApartCommands(cmd string) []string                   // implement this method
 	Pause()                                                   // implement this method
diff --git a/bufferflow_default.go b/bufferflow_default.go
@@ -18,7 +18,7 @@ func (b *BufferflowDefault) Init() {
 	log.Println("Initting default buffer flow (which means no buffering)")
 }
 
-func (b *BufferflowDefault) BlockUntilReady() bool {
+func (b *BufferflowDefault) BlockUntilReady(cmd string) bool {
 	//log.Printf("BlockUntilReady() start\n")
 	return true
 }
diff --git a/bufferflow_dummypause.go b/bufferflow_dummypause.go
@@ -15,7 +15,7 @@ type BufferflowDummypause struct {
 func (b *BufferflowDummypause) Init() {
 }
 
-func (b *BufferflowDummypause) BlockUntilReady() bool {
+func (b *BufferflowDummypause) BlockUntilReady(cmd string) bool {
 	log.Printf("BlockUntilReady() start. numLines:%v\n", b.NumLines)
 	log.Printf("buffer:%v\n", b)
 	//for b.Paused {
diff --git a/bufferflow_tinyg.go.REMOVED.git-id b/bufferflow_tinyg.go.REMOVED.git-id
@@ -1 +1 @@
-f80c1b8ea7dc18c7a37e992faf5d653fdeaf943d
+3df1f92ede27c318225cb710b8ac5e40be69f956
diff --git a/main.go b/main.go
@@ -1,4 +1,4 @@
-// Version 1.4
+// Version 1.5
 // Supports Windows, Linux, Mac, and Raspberry Pi, Beagle Bone Black
 
 package main
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	version = "1.4"
+	version = "1.5"
 	addr    = flag.String("addr", ":8989", "http service address")
 	assets  = flag.String("assets", defaultAssetPath(), "path to assets")
 	//homeTempl *template.Template
diff --git a/serialport.go.REMOVED.git-id b/serialport.go.REMOVED.git-id
@@ -1 +1 @@
-f0a0e31a9d17e0bcc75d4d962839324678347f89
+cd11e5314da2b8e5e3659cc4771cdcf7e58cbb5a

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() bool // implement this method`
	`19`	`+ BlockUntilReady(cmd string) bool // implement this method`
`20`	`20`	`OnIncomingData(data string) // implement this method`
`21`	`21`	`BreakApartCommands(cmd string) []string // implement this method`
`22`	`22`	`Pause() // implement this method`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ 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() bool {`
	`21`	`+func (b *BufferflowDefault) BlockUntilReady(cmd string) bool {`
`22`	`22`	`//log.Printf("BlockUntilReady() start\n")`
`23`	`23`	`return true`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ type BufferflowDummypause struct {`
`15`	`15`	`func (b *BufferflowDummypause) Init() {`
`16`	`16`	`}`
`17`	`17`
`18`		`-func (b *BufferflowDummypause) BlockUntilReady() bool {`
	`18`	`+func (b *BufferflowDummypause) BlockUntilReady(cmd string) bool {`
`19`	`19`	`log.Printf("BlockUntilReady() start. numLines:%v\n", b.NumLines)`
`20`	`20`	`log.Printf("buffer:%v\n", b)`
`21`	`21`	`//for b.Paused {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f80c1b8ea7dc18c7a37e992faf5d653fdeaf943d`
	`1`	`+3df1f92ede27c318225cb710b8ac5e40be69f956`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f0a0e31a9d17e0bcc75d4d962839324678347f89`
	`1`	`+cd11e5314da2b8e5e3659cc4771cdcf7e58cbb5a`