UCLPCServer fixes

- Properly update DeviceConfiguration values and don’t overwrite everything with one value
- Remove initial LoadControl limit setting, this should be done by the application using the public methods

Author: DerAndereAndi

uclpcserver/public_test.go

@@ -26,7 +26,7 @@ func (s *UCLPCServerSuite) Test_LoadControlLimit() {
 	assert.Nil(s.T(), err)
 }
 
-func (s *UCLPCServerSuite) Test_FailsafeConsumptionActivePowerLimit() {
+func (s *UCLPCServerSuite) Test_Failsafe() {
 	limit, changeable, err := s.sut.FailsafeConsumptionActivePowerLimit()
 	assert.Equal(s.T(), 0.0, limit)
 	assert.Equal(s.T(), false, changeable)
@@ -39,9 +39,7 @@ func (s *UCLPCServerSuite) Test_FailsafeConsumptionActivePowerLimit() {
 	assert.Equal(s.T(), 10.0, limit)
 	assert.Equal(s.T(), true, changeable)
 	assert.Nil(s.T(), err)
-}
 
-func (s *UCLPCServerSuite) Test_FailsafeDurationMinimum() {
 	// The actual tests of the functionality is located in the util package
 	duration, changeable, err := s.sut.FailsafeDurationMinimum()
 	assert.Equal(s.T(), time.Duration(0), duration)
@@ -54,6 +52,11 @@ func (s *UCLPCServerSuite) Test_FailsafeDurationMinimum() {
 	err = s.sut.SetFailsafeDurationMinimum(time.Duration(time.Hour*2), true)
 	assert.Nil(s.T(), err)
 
+	limit, changeable, err = s.sut.FailsafeConsumptionActivePowerLimit()
+	assert.Equal(s.T(), 10.0, limit)
+	assert.Equal(s.T(), true, changeable)
+	assert.Nil(s.T(), err)
+
 	duration, changeable, err = s.sut.FailsafeDurationMinimum()
 	assert.Equal(s.T(), time.Duration(time.Hour*2), duration)
 	assert.Equal(s.T(), true, changeable)

uclpcserver/uclpc.go

@@ -78,17 +78,6 @@ func (e *UCLPCServer) AddFeatures() {
 	}
 	f.SetData(model.FunctionTypeLoadControlLimitDescriptionListData, loadControlDesc)
 
-	loadControl := &model.LoadControlLimitListDataType{
-		LoadControlLimitData: []model.LoadControlLimitDataType{
-			{
-				LimitId:           eebusutil.Ptr(model.LoadControlLimitIdType(limitId)),
-				IsLimitChangeable: eebusutil.Ptr(true),
-				IsLimitActive:     eebusutil.Ptr(false),
-			},
-		},
-	}
-	f.SetData(model.FunctionTypeLoadControlLimitListData, loadControl)
-
 	f = localEntity.GetOrAddFeature(model.FeatureTypeTypeDeviceConfiguration, model.RoleTypeServer)
 	f.AddFunctionType(model.FunctionTypeDeviceConfigurationKeyValueDescriptionListData, true, false)
 	f.AddFunctionType(model.FunctionTypeDeviceConfigurationKeyValueListData, true, true)

util/deviceconfiguration.go

@@ -90,16 +90,23 @@ func SetLocalDeviceConfigurationKeyValue(
 		return
 	}
 
-	keyData := model.DeviceConfigurationKeyValueDataType{
-		KeyId:             eebusutil.Ptr(*description.KeyId),
-		IsValueChangeable: eebusutil.Ptr(changeable),
-		Value:             eebusutil.Ptr(value),
+	data, err := spine.LocalFeatureDataCopyOfType[*model.DeviceConfigurationKeyValueListDataType](deviceConfiguration, model.FunctionTypeDeviceConfigurationKeyValueListData)
+	if err != nil {
+		data = &model.DeviceConfigurationKeyValueListDataType{}
 	}
-	keysData := &model.DeviceConfigurationKeyValueListDataType{
-		DeviceConfigurationKeyValueData: []model.DeviceConfigurationKeyValueDataType{keyData},
+
+	for index, item := range data.DeviceConfigurationKeyValueData {
+		if item.KeyId == nil || *item.KeyId != *description.KeyId {
+			continue
+		}
+
+		item.IsValueChangeable = eebusutil.Ptr(changeable)
+		item.Value = eebusutil.Ptr(value)
+
+		data.DeviceConfigurationKeyValueData[index] = item
 	}
 
-	deviceConfiguration.SetData(model.FunctionTypeDeviceConfigurationKeyValueListData, keysData)
+	deviceConfiguration.SetData(model.FunctionTypeDeviceConfigurationKeyValueListData, data)
 
 	return nil
 }