Skip to content

Commit 330aad8

Browse files
committed
Do not send initial requests in EVSOC
The requests are currently doubled as EVCEM sends the same and EVSOC requires EVCEM anyway. Once the SPINE stack can handle non answered pending identical requests, simply comment this code out and add it later again, once SPINE has this ability.
1 parent 19e3831 commit 330aad8

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

usecases/cem/evsoc/events.go

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package evsoc
33
import (
44
"github.com/enbility/eebus-go/features/client"
55
internal "github.com/enbility/eebus-go/usecases/internal"
6-
"github.com/enbility/ship-go/logging"
76
spineapi "github.com/enbility/spine-go/api"
87
"github.com/enbility/spine-go/model"
98
"github.com/enbility/spine-go/util"
@@ -38,21 +37,25 @@ func (e *EVSOC) HandleEvent(payload spineapi.EventPayload) {
3837
// an EV was connected
3938
func (e *EVSOC) evConnected(entity spineapi.EntityRemoteInterface) {
4039
// initialise features, e.g. subscriptions, descriptions
41-
if evMeasurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
42-
if _, err := evMeasurement.Subscribe(); err != nil {
43-
logging.Log().Debug(err)
44-
}
40+
// TODO: Don't do these requests for now, only add it once SPINE supports handling filtering identical pending subscription requests
41+
// Also: these are covered by EVCEM anyway, which is required
42+
/*
43+
if evMeasurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
44+
if _, err := evMeasurement.Subscribe(); err != nil {
45+
logging.Log().Debug(err)
46+
}
4547
46-
// get measurement descriptions
47-
if _, err := evMeasurement.RequestDescriptions(nil, nil); err != nil {
48-
logging.Log().Debug(err)
49-
}
48+
// get measurement descriptions
49+
if _, err := evMeasurement.RequestDescriptions(nil, nil); err != nil {
50+
logging.Log().Debug(err)
51+
}
5052
51-
// get measurement constraints
52-
if _, err := evMeasurement.RequestConstraints(nil, nil); err != nil {
53-
logging.Log().Debug(err)
53+
// get measurement constraints
54+
if _, err := evMeasurement.RequestConstraints(nil, nil); err != nil {
55+
logging.Log().Debug(err)
56+
}
5457
}
55-
}
58+
*/
5659
}
5760

5861
// the measurement data of an EV was updated

0 commit comments

Comments
 (0)