Skip to content
This repository was archived by the owner on Jun 29, 2024. It is now read-only.

Commit 6697f4d

Browse files
DerAndereAndiDerAndereAndi
committed
Update SPINE, EEBUS
- Fixes incorect ElectricalConnectionCharacteristicListDataType model
1 parent 8648f6d commit 6697f4d

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/enbility/cemd
33
go 1.21.1
44

55
require (
6-
github.com/enbility/eebus-go v0.0.0-20240327124756-c2f35e1217be
6+
github.com/enbility/eebus-go v0.0.0-20240403142700-2f6a203b9c99
77
github.com/enbility/ship-go v0.0.0-20240327112751-034de9b6e652
8-
github.com/enbility/spine-go v0.0.0-20240313120235-e9eec2c46534
8+
github.com/enbility/spine-go v0.0.0-20240403141316-f4ab578e8a1a
99
github.com/stretchr/testify v1.8.4
1010
)
1111

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/
33
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6-
github.com/enbility/eebus-go v0.0.0-20240327124756-c2f35e1217be h1:HD3VqcjLzF1W9zLCA+qEJ2gfPKBm2n29XdBVIPaQ1Es=
7-
github.com/enbility/eebus-go v0.0.0-20240327124756-c2f35e1217be/go.mod h1:f2X3uJaPyP9vhK0jnyYI2VMkq+HUnjp9usyeAeuMSyw=
6+
github.com/enbility/eebus-go v0.0.0-20240403142700-2f6a203b9c99 h1:6uhFCOpzAS1bdxaH/od6B30Xn20PQpfuByxhnemWCGY=
7+
github.com/enbility/eebus-go v0.0.0-20240403142700-2f6a203b9c99/go.mod h1:zgZeurjiQgixRvIMPd1ofN2xQJGXDq4371DyeqHDZi8=
88
github.com/enbility/ship-go v0.0.0-20240327112751-034de9b6e652 h1:r71X9nuRTe2bUwWVRBpgaWII/oweFVWeM3DvgPtorAM=
99
github.com/enbility/ship-go v0.0.0-20240327112751-034de9b6e652/go.mod h1:ovyrJE3oPnGT5+eQnOqWut80gFDQ0XHn3ZWU2fHV9xQ=
10-
github.com/enbility/spine-go v0.0.0-20240313120235-e9eec2c46534 h1:DPyWFN3+6eAJwdA2nrLzXOXPSoe+mb0ccUFSVB8TI90=
11-
github.com/enbility/spine-go v0.0.0-20240313120235-e9eec2c46534/go.mod h1:2SXeC20kPX23mTnsudvPq9qprgo7GKDiNiVdX0ebovw=
10+
github.com/enbility/spine-go v0.0.0-20240403141316-f4ab578e8a1a h1:H34tdsbi4MIQYbZxYKdMx5fm37WsXmJbyD2R3vGo4EQ=
11+
github.com/enbility/spine-go v0.0.0-20240403141316-f4ab578e8a1a/go.mod h1:2SXeC20kPX23mTnsudvPq9qprgo7GKDiNiVdX0ebovw=
1212
github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b h1:sg3c6LJ4eWffwtt9SW0lgcIX4Oh274vwdJnNFNNrDco=
1313
github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b/go.mod h1:BjzRRiYX6mWdOgku1xxDE+NsV8PijTby7Q7BkYVdfDU=
1414
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=

