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

Ocpp: support ChargeAmps custom phase switching key (#16244)

Browse source
This commit is contained in:
andig 2024-09-20 17:28:54 +02:00 • committed by GitHub
parent 69f6bd1a47
commit 161c068db6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
charger/ocpp/const.go
View file

@ -20,6 +20,7 @@ const (
KeyMaxChargingProfilesInstalled = "MaxChargingProfilesInstalled"
// Vendor specific keys
KeyAlfenPlugAndChargeIdentifier = "PlugAndChargeIdentifier"
KeyEvBoxSupportedMeasurands = "evb_SupportedMeasurands"
KeyAlfenPlugAndChargeIdentifier = "PlugAndChargeIdentifier"
KeyChargeAmpsPhaseSwitchingSupported = "ACPhaseSwitchingSupported"
KeyEvBoxSupportedMeasurands = "evb_SupportedMeasurands"
)

24
charger/ocpp/cp_setup.go
View file

@ -32,29 +32,33 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
continue
}
match := func(s string) bool {
return strings.EqualFold(opt.Key, s)
}
switch {
case strings.EqualFold(opt.Key, KeyChargeProfileMaxStackLevel):
case match(KeyChargeProfileMaxStackLevel):
if val, err := strconv.Atoi(*opt.Value); err == nil {
cp.StackLevel = val
}
case strings.EqualFold(opt.Key, KeyChargingScheduleAllowedChargingRateUnit):
case match(KeyChargingScheduleAllowedChargingRateUnit):
if *opt.Value == "Power" || *opt.Value == "W" { // "W" is not allowed by spec but used by some CPs
cp.ChargingRateUnit = types.ChargingRateUnitWatts
}
case strings.EqualFold(opt.Key, KeyConnectorSwitch3to1PhaseSupported):
case match(KeyConnectorSwitch3to1PhaseSupported) || match(KeyChargeAmpsPhaseSwitchingSupported):
var val bool
if val, err = strconv.ParseBool(*opt.Value); err == nil {
cp.PhaseSwitching = val
}
case strings.EqualFold(opt.Key, KeyMaxChargingProfilesInstalled):
case match(KeyMaxChargingProfilesInstalled):
if val, err := strconv.Atoi(*opt.Value); err == nil {
cp.ChargingProfileId = val
}
case strings.EqualFold(opt.Key, KeyMeterValuesSampledData):
case match(KeyMeterValuesSampledData):
if opt.Readonly {
meterValuesSampledDataMaxLength = 0
}
@ -66,17 +70,17 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
cp.meterValuesSample = *opt.Value
}
case strings.EqualFold(opt.Key, KeyMeterValuesSampledDataMaxLength):
case match(KeyMeterValuesSampledDataMaxLength):
if val, err := strconv.Atoi(*opt.Value); err == nil {
meterValuesSampledDataMaxLength = val
}
case strings.EqualFold(opt.Key, KeyNumberOfConnectors):
case match(KeyNumberOfConnectors):
if val, err := strconv.Atoi(*opt.Value); err == nil {
cp.NumberOfConnectors = val
}
case strings.EqualFold(opt.Key, KeySupportedFeatureProfiles):
case match(KeySupportedFeatureProfiles):
if !hasProperty(*opt.Value, smartcharging.ProfileName) {
cp.log.WARN.Printf("the required SmartCharging feature profile is not indicated as supported")
}
@ -86,11 +90,11 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
}
// vendor-specific keys
case strings.EqualFold(opt.Key, KeyAlfenPlugAndChargeIdentifier):
case match(KeyAlfenPlugAndChargeIdentifier):
cp.IdTag = *opt.Value
cp.log.DEBUG.Printf("overriding default `idTag` with Alfen-specific value: %s", cp.IdTag)
case strings.EqualFold(opt.Key, KeyEvBoxSupportedMeasurands):
case match(KeyEvBoxSupportedMeasurands):
if meterValues == "" {
meterValues = *opt.Value
}