Skip to content

Commit 834392a

Browse files
committed
Change to go.mod
1 parent 96b50a4 commit 834392a

17 files changed

Lines changed: 121 additions & 46 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.gitmodules

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

cmd/deviceparameter/go.mod

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
module github.com/thinnect/go-devparam/cmd/deviceparameter
2+
3+
go 1.17
4+
5+
replace github.com/thinnect/go-devparam => ../..
6+
7+
require (
8+
github.com/jessevdk/go-flags v1.5.0
9+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd
10+
github.com/proactivity-lab/go-moteconnection v0.0.2
11+
github.com/thinnect/go-devparam v0.0.0-00010101000000-000000000000
12+
)
13+
14+
require (
15+
github.com/creack/goselect v0.1.2 // indirect
16+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e // indirect
17+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 // indirect
18+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
19+
)

cmd/deviceparameter/go.sum

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
2+
github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
3+
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
4+
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
5+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e h1:LY29wmnTcSR92avOm1dW0LSjeE3d9Xnhm/mpGzMT/wc=
6+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e/go.mod h1:+X++CLDTje8Yr7J4bGuUYx5LVbNpXPeO5ZLpI42hKVk=
7+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd h1:Q7CS1r9FUY6kSagUaAdLPMtY4MfKvG/eij2qcKqu7Ds=
8+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd/go.mod h1:PgvbfPpF7oknORD8/LicJY9ehj/R03KPx4uf1YEpntc=
9+
github.com/proactivity-lab/go-moteconnection v0.0.2 h1:QiPa7o30B5zeJ8O7M3A6e4Fc4PNZKXoFW2qm331bOac=
10+
github.com/proactivity-lab/go-moteconnection v0.0.2/go.mod h1:k0hDZkUZCSQQvQrmN2OcwI+tXAnQ2raJUPH4KqUD0Sc=
11+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 h1:eQfoPfT+gNSh63t/oKanQlZyKgblRa/LMZRPIT+MHzA=
12+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw=
13+
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
14+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
15+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

cmd/deviceparameters/go.mod

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
module github.com/thinnect/go-devparam/cmd/deviceparameters
2+
3+
go 1.17
4+
5+
replace github.com/thinnect/go-devparam => ../..
6+
7+
require (
8+
github.com/jessevdk/go-flags v1.5.0
9+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd
10+
github.com/proactivity-lab/go-moteconnection v0.0.2
11+
github.com/thinnect/go-devparam v0.0.0-00010101000000-000000000000
12+
)
13+
14+
require (
15+
github.com/creack/goselect v0.1.2 // indirect
16+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e // indirect
17+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 // indirect
18+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
19+
)

cmd/deviceparameters/go.sum

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
2+
github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
3+
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
4+
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
5+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e h1:LY29wmnTcSR92avOm1dW0LSjeE3d9Xnhm/mpGzMT/wc=
6+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e/go.mod h1:+X++CLDTje8Yr7J4bGuUYx5LVbNpXPeO5ZLpI42hKVk=
7+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd h1:Q7CS1r9FUY6kSagUaAdLPMtY4MfKvG/eij2qcKqu7Ds=
8+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd/go.mod h1:PgvbfPpF7oknORD8/LicJY9ehj/R03KPx4uf1YEpntc=
9+
github.com/proactivity-lab/go-moteconnection v0.0.2 h1:QiPa7o30B5zeJ8O7M3A6e4Fc4PNZKXoFW2qm331bOac=
10+
github.com/proactivity-lab/go-moteconnection v0.0.2/go.mod h1:k0hDZkUZCSQQvQrmN2OcwI+tXAnQ2raJUPH4KqUD0Sc=
11+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 h1:eQfoPfT+gNSh63t/oKanQlZyKgblRa/LMZRPIT+MHzA=
12+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw=
13+
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
14+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
15+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

dppackets_test.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
package deviceparameters
55

6-
import "testing"
7-
import "fmt"
8-
import "encoding/hex"
9-
import "github.com/proactivity-lab/go-sfconnection"
6+
import (
7+
"encoding/hex"
8+
"fmt"
9+
"strings"
10+
"testing"
11+
12+
"github.com/proactivity-lab/go-moteconnection"
13+
)
1014