‎uclpc/public_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func (s *UCLPCSuite) Test_PowerConsumptionNominalMax() {
334334
assert.Equal(s.T(), 0.0, data)
335335

336336
charData := &model.ElectricalConnectionCharacteristicListDataType{
337-
ElectricalConnectionCharacteristicListData: []model.ElectricalConnectionCharacteristicDataType{
337+
ElectricalConnectionCharacteristicData: []model.ElectricalConnectionCharacteristicDataType{
338338
{
339339
ElectricalConnectionId: eebusutil.Ptr(model.ElectricalConnectionIdType(0)),
340340
CharacteristicId: eebusutil.Ptr(model.ElectricalConnectionCharacteristicIdType(0)),

‎uclpcserver/uclpc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ func (e *UCLPCServer) AddFeatures() {
116116
var elCharId model.ElectricalConnectionCharacteristicIdType = 0
117117
// get the heighest CharacteristicId
118118
if desc, err := spine.LocalFeatureDataCopyOfType[*model.ElectricalConnectionCharacteristicListDataType](
119-
f, model.FunctionTypeElectricalConnectionCharacteristicListData); err == nil && desc.ElectricalConnectionCharacteristicListData != nil {
120-
for _, desc := range desc.ElectricalConnectionCharacteristicListData {
119+
f, model.FunctionTypeElectricalConnectionCharacteristicListData); err == nil && desc.ElectricalConnectionCharacteristicData != nil {
120+
for _, desc := range desc.ElectricalConnectionCharacteristicData {
121121
if desc.CharacteristicId != nil && *desc.CharacteristicId >= elCharId {
122122
elCharId++
123123
}
@@ -127,7 +127,7 @@ func (e *UCLPCServer) AddFeatures() {
127127
// ElectricalConnectionId and ParameterId should be identical to the ones used
128128
// in a MPC Server role implementation, which is not done here (yet)
129129
elCharData := &model.ElectricalConnectionCharacteristicListDataType{
130-
ElectricalConnectionCharacteristicListData: []model.ElectricalConnectionCharacteristicDataType{
130+
ElectricalConnectionCharacteristicData: []model.ElectricalConnectionCharacteristicDataType{
131131
{
132132
ElectricalConnectionId: eebusutil.Ptr(model.ElectricalConnectionIdType(0)),
133133
ParameterId: eebusutil.Ptr(model.ElectricalConnectionParameterIdType(0)),

‎util/electricalconnection.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ func GetLocalElectricalConnectionCharacteristicForContextType(
6767
function := model.FunctionTypeElectricalConnectionCharacteristicListData
6868
data, err := spine.LocalFeatureDataCopyOfType[*model.ElectricalConnectionCharacteristicListDataType](
6969
electricalConnection, function)
70-
if err != nil || data == nil || data.ElectricalConnectionCharacteristicListData == nil {
70+
if err != nil || data == nil || data.ElectricalConnectionCharacteristicData == nil {
7171
return
7272
}
7373

74-
for _, item := range data.ElectricalConnectionCharacteristicListData {
74+
for _, item := range data.ElectricalConnectionCharacteristicData {
7575
if item.CharacteristicContext != nil && *item.CharacteristicContext == context &&
7676
item.CharacteristicType != nil && *item.CharacteristicType == charType {
7777
charData = item
@@ -105,7 +105,7 @@ func SetLocalElectricalConnectionCharacteristicForContextType(
105105
function := model.FunctionTypeElectricalConnectionCharacteristicListData
106106

107107
listData := &model.ElectricalConnectionCharacteristicListDataType{
108-
ElectricalConnectionCharacteristicListData: []model.ElectricalConnectionCharacteristicDataType{charData},
108+
ElectricalConnectionCharacteristicData: []model.ElectricalConnectionCharacteristicDataType{charData},
109109
}
110110
electricalConnection.SetData(function, listData)
111111

‎util/electricalconnection_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (s *UtilSuite) Test_GetLocalElectricalConnectionCharacteristicForContextTyp
177177
feature := entity.FeatureOfTypeAndRole(model.FeatureTypeTypeElectricalConnection, model.RoleTypeServer)
178178

179179
charData := &model.ElectricalConnectionCharacteristicListDataType{
180-
ElectricalConnectionCharacteristicListData: []model.ElectricalConnectionCharacteristicDataType{
180+
ElectricalConnectionCharacteristicData: []model.ElectricalConnectionCharacteristicDataType{
181181
{
182182
ElectricalConnectionId: eebusutil.Ptr(model.ElectricalConnectionIdType(0)),
183183
ParameterId: eebusutil.Ptr(model.ElectricalConnectionParameterIdType(0)),
@@ -205,7 +205,7 @@ func (s *UtilSuite) Test_SetLocalElectricalConnectionCharacteristicForContextTyp
205205
feature := entity.FeatureOfTypeAndRole(model.FeatureTypeTypeElectricalConnection, model.RoleTypeServer)
206206

207207
charData := &model.ElectricalConnectionCharacteristicListDataType{
208-
ElectricalConnectionCharacteristicListData: []model.ElectricalConnectionCharacteristicDataType{
208+
ElectricalConnectionCharacteristicData: []model.ElectricalConnectionCharacteristicDataType{
209209
{
210210
ElectricalConnectionId: eebusutil.Ptr(model.ElectricalConnectionIdType(0)),
211211
ParameterId: eebusutil.Ptr(model.ElectricalConnectionParameterIdType(0)),

0 commit comments

Comments
 (0)