diff --git a/Dockerfile b/Dockerfile index 163147d..5143114 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM golang:alpine as builder -RUN apk add build-base linux-headers git +RUN apk add git RUN mkdir /build COPY . /build/ WORKDIR /build diff --git a/cmd/invertercli/invertercli.go b/cmd/invertercli/invertercli.go index 393231d..78d1e32 100644 --- a/cmd/invertercli/invertercli.go +++ b/cmd/invertercli/invertercli.go @@ -11,7 +11,7 @@ import ( "syscall" "github.com/diebietse/invertergui/mk2if" - "github.com/mikepb/go-serial" + "github.com/tarm/serial" ) // Basic CLI to serve as example lib usage @@ -37,10 +37,8 @@ func main() { panic(err) } } else { - options := serial.RawOptions - options.BitRate = 2400 - options.Mode = serial.MODE_READ_WRITE - p, err = options.Open(*dev) + serialConfig := &serial.Config{Name: *dev, Baud: 2400} + p, err = serial.OpenPort(serialConfig) if err != nil { panic(err) } diff --git a/cmd/invertergui/main.go b/cmd/invertergui/main.go index 96dee52..44502f9 100644 --- a/cmd/invertergui/main.go +++ b/cmd/invertergui/main.go @@ -40,8 +40,8 @@ import ( "github.com/diebietse/invertergui/frontend" "github.com/diebietse/invertergui/mk2if" "github.com/diebietse/invertergui/webgui" - "github.com/mikepb/go-serial" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/tarm/serial" ) func main() { @@ -66,10 +66,8 @@ func main() { panic(err) } } else { - options := serial.RawOptions - options.BitRate = 2400 - options.Mode = serial.MODE_READ_WRITE - p, err = options.Open(*dev) + serialConfig := &serial.Config{Name: *dev, Baud: 2400} + p, err = serial.OpenPort(serialConfig) if err != nil { panic(err) } diff --git a/go.mod b/go.mod index 5d7b9e5..f0c1004 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,8 @@ module github.com/diebietse/invertergui require ( github.com/gorilla/websocket v1.4.0 - github.com/mikepb/go-serial v0.0.0-20180731022703-d5134cecf05a github.com/prometheus/client_golang v0.9.2 github.com/rakyll/statik v0.1.5 + github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 + golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect ) diff --git a/go.sum b/go.sum index 28d6839..621c6f4 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,6 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mikepb/go-serial v0.0.0-20180731022703-d5134cecf05a h1:dCv1LIqgkmFyW9NTRX16FANqPkGcyCZAPV54TMGUV+I= -github.com/mikepb/go-serial v0.0.0-20180731022703-d5134cecf05a/go.mod h1:/GJho3VaF1qyrexGicbl96+cYZXep0Xr2hxYYwY/cpE= github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= @@ -18,6 +16,10 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nL github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/rakyll/statik v0.1.5 h1:Ly2UjURzxnsSYS0zI50fZ+srA+Fu7EbpV5hglvJvJG0= github.com/rakyll/statik v0.1.5/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190312061237-fead79001313 h1:pczuHS43Cp2ktBEEmLwScxgjWsBSzdaQiKzUyf3DTTc= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=