Skip to content

EEBus: handle negative production limits #29104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andig merged 2 commits into from
Apr 14, 2026
Merged

EEBus: handle negative production limits #29104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eff46b
EEBus: handle negative production limits
andig Apr 14, 2026
f62ecaa
Update HEMS
andig Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions hems/eebus/eebus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type EEBus struct {
smartgridProductionId uint
productionLimit ucapi.LoadLimit
productionLimitActivated time.Time
failsafeProductionLimit float64
failsafeProductionLimit *float64

heartbeat *util.Value[struct{}]
interval time.Duration
Expand All @@ -49,7 +49,7 @@ type Limits struct {
FailsafeConsumptionActivePowerLimit float64

ProductionNominalMax float64
FailsafeProductionActivePowerLimit float64
FailsafeProductionActivePowerLimit *float64

FailsafeDurationMinimum time.Duration
}
Expand All @@ -67,7 +67,7 @@ func NewFromConfig(ctx context.Context, other map[string]any, site site.API) (*E
FailsafeConsumptionActivePowerLimit: 4200,

ProductionNominalMax: 0,
FailsafeProductionActivePowerLimit: 0,
FailsafeProductionActivePowerLimit: nil, // 0 is a valid limit

FailsafeDurationMinimum: 2 * time.Hour,
},
Expand Down Expand Up @@ -144,8 +144,8 @@ func NewEEBus(ctx context.Context, ski string, limits Limits, passthrough func(b
if err := c.cs.CsLPPInterface.SetProductionNominalMax(limits.ProductionNominalMax); err != nil {
c.log.ERROR.Println("CS LPP SetProductionNominalMax:", err)
}
if c.failsafeProductionLimit > 0 {
if err := c.cs.CsLPPInterface.SetFailsafeProductionActivePowerLimit(c.failsafeProductionLimit, true); err != nil {
if c.failsafeProductionLimit != nil && *c.failsafeProductionLimit >= 0 {
if err := c.cs.CsLPPInterface.SetFailsafeProductionActivePowerLimit(*c.failsafeProductionLimit, true); err != nil {
c.log.ERROR.Println("CS LPP SetFailsafeProductionActivePowerLimit:", err)
}
}
Expand Down Expand Up @@ -181,7 +181,14 @@ func (c *EEBus) run() error {
if heartbeatErr != nil && c.status != StatusFailsafe {
// LPC-914/2
c.log.WARN.Println("missing heartbeat- entering failsafe mode")
c.setStatusAndLimit(StatusFailsafe, c.failsafeConsumptionLimit, c.failsafeProductionLimit)
c.setStatus(StatusFailsafe)

c.setConsumptionLimit(c.failsafeConsumptionLimit)

if c.failsafeProductionLimit != nil {
// production limit is negative, failsafe limits are always positive
c.setProductionLimit(-*c.failsafeProductionLimit, true)
}

return nil
}
Expand All @@ -193,7 +200,10 @@ func (c *EEBus) run() error {
}

c.log.DEBUG.Println("heartbeat returned or failsafe duration exceeded- leaving failsafe mode")
c.setStatusAndLimit(StatusNormal, 0, 0)
c.setStatus(StatusNormal)

c.setConsumptionLimit(0)
c.setProductionLimit(0, false)
}

// LPC-914/1
Expand Down Expand Up @@ -227,12 +237,9 @@ func (c *EEBus) run() error {
return nil
}

func (c *EEBus) setStatusAndLimit(status status, consumption, production float64) {
func (c *EEBus) setStatus(status status) {
c.status = status
c.statusUpdated = time.Now()

c.setConsumptionLimit(consumption)
c.setProductionLimit(production, true)
}

func (c *EEBus) setConsumptionLimit(limit float64) {
Expand Down
2 changes: 1 addition & 1 deletion hems/eebus/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func (c *EEBus) updateFailsafeProductionActivePowerLimit() {
c.mux.Lock()
defer c.mux.Unlock()

c.failsafeProductionLimit = limit
c.failsafeProductionLimit = new(limit)
}

func (c *EEBus) updateFailsafeConsumptionDurationMinimum() {
Expand Down
4 changes: 2 additions & 2 deletions meter/eebus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ func (c *EEBus) Curtailed() (bool, error) {
return false, err
}

// Check if limit is active and has a valid power value
return limit.IsActive && limit.Value > 0, nil
// Check if limit is active and has a valid power value (valid is zero or negative)
return limit.IsActive && limit.Value <= 0, nil
}

// Curtail implements the api.Curtailer interface
Expand Down
Loading