Elara6331/itd
4
6
Fork 12
Code Issues 8 Pull Requests 1 Projects Releases 11 Wiki Activity

Update infinitime library to fix connection bug

Browse Source
This commit is contained in:
Elara 2021-08-22 13:13:37 -07:00
parent c0bbfff872
commit c1134926aa
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -2,6 +2,8 @@ module go.arsenm.dev/itd
go 1.16 go 1.16
replace go.arsenm.dev/infinitime => /home/arsen/Code/infinitime
require ( require (
github.com/VividCortex/ewma v1.2.0 // indirect github.com/VividCortex/ewma v1.2.0 // indirect
github.com/abiosoft/ishell v2.0.0+incompatible github.com/abiosoft/ishell v2.0.0+incompatible
@ -19,7 +21,7 @@ require (
github.com/spf13/cast v1.4.1 // indirect github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cobra v1.2.1 github.com/spf13/cobra v1.2.1
github.com/spf13/viper v1.8.1 github.com/spf13/viper v1.8.1
go.arsenm.dev/infinitime v0.0.0-20210822032731-d228b6cf60f1 go.arsenm.dev/infinitime v0.0.0-20210822201216-955384489609
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect
golang.org/x/text v0.3.7 // indirect golang.org/x/text v0.3.7 // indirect
) )

2
go.sum
View File

@ -287,8 +287,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.arsenm.dev/infinitime v0.0.0-20210822032731-d228b6cf60f1 h1:Upswvnt1AxTfd6eBnhI8nYA/OqUoKUGVBTMNqaPAd0o=
go.arsenm.dev/infinitime v0.0.0-20210822032731-d228b6cf60f1/go.mod h1:gaepaueUz4J5FfxuV19B4w5pi+V3mD0LTef50ryxr/Q=
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=

1
main.go
View File

@ -56,7 +56,6 @@ func main() {
// Connect to InfiniTime with default options // Connect to InfiniTime with default options
dev, err := infinitime.Connect(&infinitime.Options{ dev, err := infinitime.Connect(&infinitime.Options{
AttemptReconnect: viper.GetBool("conn.reconnect"), AttemptReconnect: viper.GetBool("conn.reconnect"),
PairTimeout: infinitime.DefaultOptions.PairTimeout,
}) })
if err != nil { if err != nil {
log.Error().Err(err).Msg("Error connecting to InfiniTime") log.Error().Err(err).Msg("Error connecting to InfiniTime")

1
socket.go
View File

@ -272,6 +272,7 @@ func handleConnection(conn net.Conn, dev *infinitime.Device) {
err = dev.DFU.Start() err = dev.DFU.Start()
if err != nil { if err != nil {
connErr(conn, err, "Error performing upgrade") connErr(conn, err, "Error performing upgrade")
firmwareUpdating = false
break break
} }
firmwareUpdating = false firmwareUpdating = false