Skip to content

Commit 98c5555

Browse files
updated the rpigpio package and now using funcional configuration.
1 parent 6ab1065 commit 98c5555

File tree

14 files changed

+1032
-189
lines changed

14 files changed

+1032
-189
lines changed

Gopkg.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

main.go

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -111,50 +111,33 @@ func control(w http.ResponseWriter, r *http.Request) {
111111
return
112112
}
113113

114-
t := rpiGpio.NewControl()
115-
114+
var ctype, delay, pin string
116115
if d, ok := v["type"]; ok {
117-
if err := t.SetType(d[0]); err != nil {
118-
log.Printf(err.Error())
119-
fmt.Fprint(w, err)
120-
return
121-
}
116+
ctype = d[0]
122117
}
123118

124119
if d, ok := v["delay"]; ok && d[0] != "" {
125-
if err := t.SetDelay(d[0]); err != nil {
126-
log.Printf(err.Error())
127-
fmt.Fprint(w, err)
128-
return
129-
}
120+
delay = d[0]
130121
}
131122

132123
if d, ok := v["pin"]; ok && d[0] != "" {
133-
if err := t.SetPin(d[0]); err != nil {
134-
log.Printf(err.Error())
135-
fmt.Fprint(w, err)
136-
return
137-
}
124+
pin = d[0]
138125
}
139126

140-
ch := make(chan string)
141-
go func() {
142-
switch a := t.Type; a {
143-
case "timer":
144-
if err := t.StartTimer(ch); err != nil {
145-
r := fmt.Sprintf("Huston we have a problem with the timer: %v", err)
146-
log.Printf(r)
147-
ch <- r
148-
}
149-
case "toggle":
150-
if err := t.Toggle(ch); err != nil {
151-
r := fmt.Sprintf("Huston we have a problem with the toggle: %v", err)
152-
log.Printf(r)
153-
ch <- r
154-
}
155-
}
156-
}()
157-
fmt.Fprint(w, <-ch)
127+
t, err := rpiGpio.NewControl(rpiGpio.SetType(ctype), rpiGpio.SetDelay(delay), rpiGpio.SetPin(pin))
128+
if err != nil {
129+
log.Printf(err.Error())
130+
fmt.Fprint(w, err)
131+
return
132+
}
133+
134+
if err := t.Run(); err != nil {
135+
r := fmt.Sprintf("Huston we have a problem : %v", err)
136+
log.Printf(r)
137+
fmt.Fprint(w, r)
138+
} else {
139+
fmt.Fprint(w, "done")
140+
}
158141
}
159142

160143
func shutdown(quit chan os.Signal, srv *http.Server) error {

vendor/github.com/coreos/go-systemd/.travis.yml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/Jenkinsfile

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)