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

chore: move EEbus to global config (#14945)

Browse source
This commit is contained in:
andig 2024-07-21 11:25:33 +02:00 • committed by GitHub
parent cd27ee2ce1
commit 55ca860343
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 35 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/globalconfig/types.go
View file

@ -6,9 +6,9 @@ import (
"strconv"
"time"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/provider/mqtt"
"github.com/evcc-io/evcc/push"
"github.com/evcc-io/evcc/server/eebus"
"github.com/evcc-io/evcc/util/config"
"github.com/evcc-io/evcc/util/modbus"
)

60
charger/eebus.go
View file

@ -3,7 +3,6 @@ package charger
import (
"errors"
"fmt"
"os"
"slices"
"sync"
"time"
@ -14,9 +13,9 @@ import (
spineapi "github.com/enbility/spine-go/api"
"github.com/enbility/spine-go/model"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/core/loadpoint"
"github.com/evcc-io/evcc/provider"
"github.com/evcc-io/evcc/server/eebus"
"github.com/evcc-io/evcc/util"
)
@ -36,6 +35,7 @@ type EEBus struct {
uc *eebus.UseCasesEVSE
ev spineapi.EntityRemoteInterface
mux sync.RWMutex
log *util.Logger
lp loadpoint.API
minMaxG func() (minMax, error)
@ -51,12 +51,11 @@ type EEBus struct {
lastIsChargingCheck time.Time
lastIsChargingResult bool
connected bool
connectedC chan bool
connectedTime time.Time
once sync.Once
connectC chan struct{}
muxEntity sync.Mutex
mux sync.Mutex
connected bool
connectedTime time.Time
}
func init() {
@ -93,11 +92,11 @@ func NewEEBus(ski string, hasMeter, hasChargedEnergy, vasVW bool) (api.Charger,
}
c := &EEBus{
ski: ski,
log: log,
connectedC: make(chan bool, 1),
current: 6,
vasVW: vasVW,
ski: ski,
log: log,
current: 6,
vasVW: vasVW,
connectC: make(chan struct{}),
}
c.uc = eebus.Instance.RegisterEVSE(ski, c)
@ -121,29 +120,24 @@ func NewEEBus(ski string, hasMeter, hasChargedEnergy, vasVW bool) (api.Charger,
// waitForConnection wait for initial connection and returns an error on failure
func (c *EEBus) waitForConnection() error {
timeout := time.After(90 * time.Second)
for {
select {
case <-timeout:
return os.ErrDeadlineExceeded
case connected := <-c.connectedC:
if connected {
return nil
}
}
select {
case <-time.After(90 * time.Second):
return api.ErrTimeout
case <-c.connectC:
return nil
}
}
func (c *EEBus) setEvEntity(entity spineapi.EntityRemoteInterface) {
c.muxEntity.Lock()
defer c.muxEntity.Unlock()
c.mux.Lock()
defer c.mux.Unlock()
c.ev = entity
}
func (c *EEBus) evEntity() spineapi.EntityRemoteInterface {
c.muxEntity.Lock()
defer c.muxEntity.Unlock()
c.mux.RLock()
defer c.mux.RUnlock()
return c.ev
}
@ -152,16 +146,12 @@ func (c *EEBus) evEntity() spineapi.EntityRemoteInterface {
func (c *EEBus) DeviceConnect() {
c.log.TRACE.Println("connect ski:", c.ski)
c.expectedEnableUnpluggedState = false
c.setDefaultValues()
c.setConnected(true)
}
func (c *EEBus) DeviceDisconnect() {
c.log.TRACE.Println("disconnect ski:", c.ski)
c.expectedEnableUnpluggedState = false
c.setConnected(false)
c.setDefaultValues()
}
@ -174,6 +164,7 @@ func (c *EEBus) UseCaseEventCB(device spineapi.DeviceRemoteInterface, entity spi
c.log.TRACE.Println("EV Connected")
c.setEvEntity(entity)
c.currentLimit = -1
c.once.Do(func() { close(c.connectC) })
case evcc.EvDisconnected:
c.log.TRACE.Println("EV Disconnected")
c.setEvEntity(nil)
@ -183,8 +174,9 @@ func (c *EEBus) UseCaseEventCB(device spineapi.DeviceRemoteInterface, entity spi
func (c *EEBus) setDefaultValues() {
c.communicationStandard = evcc.EVCCCommunicationStandardUnknown
c.lastIsChargingCheck = time.Now().Add(-time.Hour * 1)
c.lastIsChargingCheck = time.Now().Add(-time.Hour)
c.lastIsChargingResult = false
c.expectedEnableUnpluggedState = false
}
// set wether the EVSE is connected
@ -195,12 +187,6 @@ func (c *EEBus) setConnected(connected bool) {
if connected && !c.connected {
c.connectedTime = time.Now()
}
select {
case c.connectedC <- connected:
default:
}
c.connected = connected
}

2
charger/eebus_test.go
View file

@ -6,7 +6,7 @@ import (
"github.com/enbility/eebus-go/usecases/mocks"
spinemocks "github.com/enbility/spine-go/mocks"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/server/eebus"
"github.com/evcc-io/evcc/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

2
cmd/configure/eebus.go
View file

@ -3,8 +3,8 @@ package configure
import (
"fmt"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/cmd/shutdown"
"github.com/evcc-io/evcc/server/eebus"
"github.com/evcc-io/evcc/util"
)

2
cmd/eebus.go
View file

@ -4,7 +4,7 @@ import (
"os"
"text/template"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/server/eebus"
"github.com/go-sprout/sprout"
"github.com/spf13/cobra"
)

2
cmd/setup.go
View file

@ -18,7 +18,6 @@ import (
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/api/globalconfig"
"github.com/evcc-io/evcc/charger"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/cmd/shutdown"
"github.com/evcc-io/evcc/core"
"github.com/evcc-io/evcc/core/keys"
@ -31,6 +30,7 @@ import (
"github.com/evcc-io/evcc/server"
"github.com/evcc-io/evcc/server/db"
"github.com/evcc-io/evcc/server/db/settings"
"github.com/evcc-io/evcc/server/eebus"
"github.com/evcc-io/evcc/server/modbus"
"github.com/evcc-io/evcc/server/oauth2redirect"
"github.com/evcc-io/evcc/tariff"

2
charger/eebus/certificate.go → server/eebus/certificate.go
View file

@ -15,7 +15,7 @@ import (
// CreateCertificate returns a newly created EEBUS compatible certificate
func CreateCertificate() (tls.Certificate, error) {
return cert.CreateCertificate("", EEBUSBrandName, "DE", EEBUSDeviceCode)
return cert.CreateCertificate("", BrandName, "DE", DeviceCode)
}
// pemBlockForKey marshals private key into pem block

10
charger/eebus/eebus.go → server/eebus/eebus.go
View file

@ -27,9 +27,9 @@ import (
)
const (
EEBUSBrandName string = "EVCC"
EEBUSModel string = "HEMS"
EEBUSDeviceCode string = "EVCC_HEMS_01" // used as common name in cert generation
BrandName string = "EVCC"
Model string = "HEMS"
DeviceCode string = "EVCC_HEMS_01" // used as common name in cert generation
)
type Config struct {
@ -115,7 +115,7 @@ func NewServer(other Config) (*EEBus, error) {
// TODO: get the voltage from the site
configuration, err := eebusapi.NewConfiguration(
EEBUSBrandName, EEBUSBrandName, EEBUSModel, serial,
BrandName, BrandName, Model, serial,
model.DeviceTypeTypeEnergyManagementSystem,
[]model.EntityTypeType{model.EntityTypeTypeCEM},
port, certificate, time.Second*4,
@ -125,7 +125,7 @@ func NewServer(other Config) (*EEBus, error) {
}
// for backward compatibility
configuration.SetAlternateMdnsServiceName(EEBUSDeviceCode)
configuration.SetAlternateMdnsServiceName(DeviceCode)
configuration.SetAlternateIdentifier(serial)
configuration.SetInterfaces(cc.Interfaces)

0
charger/eebus/eebus_test.go → server/eebus/eebus_test.go
View file

2
server/http.go
View file

@ -7,10 +7,10 @@ import (
eapi "github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/api/globalconfig"
"github.com/evcc-io/evcc/charger/eebus"
"github.com/evcc-io/evcc/core/keys"
"github.com/evcc-io/evcc/core/site"
"github.com/evcc-io/evcc/server/assets"
"github.com/evcc-io/evcc/server/eebus"
"github.com/evcc-io/evcc/util"
"github.com/evcc-io/evcc/util/auth"
"github.com/evcc-io/evcc/util/config"