From a7b8d6827dbb9177e5b3534c0fa59cbe5e318a97 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 8 Sep 2017 01:25:26 +0200 Subject: ... --- cmd/poll/main.go | 4 ++-- cmd/runcmd/main.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/poll/main.go b/cmd/poll/main.go index 95be209..9cbf575 100644 --- a/cmd/poll/main.go +++ b/cmd/poll/main.go @@ -14,7 +14,7 @@ func main() { } defer dev.Close() - for state := range redbutton.Poll(dev, redbutton.PollInterval) { - fmt.Println(state) + for ev := range redbutton.Poll(dev, redbutton.PollInterval) { + fmt.Println(ev) } } diff --git a/cmd/runcmd/main.go b/cmd/runcmd/main.go index 4e2014d..b02e1fb 100644 --- a/cmd/runcmd/main.go +++ b/cmd/runcmd/main.go @@ -8,9 +8,9 @@ import ( "dim13.org/redbutton" ) -type StateFn func(redbutton.Event) StateFn +type stateFn func(redbutton.Event) stateFn -func Init(b redbutton.Event) StateFn { +func Init(b redbutton.Event) stateFn { if b == redbutton.LidOpen { log.Println("Ready...") return Armed @@ -18,7 +18,7 @@ func Init(b redbutton.Event) StateFn { return Init } -func Armed(b redbutton.Event) StateFn { +func Armed(b redbutton.Event) stateFn { if b == redbutton.ButtonPressed { log.Println("Go!") go Exec(os.Args[1:]) @@ -27,7 +27,7 @@ func Armed(b redbutton.Event) StateFn { return Init } -func Reset(b redbutton.Event) StateFn { +func Reset(b redbutton.Event) stateFn { if b == redbutton.LidClosed { log.Println("Reset...") return Init @@ -56,7 +56,7 @@ func main() { defer dev.Close() ev := redbutton.Poll(dev, redbutton.PollInterval) - for stateFn := Init; stateFn != nil; { - stateFn = stateFn(<-ev) + for state := Init; state != nil; { + state = state(<-ev) } } -- cgit v1.2.3