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

Setting the scene

Browse source
This commit is contained in:
andig 2024-08-27 21:35:11 +02:00
parent e6d3ad3f9f
commit bc93932718
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
charger/ocpp.go
View file

@ -190,6 +190,7 @@ func NewOCPP(id string, connector int, idtag string,
rc := make(chan error, 1)
// CP
err = ocpp.Instance().GetConfiguration(cp.ID(), func(resp *core.GetConfigurationConfirmation, err error) {
if err == nil {
for _, opt := range resp.ConfigurationKey {
@ -273,21 +274,18 @@ func NewOCPP(id string, connector int, idtag string,
// see who's there
if c.hasRemoteTriggerFeature {
if err := conn.TriggerMessageRequest(core.StatusNotificationFeatureName); err != nil {
c.log.DEBUG.Printf("failed triggering StatusNotification: %v", err)
// CP
if err := ocpp.Instance().TriggerMessageRequest(cp.ID(), core.BootNotificationFeatureName); err != nil {
c.log.DEBUG.Printf("failed triggering BootNotification: %v", err)
}
if err := ocpp.Instance().TriggerMessageRequest(cp.ID(), core.BootNotificationFeatureName); err == nil {
select {
case <-time.After(timeout):
c.log.DEBUG.Printf("BootNotification timeout")
case res := <-cp.BootNotificationRequest():
if res != nil {
c.bootNotification = res
}
select {
case <-time.After(timeout):
c.log.DEBUG.Printf("BootNotification timeout")
case res := <-cp.BootNotificationRequest():
if res != nil {
c.bootNotification = res
}
} else {
c.log.DEBUG.Printf("failed triggering BootNotification: %v", err)
}
}
@ -299,6 +297,7 @@ func NewOCPP(id string, connector int, idtag string,
// configure measurands
if meterValues != "" {
// CP
if err := c.configure(ocpp.KeyMeterValuesSampledData, meterValues); err == nil {
meterValuesSampledData = meterValues
}
@ -308,6 +307,7 @@ func NewOCPP(id string, connector int, idtag string,
// trigger initial meter values
if c.hasRemoteTriggerFeature {
// CP
if err := conn.TriggerMessageRequest(core.MeterValuesFeatureName); err == nil {
// wait for meter values
select {
@ -320,18 +320,28 @@ func NewOCPP(id string, connector int, idtag string,
// configure sample rate
if meterInterval > 0 {
// CP
if err := c.configure(ocpp.KeyMeterValueSampleInterval, strconv.Itoa(int(meterInterval.Seconds()))); err != nil {
c.log.WARN.Printf("failed configuring MeterValueSampleInterval: %v", err)
}
}
if c.hasRemoteTriggerFeature {
// CP
go conn.WatchDog(10 * time.Second)
}
// configure ping interval
// CP
c.configure(ocpp.KeyWebSocketPingInterval, "30")
// CONN
if c.hasRemoteTriggerFeature {
if err := conn.TriggerMessageRequest(core.StatusNotificationFeatureName); err != nil {
c.log.DEBUG.Printf("failed triggering StatusNotification: %v", err)
}
}
return c, conn.Initialized()
}