1115
func TestSerializer(t *testing.T) {
1216
var p DpParameter
@@ -15,17 +19,18 @@ func TestSerializer(t *testing.T) {
1519
p.Id = "test"
1620
p.Value = []byte{1, 2, 3}
1721
fmt.Printf("np %v\n", p)
18-
b := sfconnection.SerializePacket(&p)
22+
b := moteconnection.SerializePacket(&p)
1923
fmt.Printf("sp %v\n", p)
2024
fmt.Printf("rb %X\n", b)
2125
}
2226

2327
func TestDeserializer(t *testing.T) {
2428
var dp DpParameter
2529

26-
raw, _ := hex.DecodeString("1000040374657374010203")
27-
if err := sfconnection.DeserializePacket(&dp, raw); err != nil {
28-
t.Error("error %s", err)
30+
s := strings.Replace("10 00 04 04 03 74657374 010203", " ", "", -1)
31+
raw, _ := hex.DecodeString(s)
32+
if err := moteconnection.DeserializePacket(&dp, raw); err != nil {
33+
t.Errorf("error %s", err)
2934
}
3035

3136
fmt.Printf("dp %v\n", dp)

go.mod

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module github.com/thinnect/go-devparam
2+
3+
go 1.17
4+
5+
require (
6+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd
7+
github.com/proactivity-lab/go-moteconnection v0.0.2
8+
)
9+
10+
require (
11+
github.com/creack/goselect v0.1.2 // indirect
12+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e // indirect
13+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 // indirect
14+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
15+
)

go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
2+
github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
3+
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
4+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e h1:LY29wmnTcSR92avOm1dW0LSjeE3d9Xnhm/mpGzMT/wc=
5+
github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e/go.mod h1:+X++CLDTje8Yr7J4bGuUYx5LVbNpXPeO5ZLpI42hKVk=
6+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd h1:Q7CS1r9FUY6kSagUaAdLPMtY4MfKvG/eij2qcKqu7Ds=
7+
github.com/proactivity-lab/go-loggers v0.0.0-20180417085828-f892709079bd/go.mod h1:PgvbfPpF7oknORD8/LicJY9ehj/R03KPx4uf1YEpntc=
8+
github.com/proactivity-lab/go-moteconnection v0.0.2 h1:QiPa7o30B5zeJ8O7M3A6e4Fc4PNZKXoFW2qm331bOac=
9+
github.com/proactivity-lab/go-moteconnection v0.0.2/go.mod h1:k0hDZkUZCSQQvQrmN2OcwI+tXAnQ2raJUPH4KqUD0Sc=
10+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 h1:eQfoPfT+gNSh63t/oKanQlZyKgblRa/LMZRPIT+MHzA=
11+
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw=
12+
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
14+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

manager_test.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44
package deviceparameters
55

6-
import "testing"
6+
import (
7+
"fmt"
8+
"log"
9+
"os"
10+
"testing"
11+
"time"
712

8-
import "log"
9-
import "os"
10-
import "fmt"
11-
import "time"
12-
import "github.com/proactivity-lab/go-sfconnection"
13+
"github.com/proactivity-lab/go-moteconnection"
14+
)
1315

1416
func TestDpm(t *testing.T) {
15-
sfc := sfconnection.NewSfConnection()
17+
sfc := moteconnection.NewSfConnection("localhost", 9002)
1618
dp := NewDeviceParameterManager(sfc)
1719

1820
logformat := log.Ldate | log.Ltime | log.Lmicroseconds | log.Lshortfile
@@ -31,14 +33,14 @@ func TestDpm(t *testing.T) {
3133
dp.SetWarningLogger(warninglogger)
3234
dp.SetErrorLogger(errorlogger)
3335

34-
sfc.Autoconnect("localhost", 9002, 30*time.Second)
36+
sfc.Autoconnect(30 * time.Second)
3537

3638
time.Sleep(time.Second)
3739

3840
v1, err := dp.GetValue("radio_channel")
3941
fmt.Printf("%v %v\n", v1, err)
4042

41-
v2, err := dp.GetValue("ident")
43+
v2, err := dp.GetValue("ident_timestamp")
4244
fmt.Printf("%v %v\n", v2, err)
4345

4446
v3, err := dp.GetValue("dummy")

0 commit comments

Comments
 (0)