Skip to content
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

Jump to bottom

Ocpp: allow "disable" to override meter value sample #15925

Merged
merged 3 commits into from
Sep 7, 2024
Merged

Ocpp: allow "disable" to override meter value sample #15925

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f940e1
Ocpp: use custom meter values even if configuration fails
andig Sep 6, 2024
16c3c66
wip
andig Sep 6, 2024
e53dd37
Merge branch 'master' into fix/ocpp-3
andig Sep 6, 2024
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
15 changes: 7 additions & 8 deletions charger/ocpp/cp_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
cp.log.DEBUG.Printf("failed configuring availability: %v", err)
}

var meterValuesSampledData string
meterValuesSampledDataMaxLength := len(strings.Split(desiredMeasurands, ","))

resp, err := cp.GetConfiguration()
Expand Down Expand Up @@ -58,7 +57,7 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
if opt.Readonly {
meterValuesSampledDataMaxLength = 0
}
meterValuesSampledData = *opt.Value
cp.meterValuesSample = *opt.Value

case KeyMeterValuesSampledDataMaxLength:
if val, err := strconv.Atoi(*opt.Value); err == nil {
Expand Down Expand Up @@ -113,13 +112,13 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {

// configure measurands
if meterValues != "" {
if err := cp.configure(KeyMeterValuesSampledData, meterValues); err == nil {
meterValuesSampledData = meterValues
if err := cp.configure(KeyMeterValuesSampledData, meterValues); err == nil || meterValues == "disable" {
cp.meterValuesSample = meterValues
} else {
cp.log.WARN.Printf("failed configuring %s: %v", KeyMeterValuesSampledData, err)
}
}

cp.meterValuesSample = meterValuesSampledData

// trigger initial meter values
if cp.HasRemoteTriggerFeature {
if err := Instance().TriggerMessageRequest(cp.ID(), core.MeterValuesFeatureName); err == nil {
Expand All @@ -135,13 +134,13 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
// configure sample rate
if meterInterval > 0 {
if err := cp.configure(KeyMeterValueSampleInterval, strconv.Itoa(int(meterInterval.Seconds()))); err != nil {
cp.log.WARN.Printf("failed configuring MeterValueSampleInterval: %v", err)
cp.log.WARN.Printf("failed configuring %s: %v", KeyMeterValueSampleInterval, err)
}
}

// configure websocket ping interval
if err := cp.configure(KeyWebSocketPingInterval, "30"); err != nil {
cp.log.DEBUG.Printf("failed configuring WebSocketPingInterval: %v", err)
cp.log.DEBUG.Printf("failed configuring %s: %v", KeyWebSocketPingInterval, err)
}

return nil
Expand Down