From be0a1dd2cc337be72d25e3b9006c2c8f95d02382 Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Fri, 27 Jan 2023 12:42:07 +0100 Subject: [PATCH 1/3] Update eebus-go --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4a44a1e..1b0af38 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/enbility/cemd go 1.18 -require github.com/enbility/eebus-go v0.1.5 +require github.com/enbility/eebus-go v0.0.0-20230127113655-e548d2dd6a43 require ( github.com/ahmetb/go-linq/v3 v3.2.0 // indirect diff --git a/go.sum b/go.sum index c870d49..dd6b67b 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZDE= github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/enbility/eebus-go v0.1.5 h1:IkRxwN+jCqQ4TCbbtjJf70iaeSUUicZZSUsMTLFtVpg= -github.com/enbility/eebus-go v0.1.5/go.mod h1:BaXy+yk3pAURDqjaaPkxqJ6nlPDcEOT7ARs85U9T6YI= +github.com/enbility/eebus-go v0.0.0-20230127113655-e548d2dd6a43 h1:Wh8I+Ul4pMRJD7dodCy0ckuUzeSkgV9ze56qvJoea40= +github.com/enbility/eebus-go v0.0.0-20230127113655-e548d2dd6a43/go.mod h1:BaXy+yk3pAURDqjaaPkxqJ6nlPDcEOT7ARs85U9T6YI= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= From 9061cda68efc04cf673f5b29324da70beee82e9b Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Fri, 27 Jan 2023 12:44:08 +0100 Subject: [PATCH 2/3] Change all error logging to debug --- emobility/events.go | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/emobility/events.go b/emobility/events.go index 9b1d764..fbf6818 100644 --- a/emobility/events.go +++ b/emobility/events.go @@ -122,7 +122,7 @@ func (e *EMobilityImpl) HandleEvent(payload spine.EventPayload) { case *model.ElectricalConnectionParameterDescriptionListDataType: _, err := e.evElectricalConnection.RequestPermittedValueSet() if err != nil { - logging.Log.Error("Error getting electrical permitted values:", err) + logging.Log.Debug("Error getting electrical permitted values:", err) } /* @@ -140,7 +140,7 @@ func (e *EMobilityImpl) HandleEvent(payload spine.EventPayload) { case *model.LoadControlLimitDescriptionListDataType: _, err := e.evLoadControl.RequestLimits() if err != nil { - logging.Log.Error("Error getting loadcontrol limit values:", err) + logging.Log.Debug("Error getting loadcontrol limit values:", err) } /* @@ -158,7 +158,7 @@ func (e *EMobilityImpl) HandleEvent(payload spine.EventPayload) { case *model.MeasurementDescriptionListDataType: _, err := e.evMeasurement.Request() if err != nil { - logging.Log.Error("Error getting measurement list values:", err) + logging.Log.Debug("Error getting measurement list values:", err) } /* @@ -262,31 +262,31 @@ func (e *EMobilityImpl) evConnected(entity *spine.EntityRemoteImpl) { // subscribe if err := e.evDeviceClassification.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evDeviceConfiguration.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evDeviceDiagnosis.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evElectricalConnection.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evMeasurement.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evIdentification.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evLoadControl.SubscribeForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // if err := util.SubscribeTimeSeriesForEntity(e.service, entity); err != nil { @@ -300,54 +300,54 @@ func (e *EMobilityImpl) evConnected(entity *spine.EntityRemoteImpl) { // bindings if err := e.evLoadControl.Bind(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get ev configuration data if err := e.evDeviceConfiguration.Request(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get manufacturer details if _, err := e.evDeviceClassification.RequestManufacturerDetailsForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get device diagnosis state if _, err := e.evDeviceDiagnosis.RequestStateForEntity(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get electrical connection parameter if err := e.evElectricalConnection.RequestDescription(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } if err := e.evElectricalConnection.RequestParameterDescription(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get measurement parameters if err := e.evMeasurement.RequestDescription(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get identification if _, err := e.evIdentification.Request(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } // get loadlimit parameter if err := e.evLoadControl.RequestLimitDescription(); err != nil { - logging.Log.Error(err) + logging.Log.Debug(err) return } From 1c4accea37fcf8b0860fdbb057cdc51146682134 Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Sun, 29 Jan 2023 17:08:26 +0100 Subject: [PATCH 3/3] Update eebus-go to v0.1.6 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1b0af38..2c6cbbe 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/enbility/cemd go 1.18 -require github.com/enbility/eebus-go v0.0.0-20230127113655-e548d2dd6a43 +require github.com/enbility/eebus-go v0.1.6 require ( github.com/ahmetb/go-linq/v3 v3.2.0 // indirect diff --git a/go.sum b/go.sum index dd6b67b..3bed274 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZDE= github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/enbility/eebus-go v0.0.0-20230127113655-e548d2dd6a43 h1:Wh8I+Ul4pMRJD7dodCy0ckuUzeSkgV9ze56qvJoea40= -github.com/enbility/eebus-go v0.0.0-20230127113655-e548d2dd6a43/go.mod h1:BaXy+yk3pAURDqjaaPkxqJ6nlPDcEOT7ARs85U9T6YI= +github.com/enbility/eebus-go v0.1.6 h1:T+yxpOhdfakJFd5SBon44lXkjBUyaUITS093qIpMo3Q= +github.com/enbility/eebus-go v0.1.6/go.mod h1:BaXy+yk3pAURDqjaaPkxqJ6nlPDcEOT7ARs85U9T6YI= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=