EEBus HEMS: set initial limits (#15119)

This commit is contained in:
andig 2024-07-28 22:15:31 +02:00 • committed by GitHub
parent f6b4b42b63
commit 308fcd2a9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 15 deletions

View file

@ -26,17 +26,32 @@ type EEBus struct {
status status
statusUpdated time.Time
limit *ucapi.LoadLimit // LPC-041
consumptionLimit *ucapi.LoadLimit // LPC-041
failsafeLimit float64
failsafeDuration time.Duration
heartbeat *provider.Value[struct{}]
}
type Limits struct {
ContractualConsumptionNominalMax float64
ConsumptionLimit float64
FailsafeConsumptionActivePowerLimit float64
FailsafeDurationMinimum time.Duration
}
// New creates an EEBus HEMS from generic config
func New(other map[string]interface{}, site site.API) (*EEBus, error) {
var cc struct {
Ski string
cc := struct {
Ski string
Limits `mapstructure:",squash"`
}{
Limits: Limits{
ContractualConsumptionNominalMax: 24800,
ConsumptionLimit: 0,
FailsafeConsumptionActivePowerLimit: 4200,
FailsafeDurationMinimum: 2 * time.Hour,
},
}
if err := util.DecodeOther(other, &cc); err != nil {
@ -61,11 +76,11 @@ func New(other map[string]interface{}, site site.API) (*EEBus, error) {
}
site.SetCircuit(lpc)
return NewEEBus(cc.Ski, lpc)
return NewEEBus(cc.Ski, cc.Limits, lpc)
}
// NewEEBus creates EEBus HEMS
func NewEEBus(ski string, root api.Circuit) (*EEBus, error) {
// NewEEBus creates EEBus charger
func NewEEBus(ski string, limits Limits, root api.Circuit) (*EEBus, error) {
if eebus.Instance == nil {
return nil, errors.New("eebus not configured")
}
@ -76,6 +91,14 @@ func NewEEBus(ski string, root api.Circuit) (*EEBus, error) {
uc: eebus.Instance.ControllableSystem(),
Connector: eebus.NewConnector(nil),
heartbeat: provider.NewValue[struct{}](2 * time.Minute), // LPC-031
consumptionLimit: &ucapi.LoadLimit{
Value: limits.ConsumptionLimit,
IsChangeable: true,
},
failsafeLimit: limits.FailsafeConsumptionActivePowerLimit,
failsafeDuration: limits.FailsafeDurationMinimum,
}
if err := eebus.Instance.RegisterDevice(ski, c); err != nil {
@ -86,18 +109,31 @@ func NewEEBus(ski string, root api.Circuit) (*EEBus, error) {
return c, err
}
// scenarios
for _, s := range c.uc.LPC.RemoteEntitiesScenarios() {
c.log.DEBUG.Println("LPC RemoteEntitiesScenarios:", s.Scenarios)
}
for _, s := range c.uc.LPP.RemoteEntitiesScenarios() {
c.log.DEBUG.Println("LPP RemoteEntitiesScenarios:", s.Scenarios)
}
for _, s := range c.uc.MGCP.RemoteEntitiesScenarios() {
c.log.DEBUG.Println("MGCP RemoteEntitiesScenarios:", s.Scenarios)
}
// set initial values
if err := c.uc.LPC.SetContractualConsumptionNominalMax(limits.ContractualConsumptionNominalMax); err != nil {
c.log.ERROR.Println("LPC SetContractualConsumptionNominalMax:", err)
}
if err := c.uc.LPC.SetConsumptionLimit(*c.consumptionLimit); err != nil {
c.log.ERROR.Println("LPC SetConsumptionLimit:", err)
}
if err := c.uc.LPC.SetFailsafeConsumptionActivePowerLimit(c.failsafeLimit, true); err != nil {
c.log.ERROR.Println("LPC SetFailsafeConsumptionActivePowerLimit:", err)
}
if err := c.uc.LPC.SetFailsafeDurationMinimum(c.failsafeDuration, true); err != nil {
c.log.ERROR.Println("LPC SetFailsafeDurationMinimum:", err)
}
return c, nil
}
@ -134,24 +170,24 @@ func (c *EEBus) run() error {
switch c.status {
case StatusUnlimited:
// LPC-914/1
if c.limit != nil && c.limit.IsActive {
if c.consumptionLimit != nil && c.consumptionLimit.IsActive {
c.log.WARN.Println("active consumption limit")
c.setStatusAndLimit(StatusLimited, c.limit.Value)
c.setStatusAndLimit(StatusLimited, c.consumptionLimit.Value)
}
case StatusLimited:
// limit updated?
if !c.limit.IsActive {
if !c.consumptionLimit.IsActive {
c.log.WARN.Println("inactive consumption limit")
c.setStatusAndLimit(StatusUnlimited, 0)
break
}
c.setLimit(c.limit.Value)
c.setLimit(c.consumptionLimit.Value)
// LPC-914/1
if d := c.limit.Duration; d > 0 && time.Since(c.statusUpdated) > d {
c.limit = nil
if d := c.consumptionLimit.Duration; d > 0 && time.Since(c.statusUpdated) > d {
c.consumptionLimit = nil
c.log.DEBUG.Println("limit duration exceeded- return to normal")
c.setStatusAndLimit(StatusUnlimited, 0)

View file

@ -108,7 +108,7 @@ func (c *EEBus) dataUpdateLimit() {
c.mux.Lock()
defer c.mux.Unlock()
c.limit = &limit
c.consumptionLimit = &limit
}
func (c *EEBus) writeApprovalRequired() {