Skip to content

Commit ce063e3

Browse files
move gpio control in a package
1 parent 6a25629 commit ce063e3

File tree

2 files changed

+23
-180
lines changed

2 files changed

+23
-180
lines changed

gpio/gpio.go

Lines changed: 0 additions & 165 deletions
This file was deleted.

main.go

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"syscall"
1212
"time"
1313

14-
"github.com/krasi-georgiev/rpi-web-control/gpio"
1514
"github.com/krasi-georgiev/rpi-web-control/server"
15+
"github.com/krasi-georgiev/rpiGpio"
1616

1717
"github.com/coreos/go-systemd/daemon"
1818
"github.com/urfave/cli"
@@ -111,22 +111,30 @@ func control(w http.ResponseWriter, r *http.Request) {
111111
return
112112
}
113113

114-
t := gpio.NewControl()
114+
t := rpiGpio.NewControl()
115115

116-
if err := t.SetType(v); err != nil {
117-
log.Printf(err.Error())
118-
fmt.Fprint(w, err)
119-
return
116+
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+
}
120122
}
121-
if err := t.SetDelay(v); err != nil {
122-
log.Printf(err.Error())
123-
fmt.Fprint(w, err)
124-
return
123+
124+
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+
}
125130
}
126-
if err := t.SetPin(v); err != nil {
127-
log.Printf(err.Error())
128-
fmt.Fprint(w, err)
129-
return
131+
132+
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+
}
130138
}
131139

132140
ch := make(chan string)
@@ -308,5 +316,5 @@ func home(w http.ResponseWriter, r *http.Request) {
308316
309317
</body>
310318
</html>
311-
`, gpio.DefaultPin, gpio.DefaultDelay)
319+
`, rpiGpio.DefaultPin, rpiGpio.DefaultDelay)
312320
}

0 commit comments

Comments
 (0)