Add rewritten infinitime abstraction and integrate it into ITD
This commit is contained in:
parent
2a8013e63e
commit
7e68d5541c
@ -3,15 +3,15 @@ package api
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.elara.ws/infinitime"
|
||||
"go.elara.ws/itd/infinitime"
|
||||
"go.elara.ws/itd/internal/rpc"
|
||||
)
|
||||
|
||||
type ResourceOperation uint8
|
||||
type ResourceOperation infinitime.ResourceOperation
|
||||
|
||||
const (
|
||||
ResourceOperationRemoveObsolete = infinitime.ResourceOperationRemoveObsolete
|
||||
ResourceOperationUpload = infinitime.ResourceOperationUpload
|
||||
ResourceRemove = infinitime.ResourceRemove
|
||||
ResourceUpload = infinitime.ResourceUpload
|
||||
)
|
||||
|
||||
type ResourceLoadProgress struct {
|
||||
|
||||
47
calls.go
47
calls.go
@ -2,10 +2,9 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/godbus/dbus/v5"
|
||||
"go.elara.ws/infinitime"
|
||||
"go.elara.ws/itd/infinitime"
|
||||
"go.elara.ws/itd/internal/utils"
|
||||
"go.elara.ws/logger/log"
|
||||
)
|
||||
@ -50,7 +49,6 @@ func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) e
|
||||
// Notify channel upon received message
|
||||
monitorConn.Eavesdrop(callCh)
|
||||
|
||||
var respHandlerOnce sync.Once
|
||||
var callObj dbus.BusObject
|
||||
|
||||
wg.Add(1)
|
||||
@ -83,33 +81,28 @@ func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) e
|
||||
}
|
||||
|
||||
// Send call notification to InfiniTime
|
||||
resCh, err := dev.NotifyCall(phoneNum)
|
||||
err = dev.NotifyCall(phoneNum, func(cs infinitime.CallStatus) {
|
||||
switch cs {
|
||||
case infinitime.CallStatusAccepted:
|
||||
// Attempt to accept call
|
||||
err = acceptCall(ctx, conn, callObj)
|
||||
if err != nil {
|
||||
log.Warn("Error accepting call").Err(err).Send()
|
||||
}
|
||||
case infinitime.CallStatusDeclined:
|
||||
// Attempt to decline call
|
||||
err = declineCall(ctx, conn, callObj)
|
||||
if err != nil {
|
||||
log.Warn("Error declining call").Err(err).Send()
|
||||
}
|
||||
case infinitime.CallStatusMuted:
|
||||
// Warn about unimplemented muting
|
||||
log.Warn("Muting calls is not implemented").Send()
|
||||
}
|
||||
})
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
go respHandlerOnce.Do(func() {
|
||||
// Wait for PineTime response
|
||||
for res := range resCh {
|
||||
switch res {
|
||||
case infinitime.CallStatusAccepted:
|
||||
// Attempt to accept call
|
||||
err = acceptCall(ctx, conn, callObj)
|
||||
if err != nil {
|
||||
log.Warn("Error accepting call").Err(err).Send()
|
||||
}
|
||||
case infinitime.CallStatusDeclined:
|
||||
// Attempt to decline call
|
||||
err = declineCall(ctx, conn, callObj)
|
||||
if err != nil {
|
||||
log.Warn("Error declining call").Err(err).Send()
|
||||
}
|
||||
case infinitime.CallStatusMuted:
|
||||
// Warn about unimplemented muting
|
||||
log.Warn("Muting calls is not implemented").Send()
|
||||
}
|
||||
}
|
||||
})
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ import (
|
||||
|
||||
"github.com/cheggaaa/pb/v3"
|
||||
"github.com/urfave/cli/v2"
|
||||
"go.elara.ws/infinitime"
|
||||
"go.elara.ws/itd/infinitime"
|
||||
)
|
||||
|
||||
func resourcesLoad(c *cli.Context) error {
|
||||
@ -39,7 +39,7 @@ func resLoad(ctx context.Context, args []string) error {
|
||||
return evt.Err
|
||||
}
|
||||
|
||||
if evt.Operation == infinitime.ResourceOperationRemoveObsolete {
|
||||
if evt.Operation == infinitime.ResourceRemove {
|
||||
bar.SetTemplateString(rmTmpl)
|
||||
bar.Set("filename", evt.Name)
|
||||
} else {
|
||||
|
||||
@ -11,8 +11,8 @@ import (
|
||||
"fyne.io/fyne/v2/storage"
|
||||
"fyne.io/fyne/v2/theme"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"go.elara.ws/infinitime"
|
||||
"go.elara.ws/itd/api"
|
||||
"go.elara.ws/itd/infinitime"
|
||||
)
|
||||
|
||||
func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan struct{}) fyne.CanvasObject {
|
||||
@ -77,9 +77,9 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
|
||||
|
||||
for evt := range progCh {
|
||||
switch evt.Operation {
|
||||
case infinitime.ResourceOperationRemoveObsolete:
|
||||
case infinitime.ResourceRemove:
|
||||
progressDlg.SetText("Removing " + evt.Name)
|
||||
case infinitime.ResourceOperationUpload:
|
||||
case infinitime.ResourceUpload:
|
||||
progressDlg.SetText("Uploading " + evt.Name)
|
||||
progressDlg.SetTotal(float64(evt.Total))
|
||||
progressDlg.SetValue(float64(evt.Sent))
|
||||
|
||||
2
fuse.go
2
fuse.go
@ -6,7 +6,7 @@ import (
|
||||
|
||||
"github.com/hanwen/go-fuse/v2/fs"
|
||||
"github.com/hanwen/go-fuse/v2/fuse"
|
||||
"go.elara.ws/infinitime"
|
||||
"go.elara.ws/itd/infinitime"
|
||||
"go.elara.ws/itd/internal/fusefs"
|
||||
"go.elara.ws/logger/log"
|
||||
)
|
||||
|
||||
15
go.mod
15
go.mod
@ -4,6 +4,8 @@ go 1.18
|
||||
|
||||
replace fyne.io/x/fyne => github.com/metal3d/fyne-x v0.0.0-20220508095732-177117e583fb
|
||||
|
||||
replace tinygo.org/x/bluetooth => github.com/elara6331/bluetooth v0.9.1-0.20240413234149-a0e71474a768
|
||||
|
||||
require (
|
||||
fyne.io/fyne/v2 v2.3.0
|
||||
fyne.io/x/fyne v0.0.0-20220107050838-c4a1de51d4ce
|
||||
@ -16,12 +18,12 @@ require (
|
||||
github.com/mozillazg/go-pinyin v0.19.0
|
||||
github.com/urfave/cli/v2 v2.23.7
|
||||
go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d
|
||||
go.elara.ws/infinitime v0.0.0-20240402045329-bd2aa32354bb
|
||||
go.elara.ws/logger v0.0.0-20230928062203-85e135cf02ae
|
||||
golang.org/x/text v0.5.0
|
||||
google.golang.org/protobuf v1.28.1
|
||||
modernc.org/sqlite v1.20.1
|
||||
storj.io/drpc v0.0.32
|
||||
tinygo.org/x/bluetooth v0.9.0
|
||||
)
|
||||
|
||||
require (
|
||||
@ -32,15 +34,14 @@ require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/dustin/go-humanize v1.0.0 // indirect
|
||||
github.com/fatih/color v1.13.0 // indirect
|
||||
github.com/fatih/structs v1.1.0 // indirect
|
||||
github.com/fredbi/uri v1.0.0 // indirect
|
||||
github.com/fsnotify/fsnotify v1.6.0 // indirect
|
||||
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
|
||||
github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 // indirect
|
||||
github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 // indirect
|
||||
github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345 // indirect
|
||||
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
|
||||
github.com/go-ole/go-ole v1.2.6 // indirect
|
||||
github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181 // indirect
|
||||
github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
|
||||
github.com/google/uuid v1.3.0 // indirect
|
||||
@ -54,18 +55,18 @@ require (
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/muka/go-bluetooth v0.0.0-20220819140550-1d8857e3b268 // indirect
|
||||
github.com/pelletier/go-toml v1.9.5 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
|
||||
github.com/rivo/uniseg v0.4.3 // indirect
|
||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||
github.com/sirupsen/logrus v1.9.0 // indirect
|
||||
github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4 // indirect
|
||||
github.com/sirupsen/logrus v1.9.3 // indirect
|
||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
|
||||
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
|
||||
github.com/stretchr/testify v1.8.1 // indirect
|
||||
github.com/tevino/abool v1.2.0 // indirect
|
||||
github.com/x448/float16 v0.8.4 // indirect
|
||||
github.com/tinygo-org/cbgo v0.0.4 // indirect
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
|
||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
||||
github.com/yuin/goldmark v1.5.3 // indirect
|
||||
@ -74,7 +75,7 @@ require (
|
||||
golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
|
||||
golang.org/x/mod v0.7.0 // indirect
|
||||
golang.org/x/net v0.4.0 // indirect
|
||||
golang.org/x/sys v0.6.0 // indirect
|
||||
golang.org/x/sys v0.11.0 // indirect
|
||||
golang.org/x/tools v0.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 // indirect
|
||||
|
||||
34
go.sum
34
go.sum
@ -107,6 +107,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
||||
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
|
||||
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc=
|
||||
github.com/elara6331/bluetooth v0.9.1-0.20240413234149-a0e71474a768 h1:iWP52WinMhd+pQB+2GedWvUxkd4pMqFvV0S6MjMFQSc=
|
||||
github.com/elara6331/bluetooth v0.9.1-0.20240413234149-a0e71474a768/go.mod h1:V9XwH/xQ2SmCIW+T0pmpL7VzijY53JRVsJcDM0YN6PI=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
@ -119,7 +121,6 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
|
||||
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
|
||||
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
|
||||
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
|
||||
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
|
||||
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
||||
github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3/go.mod h1:CzM2G82Q9BDUvMTGHnXf/6OExw/Dz2ivDj48nVg7Lg8=
|
||||
github.com/fredbi/uri v0.1.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0=
|
||||
@ -129,8 +130,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
|
||||
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
|
||||
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
|
||||
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
|
||||
github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
|
||||
github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
|
||||
github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
|
||||
github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 h1:SFtj9yo9C7F4CxyJeSJi9AjT6x9c88gnY1tjlXWh9QU=
|
||||
github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
|
||||
@ -161,15 +160,14 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
|
||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
|
||||
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
|
||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
|
||||
github.com/go-text/typesetting v0.0.0-20221212183139-1eb938670a1f/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI=
|
||||
github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181 h1:J6XG/Xx7uCCpskM71R6YAgPHd/E8FzhyPhL6Ll94uMY=
|
||||
github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI=
|
||||
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
@ -240,7 +238,6 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe
|
||||
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
@ -398,8 +395,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
|
||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
github.com/mozillazg/go-pinyin v0.19.0 h1:p+J8/kjJ558KPvVGYLvqBhxf8jbZA2exSLCs2uUVN8c=
|
||||
github.com/mozillazg/go-pinyin v0.19.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
|
||||
github.com/muka/go-bluetooth v0.0.0-20220819140550-1d8857e3b268 h1:kOnq7TfaAO2Vc/MHxPqFIXe00y1qBxJAvhctXdko6vo=
|
||||
github.com/muka/go-bluetooth v0.0.0-20220819140550-1d8857e3b268/go.mod h1:dMCjicU6vRBk34dqOmIZm0aod6gUwZXOXzBROqGous0=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
|
||||
@ -411,7 +406,6 @@ github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnu
|
||||
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
|
||||
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||
github.com/paypal/gatt v0.0.0-20151011220935-4ae819d591cf/go.mod h1:+AwQL2mK3Pd3S+TUwg0tYQjid0q1txyNUJuuSmz8Kdk=
|
||||
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
|
||||
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
|
||||
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
|
||||
@ -456,6 +450,8 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
|
||||
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
||||
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
||||
github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
|
||||
github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4 h1:zurEWtOr/OYiTb5bcD7eeHLOfj6vCR30uldlwse1cSM=
|
||||
github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4/go.mod h1:CIltaIm7qaANUIvzr0Vmz71lmQMAIbGJ7cvgzX7FMfA=
|
||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
|
||||
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
|
||||
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
|
||||
@ -463,10 +459,11 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
|
||||
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
|
||||
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
|
||||
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
||||
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||
@ -501,17 +498,16 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/suapapa/go_eddystone v1.3.1/go.mod h1:bXC11TfJOS+3g3q/Uzd7FKd5g62STQEfeEIhcKe4Qy8=
|
||||
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
|
||||
github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA=
|
||||
github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg=
|
||||
github.com/tinygo-org/cbgo v0.0.4 h1:3D76CRYbH03Rudi8sEgs/YO0x3JIMdyq8jlQtk/44fU=
|
||||
github.com/tinygo-org/cbgo v0.0.4/go.mod h1:7+HgWIHd4nbAz0ESjGlJ1/v9LDU1Ox8MGzP9mah/fLk=
|
||||
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
|
||||
github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg=
|
||||
github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
|
||||
github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
|
||||
github.com/wagslane/go-password-validator v0.3.0/go.mod h1:TI1XJ6T5fRdRnHqHt14pvy1tNVnrwe7m3/f1f2fDphQ=
|
||||
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
|
||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
|
||||
@ -531,8 +527,6 @@ github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs=
|
||||
github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
|
||||
go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d h1:ANb8YPtcxPipwKgmnW688e5PGpNaLh+22nO2LBpIPOU=
|
||||
go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d/go.mod h1:NDprjiVqKXQKVGzX7jp2g/jctsUbvOxz1nN15QOBEGk=
|
||||
go.elara.ws/infinitime v0.0.0-20240402045329-bd2aa32354bb h1:nBxUp/6BhVv5NcQnXP4lY2ytkiQTCaG3P/TaQL2MVs8=
|
||||
go.elara.ws/infinitime v0.0.0-20240402045329-bd2aa32354bb/go.mod h1:zJx0h0bWsz7DFDuF1jrXtGmMG4i4+iciOc8L2oawIHU=
|
||||
go.elara.ws/logger v0.0.0-20230928062203-85e135cf02ae h1:d+gJUhEWSrOjrrfgeydYWEr8TTnx0DLvcVhghaOsFeE=
|
||||
go.elara.ws/logger v0.0.0-20230928062203-85e135cf02ae/go.mod h1:qng49owViqsW5Aey93lwBXONw20oGbJIoLVscB16mPM=
|
||||
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
|
||||
@ -726,7 +720,6 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
@ -748,8 +741,6 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
@ -757,8 +748,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
|
||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
@ -821,7 +812,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
|
||||
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
|
||||
golang.org/x/tools v0.0.0-20200925191224-5d1fdd8fa346/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
|
||||
golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
|
||||
142
infinitime/chars.go
Normal file
142
infinitime/chars.go
Normal file
@ -0,0 +1,142 @@
|
||||
package infinitime
|
||||
|
||||
import "tinygo.org/x/bluetooth"
|
||||
|
||||
type btChar struct {
|
||||
Name string
|
||||
ID bluetooth.UUID
|
||||
ServiceID bluetooth.UUID
|
||||
}
|
||||
|
||||
var (
|
||||
musicServiceUUID = mustParse("00000000-78fc-48fe-8e23-433b3a1942d0")
|
||||
navigationServiceUUID = mustParse("00010000-78fc-48fe-8e23-433b3a1942d0")
|
||||
motionServiceUUID = mustParse("00030000-78fc-48fe-8e23-433b3a1942d0")
|
||||
weatherServiceUUID = mustParse("00050000-78fc-48fe-8e23-433b3a1942d0")
|
||||
)
|
||||
|
||||
var (
|
||||
newAlertChar = btChar{
|
||||
"New Alert",
|
||||
bluetooth.CharacteristicUUIDNewAlert,
|
||||
bluetooth.ServiceUUIDAlertNotification,
|
||||
}
|
||||
notifEventChar = btChar{
|
||||
"Notification Event",
|
||||
mustParse("00020001-78fc-48fe-8e23-433b3a1942d0"),
|
||||
bluetooth.ServiceUUIDAlertNotification,
|
||||
}
|
||||
stepCountChar = btChar{
|
||||
"Step Count",
|
||||
mustParse("00030001-78fc-48fe-8e23-433b3a1942d0"),
|
||||
motionServiceUUID,
|
||||
}
|
||||
rawMotionChar = btChar{
|
||||
"Raw Motion",
|
||||
mustParse("00030002-78fc-48fe-8e23-433b3a1942d0"),
|
||||
motionServiceUUID,
|
||||
}
|
||||
firmwareVerChar = btChar{
|
||||
"Firmware Version",
|
||||
bluetooth.CharacteristicUUIDFirmwareRevisionString,
|
||||
bluetooth.ServiceUUIDDeviceInformation,
|
||||
}
|
||||
currentTimeChar = btChar{
|
||||
"Current Time",
|
||||
bluetooth.CharacteristicUUIDCurrentTime,
|
||||
bluetooth.ServiceUUIDCurrentTime,
|
||||
}
|
||||
localTimeChar = btChar{
|
||||
"Local Time",
|
||||
bluetooth.CharacteristicUUIDLocalTimeInformation,
|
||||
bluetooth.ServiceUUIDCurrentTime,
|
||||
}
|
||||
batteryLevelChar = btChar{
|
||||
"Battery Level",
|
||||
bluetooth.CharacteristicUUIDBatteryLevel,
|
||||
bluetooth.ServiceUUIDBattery,
|
||||
}
|
||||
heartRateChar = btChar{
|
||||
"Heart Rate",
|
||||
bluetooth.CharacteristicUUIDHeartRateMeasurement,
|
||||
bluetooth.ServiceUUIDHeartRate,
|
||||
}
|
||||
fsVersionChar = btChar{
|
||||
"Filesystem Version",
|
||||
mustParse("adaf0200-4669-6c65-5472-616e73666572"),
|
||||
bluetooth.ServiceUUIDFileTransferByAdafruit,
|
||||
}
|
||||
fsTransferChar = btChar{
|
||||
"Filesystem Transfer",
|
||||
mustParse("adaf0200-4669-6c65-5472-616e73666572"),
|
||||
bluetooth.ServiceUUIDFileTransferByAdafruit,
|
||||
}
|
||||
dfuCtrlPointChar = btChar{
|
||||
"DFU Control Point",
|
||||
bluetooth.CharacteristicUUIDLegacyDFUControlPoint,
|
||||
bluetooth.ServiceUUIDLegacyDFU,
|
||||
}
|
||||
dfuPacketChar = btChar{
|
||||
"DFU Packet",
|
||||
bluetooth.CharacteristicUUIDLegacyDFUPacket,
|
||||
bluetooth.ServiceUUIDLegacyDFU,
|
||||
}
|
||||
navigationFlagsChar = btChar{
|
||||
"Navigation Flags",
|
||||
mustParse("00010001-78fc-48fe-8e23-433b3a1942d0"),
|
||||
navigationServiceUUID,
|
||||
}
|
||||
navigationNarrativeChar = btChar{
|
||||
"Navigation Narrative",
|
||||
mustParse("00010002-78fc-48fe-8e23-433b3a1942d0"),
|
||||
navigationServiceUUID,
|
||||
}
|
||||
navigationManDist = btChar{
|
||||
"Navigation Man Dist",
|
||||
mustParse("00010003-78fc-48fe-8e23-433b3a1942d0"),
|
||||
navigationServiceUUID,
|
||||
}
|
||||
navigationProgress = btChar{
|
||||
"Navigation Progress",
|
||||
mustParse("00010004-78fc-48fe-8e23-433b3a1942d0"),
|
||||
navigationServiceUUID,
|
||||
}
|
||||
weatherDataChar = btChar{
|
||||
"Weather Data",
|
||||
mustParse("00050001-78fc-48fe-8e23-433b3a1942d0"),
|
||||
weatherServiceUUID,
|
||||
}
|
||||
musicEventChar = btChar{
|
||||
"Music Event",
|
||||
mustParse("00000001-78fc-48fe-8e23-433b3a1942d0"),
|
||||
musicServiceUUID,
|
||||
}
|
||||
musicStatusChar = btChar{
|
||||
"Music Status",
|
||||
mustParse("00000002-78fc-48fe-8e23-433b3a1942d0"),
|
||||
musicServiceUUID,
|
||||
}
|
||||
musicArtistChar = btChar{
|
||||
"Music Artist",
|
||||
mustParse("00000003-78fc-48fe-8e23-433b3a1942d0"),
|
||||
musicServiceUUID,
|
||||
}
|
||||
musicTrackChar = btChar{
|
||||
"Music Track",
|
||||
mustParse("00000004-78fc-48fe-8e23-433b3a1942d0"),
|
||||
musicServiceUUID,
|
||||
}
|
||||
musicAlbumChar = btChar{
|
||||
"Music Album",
|
||||
mustParse("00000005-78fc-48fe-8e23-433b3a1942d0"),
|
||||
musicServiceUUID,
|
||||
}
|
||||
)
|
||||
|
||||
func mustParse(s string) bluetooth.UUID {
|
||||
uuid, err := bluetooth.ParseUUID(s)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return uuid
|
||||
}
|
||||
222
infinitime/dfu.go
Normal file
222
infinitime/dfu.go
Normal file
@ -0,0 +1,222 @@
|
||||
package infinitime
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
|
||||
"tinygo.org/x/bluetooth"
|
||||
)
|
||||
|
||||
const (
|
||||
dfuSegmentSize = 20 // Size of each firmware packet
|
||||
dfuPktRecvInterval = 10 // Amount of packets to send before checking for receipt
|
||||
)
|
||||
|
||||
var (
|
||||
dfuCmdStart = []byte{0x01, 0x04}
|
||||
dfuCmdRecvInitPkt = []byte{0x02, 0x00}
|
||||
dfuCmdInitPktComplete = []byte{0x02, 0x01}
|
||||
dfuCmdPktReceiptInterval = []byte{0x08}
|
||||
dfuCmdRecvFirmware = []byte{0x03}
|
||||
dfuCmdValidate = []byte{0x04}
|
||||
dfuCmdActivateReset = []byte{0x05}
|
||||
|
||||
dfuResponseStart = []byte{0x10, 0x01, 0x01}
|
||||
dfuResponseInitParams = []byte{0x10, 0x02, 0x01}
|
||||
dfuResponseRecvFwImgSuccess = []byte{0x10, 0x03, 0x01}
|
||||
dfuResponseValidate = []byte{0x10, 0x04, 0x01}
|
||||
)
|
||||
|
||||
// DFUOptions contains options for [UpgradeFirmware]
|
||||
type DFUOptions struct {
|
||||
InitPacket fs.File
|
||||
FirmwareImage fs.File
|
||||
ProgressFunc func(sent, received, total uint32)
|
||||
SegmentSize int
|
||||
ReceiveInterval uint8
|
||||
}
|
||||
|
||||
// UpgradeFirmware upgrades the firmware running on the PineTime.
|
||||
func (d *Device) UpgradeFirmware(opts DFUOptions) error {
|
||||
if opts.SegmentSize <= 0 {
|
||||
opts.SegmentSize = dfuSegmentSize
|
||||
}
|
||||
|
||||
if opts.ReceiveInterval <= 0 {
|
||||
opts.ReceiveInterval = dfuPktRecvInterval
|
||||
}
|
||||
|
||||
ctrlPoint, err := d.getChar(dfuCtrlPointChar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
packet, err := d.getChar(dfuPacketChar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
d.deviceMtx.Lock()
|
||||
defer d.deviceMtx.Unlock()
|
||||
|
||||
d.updating.Store(true)
|
||||
defer d.updating.Store(false)
|
||||
|
||||
_, err = ctrlPoint.WriteWithoutResponse(dfuCmdStart)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fi, err := opts.FirmwareImage.Stat()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
size := uint32(fi.Size())
|
||||
|
||||
sizePacket := make([]byte, 8, 12)
|
||||
sizePacket = binary.LittleEndian.AppendUint32(sizePacket, size)
|
||||
_, err = packet.WriteWithoutResponse(sizePacket)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = awaitDFUResponse(ctrlPoint, dfuResponseStart)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = writeDFUInitPacket(ctrlPoint, packet, opts.InitPacket)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = setRecvInterval(ctrlPoint, opts.ReceiveInterval)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = sendFirmware(ctrlPoint, packet, opts, size)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return finalize(ctrlPoint)
|
||||
}
|
||||
|
||||
func finalize(ctrlPoint *bluetooth.DeviceCharacteristic) error {
|
||||
_, err := ctrlPoint.WriteWithoutResponse(dfuCmdValidate)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = awaitDFUResponse(ctrlPoint, dfuResponseValidate)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, _ = ctrlPoint.WriteWithoutResponse(dfuCmdActivateReset)
|
||||
return nil
|
||||
}
|
||||
|
||||
func sendFirmware(ctrlPoint, packet *bluetooth.DeviceCharacteristic, opts DFUOptions, totalSize uint32) error {
|
||||
_, err := ctrlPoint.WriteWithoutResponse(dfuCmdRecvFirmware)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var (
|
||||
chunksSinceReceipt uint8
|
||||
bytesSent uint32
|
||||
)
|
||||
|
||||
chunk := make([]byte, opts.SegmentSize)
|
||||
for {
|
||||
n, err := opts.FirmwareImage.Read(chunk)
|
||||
if err != nil && !errors.Is(err, io.EOF) {
|
||||
return err
|
||||
} else if n == 0 {
|
||||
break
|
||||
}
|
||||
|
||||
bytesSent += uint32(n)
|
||||
_, err = packet.WriteWithoutResponse(chunk[:n])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if errors.Is(err, io.EOF) {
|
||||
break
|
||||
}
|
||||
|
||||
chunksSinceReceipt += 1
|
||||
if chunksSinceReceipt == opts.ReceiveInterval {
|
||||
sizeData, err := awaitDFUResponse(ctrlPoint, []byte{0x11})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
size := binary.LittleEndian.Uint32(sizeData)
|
||||
if size != bytesSent {
|
||||
return fmt.Errorf("size mismatch: expected %d, got %d", bytesSent, size)
|
||||
}
|
||||
if opts.ProgressFunc != nil {
|
||||
opts.ProgressFunc(bytesSent, size, totalSize)
|
||||
}
|
||||
chunksSinceReceipt = 0
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func writeDFUInitPacket(ctrlPoint, packet *bluetooth.DeviceCharacteristic, initPkt fs.File) error {
|
||||
_, err := ctrlPoint.WriteWithoutResponse(dfuCmdRecvInitPkt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
initData, err := io.ReadAll(initPkt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = packet.WriteWithoutResponse(initData)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = ctrlPoint.WriteWithoutResponse(dfuCmdInitPktComplete)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = awaitDFUResponse(ctrlPoint, dfuResponseInitParams)
|
||||
return err
|
||||
}
|
||||
|
||||
func setRecvInterval(ctrlPoint *bluetooth.DeviceCharacteristic, interval uint8) error {
|
||||
_, err := ctrlPoint.WriteWithoutResponse(append(dfuCmdPktReceiptInterval, interval))
|
||||
return err
|
||||
}
|
||||
|
||||
func awaitDFUResponse(ctrlPoint *bluetooth.DeviceCharacteristic, expect []byte) ([]byte, error) {
|
||||
respCh := make(chan []byte, 1)
|
||||
err := ctrlPoint.EnableNotifications(func(buf []byte) {
|
||||
respCh <- buf
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data := <-respCh
|
||||
ctrlPoint.EnableNotifications(nil)
|
||||
|
||||
if !bytes.HasPrefix(data, expect) {
|
||||
return nil, fmt.Errorf("unexpected dfu response %x (expected %x)", data, expect)
|
||||
}
|
||||
|
||||
return bytes.TrimPrefix(data, expect), nil
|
||||
}
|
||||
601
infinitime/fs.go
Normal file
601
infinitime/fs.go
Normal file
@ -0,0 +1,601 @@
|
||||
package infinitime
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
"io/fs"
|
||||
"math"
|
||||
"path"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
|
||||
"go.elara.ws/itd/internal/fsproto"
|
||||
"tinygo.org/x/bluetooth"
|
||||
)
|
||||
|
||||
// FS represents a remote BLE filesystem
|
||||
type FS struct {
|
||||
mtx sync.Mutex
|
||||
dev *Device
|
||||
}
|
||||
|
||||
// Stat gets information about a file at the given path.
|
||||
//
|
||||
// WARNING: Since there's no stat command in the BLE FS protocol,
|
||||
// this function does a ReadDir and then finds the requested file
|
||||
// in the results, which makes it pretty slow.
|
||||
func (ifs *FS) Stat(p string) (fs.FileInfo, error) {
|
||||
dir := path.Dir(p)
|
||||
entries, err := ifs.ReadDir(dir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, entry := range entries {
|
||||
if entry.Name() == path.Base(p) {
|
||||
return entry.Info()
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fsproto.ErrFileNotExists
|
||||
}
|
||||
|
||||
// Remove removes a file or empty directory at the given path.
|
||||
//
|
||||
// For a function that removes directories recursively, see [FS.RemoveAll]
|
||||
func (ifs *FS) Remove(path string) error {
|
||||
ifs.mtx.Lock()
|
||||
defer ifs.mtx.Unlock()
|
||||
|
||||
char, err := ifs.dev.getChar(fsTransferChar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return ifs.requestThenAwaitResponse(
|
||||
char,
|
||||
fsproto.DeleteFileOpcode,
|
||||
fsproto.DeleteFileRequest{
|
||||
PathLen: uint16(len(path)),
|
||||
Path: path,
|
||||
},
|
||||
func(buf []byte) (bool, error) {
|
||||
var mdr fsproto.DeleteFileResponse
|
||||
return true, fsproto.ReadResponse(buf, fsproto.DeleteFileResp, &mdr)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
// Rename moves a file or directory from an old path to a new path.
|
||||
func (ifs *FS) Rename(old, new string) error {
|
||||
ifs.mtx.Lock()
|
||||
defer ifs.mtx.Unlock()
|
||||
|
||||
char, err := ifs.dev.getChar(fsTransferChar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return ifs.requestThenAwaitResponse(
|
||||
char,
|
||||
fsproto.MoveFileOpcode,
|
||||
fsproto.MoveFileRequest{
|
||||
OldPathLen: uint16(len(old)),
|
||||
OldPath: old,
|
||||
NewPathLen: uint16(len(new)),
|
||||
NewPath: new,
|
||||
},
|
||||
func(buf []byte) (bool, error) {
|
||||
var mfr fsproto.MoveFileResponse
|
||||
return true, fsproto.ReadResponse(buf, fsproto.MoveFileResp, &mfr)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
// Mkdir creates a new directory at the specified path.
|
||||
//
|
||||
// For a function that creates necessary parents as well, see [FS.MkdirAll]
|
||||
func (ifs *FS) Mkdir(path string) error {
|
||||
ifs.mtx.Lock()
|
||||
defer ifs.mtx.Unlock()
|
||||
|
||||
char, err := ifs.dev.getChar(fsTransferChar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return ifs.requestThenAwaitResponse(
|
||||
char,
|
||||
fsproto.MakeDirectoryOpcode,
|
||||
fsproto.MkdirRequest{
|
||||
PathLen: uint16(len(path)),
|
||||
Path: path,
|
||||
},
|
||||
func(buf []byte) (bool, error) {
|
||||
var mdr fsproto.MkdirResponse
|
||||
return true, fsproto.ReadResponse(buf, fsproto.MakeDirectoryResp, &mdr)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
// ReadDir reads the directory at the specified path and returns a list of directory entries.
|
||||
func (ifs *FS) ReadDir(path string) ([]fs.DirEntry, error) {
|
||||
ifs.mtx.Lock()
|
||||
defer ifs.mtx.Unlock()
|
||||
|
||||
char, err := ifs.dev.getChar(fsTransferChar)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var out []fs.DirEntry
|
||||
return out, ifs.requestThenAwaitResponse(
|
||||
char,
|
||||
fsproto.ListDirectoryOpcode,
|
||||
fsproto.ListDirRequest{
|
||||
PathLen: uint16(len(path)),
|
||||
Path: path,
|
||||
},
|
||||
func(buf []byte) (bool, error) {
|
||||
var ldr fsproto.ListDirResponse
|
||||
err := fsproto.ReadResponse(buf, fsproto.ListDirectoryResp, &ldr)
|
||||
if err != nil {
|
||||
return true, err
|
||||
}
|
||||
|
||||
if ldr.EntryNum == ldr.TotalEntries {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
out = append(out, DirEntry{
|
||||
flags: ldr.Flags,
|
||||
modtime: ldr.ModTime,
|
||||
size: ldr.FileSize,
|
||||
path: string(ldr.Path),
|
||||
})
|
||||
|
||||
return false, nil
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
// RemoveAll removes the file at the specified path and any children it contains,
|
||||
// similar to the rm -r command.
|
||||
func (ifs *FS) RemoveAll(p string) error {
|
||||
if p == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
if path.Clean(p) == "/" {
|
||||
return fsproto.ErrNoRemoveRoot
|
||||
}
|
||||
|
||||
fi, err := ifs.Stat(p)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if fi.IsDir() {
|
||||
return ifs.removeWithChildren(p)
|
||||
} else {
|
||||
err = ifs.Remove(p)
|
||||
|
||||
var code int8
|
||||
if err, ok := err.(fsproto.Error); ok {
|
||||
code = err.Code
|
||||
}
|
||||
|
||||
if err != nil && code != -2 {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// removeWithChildren removes the directory at the given path and its children recursively.
|
||||
func (ifs *FS) removeWithChildren(p string) error {
|
||||
list, err := ifs.ReadDir(p)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, entry := range list {
|
||||
name := entry.Name()
|
||||
|
||||
if name == "." || name == ".." {
|
||||
continue
|
||||
}
|
||||
entryPath := path.Join(p, name)
|
||||
|
||||
if entry.IsDir() {
|
||||
err = ifs.removeWithChildren(entryPath)
|
||||
} else {
|
||||
err = ifs.Remove(entryPath)
|
||||
}
|
||||
|
||||
var code int8
|
||||
if err, ok := err.(fsproto.Error); ok {
|
||||
code = err.Code
|
||||
}
|
||||
|
||||
if err != nil && code != -2 {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return ifs.Remove(p)
|
||||
}
|
||||
|
||||
// MkdirAll creates a directory and any necessary parents in the file system,
|
||||
// similar to the mkdir -p command.
|
||||
func (ifs *FS) MkdirAll(path string) error {
|
||||
if path == "" || path == "/" {
|
||||
return nil
|
||||
}
|
||||
|
||||
splitPath := strings.Split(path, "/")
|
||||
for i := 1; i < len(splitPath); i++ {
|
||||
curPath := strings.Join(splitPath[0:i+1], "/")
|
||||
|
||||
err := ifs.Mkdir(curPath)
|
||||
|
||||
var code int8
|
||||
if err, ok := err.(fsproto.Error); ok {
|
||||
code = err.Code
|
||||
}
|
||||
|
||||
if err != nil && code != -17 {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
var _ fs.File = (*File)(nil)
|
||||
|
||||
// File represents a remote file on a BLE filesystem.
|
||||
//
|
||||
// If ProgressFunc is set, it will be called whenever a read or write happens
|
||||
// with the amount of bytes transferred and the total size of the file.
|
||||
type File struct {
|
||||
fs *FS
|
||||
path string
|
||||
offset uint32
|
||||
size uint32
|
||||
readOnly bool
|
||||
ProgressFunc func(transferred, total uint32)
|
||||
}
|
||||
|
||||
// Open opens an existing file at the specified path.
|
||||
// It returns a handle for the file and an error, if any.
|
||||
func (ifs *FS) Open(path string) (*File, error) {
|
||||
return &File{
|
||||
fs: ifs,
|
||||
path: path,
|
||||
offset: 0,
|
||||
readOnly: true,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Create creates a new file with the specified path and size.
|
||||
// It returns a handle for the created file and an error, if any.
|
||||
func (ifs *FS) Create(path string, size uint32) (*File, error) {
|
||||
return &File{
|
||||
fs: ifs,
|
||||
path: path,
|
||||
offset: 0,
|
||||
size: size,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Write writes data from the byte slice b to the file.
|
||||
// It returns the number of bytes written and an error, if any.
|
||||
func (fl *File) Write(b []byte) (int, error) {
|
||||
if fl.readOnly {
|
||||
return 0, fsproto.ErrFileReadOnly
|
||||
}
|
||||
|
||||
fl.fs.mtx.Lock()
|
||||
defer fl.fs.mtx.Unlock()
|
||||
|
||||
char, err := fl.fs.dev.getChar(fsTransferChar)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
defer char.EnableNotifications(nil)
|
||||
|
||||
var chunkLen uint32
|
||||
|
||||
dataLen := uint32(len(b))
|
||||
transferred := uint32(0)
|
||||
mtu := uint32(fl.fs.mtu(char))
|
||||
|
||||
// continueCh is used to prevent race conditions. When the
|
||||
// request loop starts, it reads from continueCh, blocking it
|
||||
// until it's "released" by the notification function after
|
||||
// the response is processed.
|
||||
continueCh := make(chan struct{}, 2)
|
||||
var notifErr error
|
||||
err = char.EnableNotifications(func(buf []byte) {
|
||||
var wfr fsproto.WriteFileResponse
|
||||
err = fsproto.ReadResponse(buf, fsproto.WriteFileResp, &wfr)
|
||||
if err != nil {
|
||||
notifErr = err
|
||||
char.EnableNotifications(nil)
|
||||
close(continueCh)
|
||||
return
|
||||
}
|
||||
|
||||
transferred += chunkLen
|
||||
fl.offset += chunkLen
|
||||
|
||||
if wfr.FreeSpace == 0 || transferred == dataLen {
|
||||
char.EnableNotifications(nil)
|
||||
close(continueCh)
|
||||
return
|
||||
}
|
||||
|
||||
if fl.ProgressFunc != nil {
|
||||
fl.ProgressFunc(transferred, fl.size)
|
||||
}
|
||||
|
||||
// Release the request loop
|
||||
continueCh <- struct{}{}
|
||||
})
|
||||
|
||||
err = fsproto.WriteRequest(char, fsproto.WriteFileHeaderOpcode, fsproto.WriteFileHeaderRequest{
|
||||
PathLen: uint16(len(fl.path)),
|
||||
Offset: fl.offset,
|
||||
FileSize: fl.size,
|
||||
Path: fl.path,
|
||||
})
|
||||
if err != nil {
|
||||
return int(transferred), err
|
||||
}
|
||||
|
||||
for range continueCh {
|
||||
if notifErr != nil {
|
||||
return int(transferred), notifErr
|
||||
}
|
||||
|
||||
amountLeft := dataLen - transferred
|
||||
chunkLen = mtu
|
||||
if amountLeft < mtu {
|
||||
chunkLen = amountLeft
|
||||
}
|
||||
|
||||
err = fsproto.WriteRequest(char, fsproto.WriteFileOpcode, fsproto.WriteFileRequest{
|
||||
Status: 0x01,
|
||||
Offset: fl.offset,
|
||||
ChunkLen: chunkLen,
|
||||
Data: b[transferred : transferred+chunkLen],
|
||||
})
|
||||
if err != nil {
|
||||
return int(transferred), err
|
||||
}
|
||||
}
|
||||
|
||||
return int(transferred), notifErr
|
||||
}
|
||||
|
||||
// Read reads data from the file into the byte slice b.
|
||||
// It returns the number of bytes read and an error, if any.
|
||||
func (fl *File) Read(b []byte) (int, error) {
|
||||
fl.fs.mtx.Lock()
|
||||
defer fl.fs.mtx.Unlock()
|
||||
|
||||
char, err := fl.fs.dev.getChar(fsTransferChar)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
defer char.EnableNotifications(nil)
|
||||
|
||||
transferred := uint32(0)
|
||||
maxLen := uint32(len(b))
|
||||
mtu := uint32(fl.fs.mtu(char))
|
||||
|
||||
var (
|
||||
notifErr error
|
||||
done bool
|
||||
)
|
||||
|
||||
// continueCh is used to prevent race conditions. When the
|
||||
// request loop starts, it reads from continueCh, blocking it
|
||||
// until it's "released" by the notification function after
|
||||
// the response is processed.
|
||||
continueCh := make(chan struct{}, 2)
|
||||
err = char.EnableNotifications(func(buf []byte) {
|
||||
var rfr fsproto.ReadFileResponse
|
||||
err = fsproto.ReadResponse(buf, fsproto.ReadFileResp, &rfr)
|
||||
if err != nil {
|
||||
notifErr = err
|
||||
char.EnableNotifications(nil)
|
||||
close(continueCh)
|
||||
return
|
||||
}
|
||||
|
||||
fl.size = rfr.FileSize
|
||||
|
||||
if rfr.Offset == rfr.FileSize || rfr.ChunkLen == 0 {
|
||||
notifErr = io.EOF
|
||||
done = true
|
||||
char.EnableNotifications(nil)
|
||||
close(continueCh)
|
||||
return
|
||||
}
|
||||
|
||||
n := copy(b[transferred:], rfr.Data[:rfr.ChunkLen])
|
||||
fl.offset += uint32(n)
|
||||
transferred += uint32(n)
|
||||
|
||||
if fl.ProgressFunc != nil {
|
||||
fl.ProgressFunc(transferred, rfr.FileSize)
|
||||
}
|
||||
|
||||
// Release the request loop
|
||||
continueCh <- struct{}{}
|
||||
})
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
defer char.EnableNotifications(nil)
|
||||
|
||||
amountLeft := maxLen - transferred
|
||||
chunkLen := mtu
|
||||
if amountLeft < mtu {
|
||||
chunkLen = amountLeft
|
||||
}
|
||||
|
||||
err = fsproto.WriteRequest(char, fsproto.ReadFileHeaderOpcode, fsproto.ReadFileHeaderRequest{
|
||||
PathLen: uint16(len(fl.path)),
|
||||
Offset: fl.offset,
|
||||
ReadLen: chunkLen,
|
||||
Path: fl.path,
|
||||
})
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
if notifErr != nil {
|
||||
return int(transferred), notifErr
|
||||
}
|
||||
|
||||
for !done {
|
||||
// Wait for the notification function to release the loop
|
||||
<-continueCh
|
||||
|
||||
if notifErr != nil {
|
||||
return int(transferred), notifErr
|
||||
}
|
||||
|
||||
amountLeft = maxLen - transferred
|
||||
chunkLen = mtu
|
||||
if amountLeft < mtu {
|
||||
chunkLen = amountLeft
|
||||
}
|
||||
|
||||
err = fsproto.WriteRequest(char, fsproto.ReadFileOpcode, fsproto.ReadFileRequest{
|
||||
Status: 0x01,
|
||||
Offset: fl.offset,
|
||||
ReadLen: chunkLen,
|
||||
})
|
||||
if err != nil {
|
||||
return int(transferred), err
|
||||
}
|
||||
}
|
||||
|
||||
return int(transferred), notifErr
|
||||
}
|
||||
|
||||
// Stat returns information about the file,
|
||||
func (fl *File) Stat() (fs.FileInfo, error) {
|
||||
return fl.fs.Stat(fl.path)
|
||||
}
|
||||
|
||||
// Seek sets the offset for the next Read or Write on the file to the specified offset.
|
||||
// The whence parameter specifies the seek reference point:
|
||||
//
|
||||
// io.SeekStart: offset is relative to the start of the file.
|
||||
// io.SeekCurrent: offset is relative to the current offset.
|
||||
// io.SeekEnd: offset is relative to the end of the file.
|
||||
//
|
||||
// Seek returns the new offset and an error, if any.
|
||||
func (fl *File) Seek(offset int64, whence int) (int64, error) {
|
||||
if offset > math.MaxUint32 {
|
||||
return 0, fsproto.ErrInvalidOffset
|
||||
}
|
||||
u32Offset := uint32(offset)
|
||||
|
||||
fl.fs.mtx.Lock()
|
||||
defer fl.fs.mtx.Unlock()
|
||||
|
||||
if fl.size == 0 {
|
||||
return 0, errors.New("file size unknown")
|
||||
}
|
||||
|
||||
var newOffset uint32
|
||||
switch whence {
|
||||
case io.SeekStart:
|
||||
newOffset = u32Offset
|
||||
case io.SeekCurrent:
|
||||
newOffset = fl.offset + u32Offset
|
||||
case io.SeekEnd:
|
||||
newOffset = fl.size + u32Offset
|
||||
}
|
||||
|
||||
if newOffset > fl.size || newOffset < 0 {
|
||||
return 0, fsproto.ErrInvalidOffset
|
||||
}
|
||||
fl.offset = newOffset
|
||||
|
||||
return int64(fl.offset), nil
|
||||
}
|
||||
|
||||
// Close always returns nil
|
||||
func (fl *File) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// requestThenAwaitResponse executes a BLE FS request and then waits for one or more responses,
|
||||
// until fn returns true or an error is encountered.
|
||||
func (ifs *FS) requestThenAwaitResponse(char *bluetooth.DeviceCharacteristic, opcode fsproto.FSReqOpcode, req any, fn func(buf []byte) (bool, error)) error {
|
||||
var stopped atomic.Bool
|
||||
errCh := make(chan error, 1)
|
||||
char.EnableNotifications(func(buf []byte) {
|
||||
stop, err := fn(buf)
|
||||
if err != nil && !stopped.Load() {
|
||||
errCh <- err
|
||||
char.EnableNotifications(nil)
|
||||
return
|
||||
} else if !stopped.Load() {
|
||||
errCh <- nil
|
||||
}
|
||||
|
||||
if stop && !stopped.Load() {
|
||||
stopped.Store(true)
|
||||
close(errCh)
|
||||
char.EnableNotifications(nil)
|
||||
}
|
||||
})
|
||||
defer char.EnableNotifications(nil)
|
||||
|
||||
err := fsproto.WriteRequest(char, opcode, req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for err := range errCh {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ifs *FS) mtu(char *bluetooth.DeviceCharacteristic) uint16 {
|
||||
mtuVal, _ := char.GetMTU()
|
||||
if mtuVal == 0 {
|
||||
mtuVal = 256
|
||||
}
|
||||
return mtuVal - 20
|
||||
}
|
||||
|
||||
var _ fs.FS = (*GoFS)(nil)
|
||||
var _ fs.StatFS = (*GoFS)(nil)
|
||||
var _ fs.ReadDirFS = (*GoFS)(nil)
|
||||
|
||||
// GoFS implements [io/fs.FS], [io/fs.StatFS], and [io/fs.ReadDirFS]
|
||||
// for the InfiniTime filesystem
|
||||
type GoFS struct {
|
||||
*FS
|
||||
}
|
||||
|
||||
// Open opens an existing file at the specified path.
|
||||
// It returns a handle for the file and an error, if any.
|
||||
func (gfs GoFS) Open(path string) (fs.File, error) {
|
||||
return gfs.FS.Open(path)
|
||||
}
|
||||
142
infinitime/fstypes.go
Normal file
142
infinitime/fstypes.go
Normal file
@ -0,0 +1,142 @@
|
||||
package infinitime
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
// DirEntry represents an entry from a directory listing
|
||||
type DirEntry struct {
|
||||
flags uint32
|
||||
modtime uint64
|
||||
size uint32
|
||||
path string
|
||||
}
|
||||
|
||||
// Name returns the name of the file described by the entry
|
||||
func (de DirEntry) Name() string {
|
||||
return de.path
|
||||
}
|
||||
|
||||
// IsDir reports whether the entry describes a directory.
|
||||
func (de DirEntry) IsDir() bool {
|
||||
return de.flags&0b1 == 1
|
||||
}
|
||||
|
||||
// Type returns the type bits for the entry.
|
||||
func (de DirEntry) Type() fs.FileMode {
|
||||
if de.IsDir() {
|
||||
return fs.ModeDir
|
||||
} else {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// Info returns the FileInfo for the file or subdirectory described by the entry.
|
||||
func (de DirEntry) Info() (fs.FileInfo, error) {
|
||||
return FileInfo{
|
||||
name: de.path,
|
||||
size: de.size,
|
||||
modtime: de.modtime,
|
||||
mode: de.Type(),
|
||||
isDir: de.IsDir(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (de DirEntry) String() string {
|
||||
var isDirChar rune
|
||||
if de.IsDir() {
|
||||
isDirChar = 'd'
|
||||
} else {
|
||||
isDirChar = '-'
|
||||
}
|
||||
|
||||
// Get human-readable value for file size
|
||||
val, unit := bytesHuman(de.size)
|
||||
prec := 0
|
||||
// If value is less than 10, set precision to 1
|
||||
if val < 10 {
|
||||
prec = 1
|
||||
}
|
||||
// Convert float to string
|
||||
valStr := strconv.FormatFloat(val, 'f', prec, 64)
|
||||
|
||||
// Return string formatted like so:
|
||||
// - 10 kB file
|
||||
// or:
|
||||
// d 0 B .
|
||||
return fmt.Sprintf(
|
||||
"%c %3s %-2s %s",
|
||||
isDirChar,
|
||||
valStr,
|
||||
unit,
|
||||
de.path,
|
||||
)
|
||||
}
|
||||
|
||||
func bytesHuman(b uint32) (float64, string) {
|
||||
const unit = 1000
|
||||
// Set possible unit prefixes (PineTime flash is 4MB)
|
||||
units := [2]rune{'k', 'M'}
|
||||
// If amount of bytes is less than smallest unit
|
||||
if b < unit {
|
||||
// Return unchanged with unit "B"
|
||||
return float64(b), "B"
|
||||
}
|
||||
|
||||
div, exp := uint32(unit), 0
|
||||
// Get decimal values and unit prefix index
|
||||
for n := b / unit; n >= unit; n /= unit {
|
||||
div *= unit
|
||||
exp++
|
||||
}
|
||||
|
||||
// Create string for full unit
|
||||
unitStr := string([]rune{units[exp], 'B'})
|
||||
|
||||
// Return decimal with unit string
|
||||
return float64(b) / float64(div), unitStr
|
||||
}
|
||||
|
||||
// FileInfo implements fs.FileInfo
|
||||
type FileInfo struct {
|
||||
name string
|
||||
size uint32
|
||||
modtime uint64
|
||||
mode fs.FileMode
|
||||
isDir bool
|
||||
}
|
||||
|
||||
// Name returns the base name of the file
|
||||
func (fi FileInfo) Name() string {
|
||||
return fi.name
|
||||
}
|
||||
|
||||
// Size returns the total size of the file
|
||||
func (fi FileInfo) Size() int64 {
|
||||
return int64(fi.size)
|
||||
}
|
||||
|
||||
/ | ||||