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

chore: reorder params

Browse source
This commit is contained in:
andig 2026-04-23 16:34:22 +02:00
parent 4d7fa86b55
commit a1634e25bb
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meter/eebus.go
View file

@ -116,7 +116,7 @@ func NewEEBus(ctx context.Context, ski, ip string, usage *templates.Usage) (api.
return c, nil
}
func eebusReadValue[T any](scenario uint, uc eebusapi.UseCaseBaseInterface, entity spineapi.EntityRemoteInterface, update func(entity spineapi.EntityRemoteInterface) (T, error)) (T, error) {
func eebusReadValue[T any](uc eebusapi.UseCaseBaseInterface, entity spineapi.EntityRemoteInterface, scenario uint, update func(entity spineapi.EntityRemoteInterface) (T, error)) (T, error) {
var zero T
if entity == nil || !uc.IsScenarioAvailableAtEntity(entity, scenario) {
@ -138,7 +138,7 @@ func eebusReadValue[T any](scenario uint, uc eebusapi.UseCaseBaseInterface, enti
func (c *EEBus) readValue(scenario uint, update func(entity spineapi.EntityRemoteInterface) (float64, error)) (float64, error) {
c.mu.Lock()
defer c.mu.Unlock()
return eebusReadValue(scenario, c.mm, c.maEntity, update)
return eebusReadValue(c.mm, c.maEntity, scenario, update)
}
var _ api.Meter = (*EEBus)(nil)
@ -157,7 +157,7 @@ func (c *EEBus) readPhases(scenario uint, update func(entity spineapi.EntityRemo
c.mu.Lock()
defer c.mu.Unlock()
res, err := eebusReadValue(scenario, c.mm, c.maEntity, update)
res, err := eebusReadValue(c.mm, c.maEntity, scenario, update)
if err != nil {
// announced but not provided
if errors.Is(err, eebusapi.ErrDataNotAvailable) {
@ -200,7 +200,7 @@ func (c *EEBus) Dimmed() (bool, error) {
c.mu.Lock()
defer c.mu.Unlock()
limit, err := eebusReadValue(1, c.eg.EgLPCInterface, c.egLpcEntity, c.eg.EgLPCInterface.ConsumptionLimit)
limit, err := eebusReadValue(c.eg.EgLPCInterface, c.egLpcEntity, 1, c.eg.EgLPCInterface.ConsumptionLimit)
if err != nil {
return false, err
}
@ -244,7 +244,7 @@ func (c *EEBus) Curtailed() (bool, error) {
c.mu.Lock()
defer c.mu.Unlock()
limit, err := eebusReadValue(1, c.eg.EgLPPInterface, c.egLppEntity, c.eg.EgLPPInterface.ProductionLimit)
limit, err := eebusReadValue(c.eg.EgLPPInterface, c.egLppEntity, 1, c.eg.EgLPPInterface.ProductionLimit)
if err != nil {
return false, err
}