Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EEBUS: properly setup entities (#26401)

Browse source
This commit is contained in:
Andreas Linde 2026-01-03 18:02:00 +01:00 • committed by GitHub
parent 0d609afa14
commit 2d78403581
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
server/eebus/eebus.go
View file

@ -31,6 +31,7 @@ import (
shiputil "github.com/enbility/ship-go/util"
spineapi "github.com/enbility/spine-go/api"
"github.com/enbility/spine-go/model"
"github.com/enbility/spine-go/spine"
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/machine"
)
@ -123,7 +124,7 @@ func NewServer(other Config) (*EEBus, error) {
configuration, err := eebusapi.NewConfiguration(
BrandName, BrandName, Model, serial,
model.DeviceTypeTypeEnergyManagementSystem,
[]model.EntityTypeType{model.EntityTypeTypeCEM, model.EntityTypeTypeControllableSystem, model.EntityTypeTypeGridGuard},
[]model.EntityTypeType{model.EntityTypeTypeCEM},
port, certificate, time.Second*4,
)
if err != nil {
@ -155,10 +156,13 @@ func NewServer(other Config) (*EEBus, error) {
return nil, err
}
{
localEntity := c.service.LocalDevice().EntityForType(model.EntityTypeTypeCEM)
localDevice := c.service.LocalDevice()
// evse
{
// CEM entity for for connected EVSE and Meters
localEntity := localDevice.Entity([]model.AddressEntityType{1})
// customer energy management to EVSE
c.cem = CustomerEnergyManagement{
EvseCC: evsecc.NewEVSECC(localEntity, c.ucCallback),
EvCC: evcc.NewEVCC(c.service, localEntity, c.ucCallback),
@ -167,10 +171,19 @@ func NewServer(other Config) (*EEBus, error) {
OscEV: oscev.NewOSCEV(localEntity, c.ucCallback),
EvSoc: evsoc.NewEVSOC(localEntity, c.ucCallback),
}
// monitoring appliance to meters
c.ma = MonitoringAppliance{
MaMGCPInterface: mgcp.NewMGCP(localEntity, c.ucCallback),
MaMPCInterface: mpc.NewMPC(localEntity, c.ucCallback),
}
}
{
localEntity := c.service.LocalDevice().EntityForType(model.EntityTypeTypeControllableSystem)
// CEM entity for connected SMGW
// LPC/LPP use a 60s heartbeat timeout, but some EVSE devices have then issues when not set to 4s right now even though they should not connect to this one anyway
localEntity := spine.NewEntityLocal(localDevice, model.EntityTypeTypeCEM, []model.AddressEntityType{2}, time.Second*4)
localDevice.AddEntity(localEntity)
// controllable system
c.cs = ControllableSystem{
@ -180,13 +193,10 @@ func NewServer(other Config) (*EEBus, error) {
}
{
localEntity := c.service.LocalDevice().EntityForType(model.EntityTypeTypeGridGuard)
// monitoring appliance
c.ma = MonitoringAppliance{
MaMGCPInterface: mgcp.NewMGCP(localEntity, c.ucCallback),
MaMPCInterface: mpc.NewMPC(localEntity, c.ucCallback),
}
// GridGuard entity for connected Controllable Systems
// LPC/LPP use a 60s heartbeat timeout, but some EVSE devices have then issues when not set to 4s right now
localEntity := spine.NewEntityLocal(localDevice, model.EntityTypeTypeGridGuard, []model.AddressEntityType{3}, time.Second*4)
localDevice.AddEntity(localEntity)
// energy guard
c.eg = EnergyGuard{