From 07070a47d1ca3442ff18794b2332408e71ef3ca2 Mon Sep 17 00:00:00 2001 From: andig Date: Fri, 3 Jan 2025 18:46:47 +0100 Subject: [PATCH] chore: refactor --- charger/fritzdect.go | 5 ++++- charger/homematic.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charger/fritzdect.go b/charger/fritzdect.go index 81a0fc9fa..81cd659cc 100644 --- a/charger/fritzdect.go +++ b/charger/fritzdect.go @@ -44,6 +44,9 @@ func NewFritzDECTFromConfig(other map[string]interface{}) (api.Charger, error) { // NewFritzDECT creates a new connection with standbypower for charger func NewFritzDECT(embed embed, uri, ain, user, password string, standbypower float64) (*FritzDECT, error) { conn, err := fritzdect.NewConnection(uri, ain, user, password) + if err != nil { + return nil, err + } c := &FritzDECT{ conn: conn, @@ -51,7 +54,7 @@ func NewFritzDECT(embed embed, uri, ain, user, password string, standbypower flo c.switchSocket = NewSwitchSocket(&embed, c.Enabled, c.conn.CurrentPower, standbypower) - return c, err + return c, nil } // Status implements the api.Charger interface diff --git a/charger/homematic.go b/charger/homematic.go index 30c547f33..ec2a7382c 100644 --- a/charger/homematic.go +++ b/charger/homematic.go @@ -44,6 +44,9 @@ func NewCCUFromConfig(other map[string]interface{}) (api.Charger, error) { // NewCCU creates a new connection with standbypower for charger func NewCCU(embed embed, uri, deviceid, meterid, switchid, user, password string, standbypower float64, cache time.Duration) (*CCU, error) { conn, err := homematic.NewConnection(uri, deviceid, meterid, switchid, user, password, cache) + if err != nil { + return nil, err + } c := &CCU{ conn: conn, @@ -51,7 +54,7 @@ func NewCCU(embed embed, uri, deviceid, meterid, switchid, user, password string c.switchSocket = NewSwitchSocket(&embed, c.Enabled, c.conn.CurrentPower, standbypower) - return c, err + return c, nil } // Enabled implements the api.Charger interface