diff --git a/charger/abl.go b/charger/abl.go index 92db07292..a49013450 100644 --- a/charger/abl.go +++ b/charger/abl.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. diff --git a/charger/alfen.go b/charger/alfen.go index 3c7ec9b40..be4716e9d 100644 --- a/charger/alfen.go +++ b/charger/alfen.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. @@ -66,12 +66,12 @@ func NewAlfenFromConfig(other map[string]interface{}) (api.Charger, error) { return nil, err } - return NewAlfen(cc.URI, cc.Device, cc.Comset, cc.Baudrate, cc.ID) + return NewAlfen(cc.URI, cc.ID) } // NewAlfen creates Alfen charger -func NewAlfen(uri, device, comset string, baudrate int, slaveID uint8) (api.Charger, error) { - conn, err := modbus.NewConnection(uri, device, comset, baudrate, modbus.Tcp, slaveID) +func NewAlfen(uri string, slaveID uint8) (api.Charger, error) { + conn, err := modbus.NewConnection(uri, "", "", 0, modbus.Tcp, slaveID) if err != nil { return nil, err } diff --git a/charger/amtron.go b/charger/amtron.go index ce5d4f64a..36aecedf5 100644 --- a/charger/amtron.go +++ b/charger/amtron.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. @@ -63,6 +63,8 @@ func NewAmtronFromConfig(other map[string]interface{}) (api.Charger, error) { // NewAmtron creates Amtron charger func NewAmtron(uri string, slaveID uint8) (api.Charger, error) { + uri = util.DefaultPort(uri, 502) + conn, err := modbus.NewConnection(uri, "", "", 0, modbus.Tcp, slaveID) if err != nil { return nil, err diff --git a/charger/cfos.go b/charger/cfos.go index 9a20bb829..08b37cba1 100644 --- a/charger/cfos.go +++ b/charger/cfos.go @@ -51,6 +51,10 @@ func NewCfosPowerBrain(uri string, id uint8) (*CfosPowerBrain, error) { return nil, err } + if !sponsor.IsAuthorized() { + return nil, api.ErrSponsorRequired + } + log := util.NewLogger("cfos") conn.Logger(log.TRACE) diff --git a/charger/easee.go b/charger/easee.go index f83237212..e68c964da 100644 --- a/charger/easee.go +++ b/charger/easee.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. diff --git a/charger/go-e.go b/charger/go-e.go index 93b05107e..60cfa18ca 100644 --- a/charger/go-e.go +++ b/charger/go-e.go @@ -1,19 +1,8 @@ package charger -import ( - "errors" - "fmt" - "time" - - "github.com/evcc-io/evcc/api" - goe "github.com/evcc-io/evcc/charger/go-e" - "github.com/evcc-io/evcc/util" - "github.com/evcc-io/evcc/util/sponsor" -) - // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. @@ -28,6 +17,17 @@ import ( // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +import ( + "errors" + "fmt" + "time" + + "github.com/evcc-io/evcc/api" + goe "github.com/evcc-io/evcc/charger/go-e" + "github.com/evcc-io/evcc/util" + "github.com/evcc-io/evcc/util/sponsor" +) + // https://go-e.co/app/api.pdf // https://github.com/goecharger/go-eCharger-API-v1/ // https://github.com/goecharger/go-eCharger-API-v2/ diff --git a/charger/heidelberg-ec.go b/charger/heidelberg-ec.go index ce494eee6..60c240e65 100644 --- a/charger/heidelberg-ec.go +++ b/charger/heidelberg-ec.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. diff --git a/charger/innogy.go b/charger/innogy.go index 6bc6b21a6..5c0ea0f7f 100644 --- a/charger/innogy.go +++ b/charger/innogy.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. diff --git a/charger/vestel.go b/charger/vestel.go index 428a0a079..15ac62c1c 100644 --- a/charger/vestel.go +++ b/charger/vestel.go @@ -2,7 +2,7 @@ package charger // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved. diff --git a/vehicle/tronity.go b/vehicle/tronity.go index a1df4fa3f..8a285f9c2 100644 --- a/vehicle/tronity.go +++ b/vehicle/tronity.go @@ -2,7 +2,7 @@ package vehicle // LICENSE -// Copyright (c) 2019-2021 andig +// Copyright (c) 2019-2022 andig // This module is NOT covered by the MIT license. All rights reserved.