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

Merged two properties lists

Browse Source
This commit is contained in:
Yannick Ulrich 2023-02-26 19:10:47 +00:00
parent 08c8d7e8de
commit 2440cb954c
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
fuse.go
View File

@ -90,14 +90,7 @@ type ITNode struct {
path string path string
} }
var properties = []ITProperty { var properties = make([]ITProperty, 6)
ITProperty{"heartrate", 2, nil},
ITProperty{"battery", 3, nil},
ITProperty{"motion", 4, nil},
ITProperty{"stepcount", 5, nil},
ITProperty{"version", 6, nil},
ITProperty{"address", 7, nil},
}
var myfs *blefs.FS = nil; var myfs *blefs.FS = nil;
var inodemap map[string]uint64 = nil; var inodemap map[string]uint64 = nil;
@ -581,30 +574,36 @@ func startFuse(ctx context.Context, dev *infinitime.Device) error {
Str("target", k.String("fuse.mountpoint")). Str("target", k.String("fuse.mountpoint")).
Send() Send()
properties[0].gen = func(ctx context.Context) (<-chan []byte, error) { properties[0] = ITProperty{"heartrate", 2,
ans, err := dev.WatchHeartRate(ctx) func(ctx context.Context) (<-chan []byte, error) {
return converterU8(ctx, ans), err ans, err := dev.WatchHeartRate(ctx)
} return converterU8(ctx, ans), err
properties[1].gen = func(ctx context.Context) (<-chan []byte, error) { }}
ans, err := dev.WatchBatteryLevel(ctx) properties[1] = ITProperty{"battery", 3,
return converterU8(ctx, ans), err func(ctx context.Context) (<-chan []byte, error) {
} ans, err := dev.WatchBatteryLevel(ctx)
properties[2].gen = func(ctx context.Context) (<-chan []byte, error) { return converterU8(ctx, ans), err
ans, err := dev.WatchMotion(ctx) }}
return converterMotionValues(ctx, ans), err properties[2] = ITProperty{"motion", 4,
} func(ctx context.Context) (<-chan []byte, error) {
properties[3].gen = func(ctx context.Context) (<-chan []byte, error) { ans, err := dev.WatchMotion(ctx)
ans, err := dev.WatchStepCount(ctx) return converterMotionValues(ctx, ans), err
return converterU32(ctx, ans), err }}
} properties[3] = ITProperty{"stepcount", 5,
properties[4].gen = func(ctx context.Context) (<-chan []byte, error) { func(ctx context.Context) (<-chan []byte, error) {
ans, err := dev.Version() ans, err := dev.WatchStepCount(ctx)
return converter1String(ctx, ans), err return converterU32(ctx, ans), err
} }}
properties[5].gen = func(ctx context.Context) (<-chan []byte, error) { properties[4] = ITProperty{"version", 6,
ans := dev.Address() func(ctx context.Context) (<-chan []byte, error) {
return converter1String(ctx, ans), nil ans, err := dev.Version()
} return converter1String(ctx, ans), err
}}
properties[5] = ITProperty{"address", 7,
func(ctx context.Context) (<-chan []byte, error) {
ans := dev.Address()
return converter1String(ctx, ans), nil
}}
myfs, err = dev.FS() myfs, err = dev.FS()
if err != nil { if err != nil {