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

chore: use battery

Browse source
This commit is contained in:
andig 2025-05-23 15:19:45 +02:00
parent 6ecb5b9331
commit 66aebff551
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
meter/rct.go
View file

@ -39,11 +39,11 @@ func init() {
func NewRCTFromConfig(ctx context.Context, other map[string]interface{}) (api.Meter, error) {
cc := struct {
capacity `mapstructure:",squash"`
battery `mapstructure:",squash"`
Uri, Usage string
MinSoc, MaxSoc int
MaxChargePower int
Cache time.Duration
ExternalPower bool
Cache time.Duration
}{
MaxChargePower: 10000,
Cache: 30 * time.Second,
@ -57,11 +57,11 @@ func NewRCTFromConfig(ctx context.Context, other map[string]interface{}) (api.Me
return nil, errors.New("missing usage")
}
return NewRCT(ctx, cc.Uri, cc.Usage, cc.MinSoc, cc.MaxSoc, cc.MaxChargePower, cc.Cache, cc.ExternalPower, cc.capacity.Decorator())
return NewRCT(ctx, cc.Uri, cc.Usage, cc.battery, cc.MaxChargePower, cc.Cache, cc.ExternalPower, cc.capacity.Decorator())
}
// NewRCT creates an RCT meter
func NewRCT(ctx context.Context, uri, usage string, minSoc, maxSoc, maxchargepower int, cache time.Duration, externalPower bool, capacity func() float64) (api.Meter, error) {
func NewRCT(ctx context.Context, uri, usage string, battery battery, maxchargepower int, cache time.Duration, externalPower bool, capacity func() float64) (api.Meter, error) {
log := util.NewLogger("rct")
// re-use connections
@ -120,7 +120,7 @@ func NewRCT(ctx context.Context, uri, usage string, minSoc, maxSoc, maxchargepow
return err
}
if err := m.conn.Write(rct.BatterySoCTargetMin, m.floatVal(float32(minSoc)/100)); err != nil {
if err := m.conn.Write(rct.BatterySoCTargetMin, m.floatVal(float32(battery.MinSoc)/100)); err != nil {
return err
}
@ -131,7 +131,7 @@ func NewRCT(ctx context.Context, uri, usage string, minSoc, maxSoc, maxchargepow
return err
}
return m.conn.Write(rct.BatterySoCTargetMin, m.floatVal(float32(maxSoc)/100))
return m.conn.Write(rct.BatterySoCTargetMin, m.floatVal(float32(battery.MaxSoc)/100))
case api.BatteryCharge:
if err := m.conn.Write(rct.PowerMngUseGridPowerEnable, []byte{1}); err != nil {