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

Fix OCPP logic (#14868)

Browse source 
- Fix and simplify enable logic
- Reject local StartTransaction while disabled in remote mode
- Fix broken transaction hijacking and its test

---------

Co-authored-by: andig <cpuidle@gmx.de>
This commit is contained in:
premultiply 2024-07-15 13:09:26 +02:00 • committed by GitHub
parent a0bbd4a37d
commit 25470ace09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
charger/ocpp.go
View file

@ -339,17 +339,17 @@ func (c *OCPP) Enabled() (bool, error) {
func (c *OCPP) Enable(enable bool) error {
txn, err := c.conn.TransactionID()
if err != nil && enable {
if err != nil {
return err
}
// if transaction is not running, disable is a no-op
if txn != 0 || enable {
if c.autoStart || (c.noStop && txn != 0) {
err = c.enableAutostart(enable)
} else {
err = c.enableRemote(enable)
if c.autoStart || (c.noStop && txn > 0) {
// if there is no transaction running, this is a no-op
if txn > 0 {
err = c.enableProfile(enable)
}
} else {
err = c.enableRemote(enable)
}
if err == nil {
@ -359,8 +359,8 @@ func (c *OCPP) Enable(enable bool) error {
return err
}
// enableAutostart enables auto-started session
func (c *OCPP) enableAutostart(enable bool) error {
// enableProfile pauses/resumes existing transaction by profile update
func (c *OCPP) enableProfile(enable bool) error {
var current float64
if enable {
current = c.current
@ -369,7 +369,7 @@ func (c *OCPP) enableAutostart(enable bool) error {
return c.updatePeriod(current)
}
// enableRemote enables session by using RemoteStart/Stop
// enableRemote starts and terminates transaction by RemoteStart/Stop
func (c *OCPP) enableRemote(enable bool) error {
txn, err := c.conn.TransactionID()
if err != nil {
@ -395,17 +395,8 @@ func (c *OCPP) enableRemote(enable bool) error {
request.ChargingProfile = c.getTxChargingProfile(c.current, 0)
})
} else {
// if no transaction is running, the vehicle may have stopped it (which is ok) or an unknown transaction is running
if txn == 0 {
// we cannot tell if a transaction is really running, so we check the status
status, err := c.Status()
if err != nil {
return err
}
if status == api.StatusC {
return errors.New("cannot disable: unknown transaction running")
}
// we have no transaction id, treat as disabled
return nil
}

5
charger/ocpp/connector_core.go
View file

@ -52,7 +52,10 @@ func (conn *Connector) MeterValues(request *core.MeterValuesRequest) (*core.Mete
conn.mu.Lock()
defer conn.mu.Unlock()
if request.TransactionId != nil && conn.txnId == 0 {
if request.TransactionId != nil && conn.txnId == 0 &&
(conn.status.Status == core.ChargePointStatusCharging ||
conn.status.Status == core.ChargePointStatusSuspendedEV ||
conn.status.Status == core.ChargePointStatusSuspendedEVSE) {
conn.log.DEBUG.Printf("hijacking transaction: %d", *request.TransactionId)
conn.txnId = *request.TransactionId
}

2
charger/ocpp_test.go
View file

@ -67,7 +67,7 @@ func (suite *ocppTestSuite) handleTrigger(cp ocpp16.ChargePoint, connectorId int
}
case core.StatusNotificationFeatureName:
if res, err := cp.StatusNotification(connectorId, core.NoError, core.ChargePointStatusAvailable); err != nil {
if res, err := cp.StatusNotification(connectorId, core.NoError, core.ChargePointStatusCharging); err != nil {
suite.T().Log("StatusNotification:", err)
} else {
suite.T().Log("StatusNotification:", res)