From d043992804a10440b5f7e5c25485a2f914e23dbb Mon Sep 17 00:00:00 2001 From: andig Date: Fri, 14 Apr 2023 13:49:52 +0200 Subject: [PATCH] Ocpp: fix connector id not sent --- charger/ocpp/cp.go | 5 ++++- charger/ocpp/cs_core.go | 2 +- charger/ocpp_test_handler.go | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charger/ocpp/cp.go b/charger/ocpp/cp.go index 9e27958be..66f2ebd42 100644 --- a/charger/ocpp/cp.go +++ b/charger/ocpp/cp.go @@ -11,6 +11,7 @@ import ( "github.com/evcc-io/evcc/api" "github.com/evcc-io/evcc/util" "github.com/lorenzodonini/ocpp-go/ocpp1.6/core" + "github.com/lorenzodonini/ocpp-go/ocpp1.6/remotetrigger" "github.com/lorenzodonini/ocpp-go/ocpp1.6/types" ) @@ -121,7 +122,9 @@ func (cp *CP) Initialized() error { case <-cp.statusC: return default: - Instance().TriggerMessageRequest(cp.ID(), core.StatusNotificationFeatureName) + Instance().TriggerMessageRequest(cp.ID(), core.StatusNotificationFeatureName, func(request *remotetrigger.TriggerMessageRequest) { + request.ConnectorId = &cp.connector + }) } }) diff --git a/charger/ocpp/cs_core.go b/charger/ocpp/cs_core.go index e235d10e9..b96efc26a 100644 --- a/charger/ocpp/cs_core.go +++ b/charger/ocpp/cs_core.go @@ -39,7 +39,7 @@ func (cs *CS) TriggerMessageRequest(id string, requestedMessage remotetrigger.Me } log.Printf("TriggerMessage %s for %s: %+v", requestedMessage, id, status) - }, requestedMessage); err != nil { + }, requestedMessage, props...); err != nil { cs.log.ERROR.Printf("send TriggerMessage %s for %s failed: %v", requestedMessage, id, err) } } diff --git a/charger/ocpp_test_handler.go b/charger/ocpp_test_handler.go index 889b9dcc0..058e412c8 100644 --- a/charger/ocpp_test_handler.go +++ b/charger/ocpp_test_handler.go @@ -35,6 +35,7 @@ func (handler *ChargePointHandler) OnDataTransfer(request *core.DataTransferRequ func (handler *ChargePointHandler) OnGetConfiguration(request *core.GetConfigurationRequest) (confirmation *core.GetConfigurationConfirmation, err error) { fmt.Printf("%T %+v\n", request, request) one := "1" + meter := "Power.Active.Import" return core.NewGetConfigurationConfirmation([]core.ConfigurationKey{ {Key: "AuthorizationKey"}, {Key: "NumberOfConnectors", Value: &one}, @@ -42,6 +43,7 @@ func (handler *ChargePointHandler) OnGetConfiguration(request *core.GetConfigura {Key: "ChargingScheduleMaxPeriods", Value: &one}, {Key: "MaxChargingProfilesInstalled", Value: &one}, {Key: "ChargingScheduleAllowedChargingRateUnit", Value: &one}, + {Key: "MeterValuesSampledData", Value: &meter}, }), nil }