From 615c0d154535e202cc73cfb87fea12a9c1f39483 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 7 Jul 2020 13:25:26 -0600 Subject: [PATCH 1/4] move EISC registration --- PepperDashEssentials/Bridges/EiscBridge.cs | 4 +--- .../PepperDashEssentialsBase/Bridges/BridgeBase.cs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/PepperDashEssentials/Bridges/EiscBridge.cs b/PepperDashEssentials/Bridges/EiscBridge.cs index 1a7ec02a..3e1511b2 100644 --- a/PepperDashEssentials/Bridges/EiscBridge.cs +++ b/PepperDashEssentials/Bridges/EiscBridge.cs @@ -27,8 +27,6 @@ namespace PepperDash.Essentials.Bridges Eisc.SigChange += Eisc_SigChange; - Eisc.Register(); - AddPostActivationAction(() => { Debug.Console(1, this, "Linking Devices..."); @@ -76,7 +74,7 @@ namespace PepperDash.Essentials.Bridges } } Debug.Console(1, this, "Devices Linked."); - + Eisc.Register(); }); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index 0919335d..84fa083e 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -96,8 +96,6 @@ namespace PepperDash.Essentials.Core.Bridges Eisc.SigChange += Eisc_SigChange; - Eisc.Register(); - AddPostActivationAction( () => { Debug.Console(1, this, "Linking Devices..."); @@ -121,6 +119,8 @@ namespace PepperDash.Essentials.Core.Bridges var bridge = device as IBridgeAdvanced; if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); } + + Eisc.Register(); }); } From a1ee157ab8a0360984852010ba86fd16f05474dc Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 8 Jul 2020 11:47:36 -0600 Subject: [PATCH 2/4] add debug statement for catching EISC registration result. --- PepperDashEssentials/Bridges/EiscBridge.cs | 5 ++++- .../PepperDashEssentialsBase/Bridges/BridgeBase.cs | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PepperDashEssentials/Bridges/EiscBridge.cs b/PepperDashEssentials/Bridges/EiscBridge.cs index 3e1511b2..7561f028 100644 --- a/PepperDashEssentials/Bridges/EiscBridge.cs +++ b/PepperDashEssentials/Bridges/EiscBridge.cs @@ -74,7 +74,10 @@ namespace PepperDash.Essentials.Bridges } } Debug.Console(1, this, "Devices Linked."); - Eisc.Register(); + + var registerResult = Eisc.Register(); + + Debug.Console(2, this, "Registration result: {0}", registerResult); }); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index 84fa083e..9c412d93 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -120,7 +120,9 @@ namespace PepperDash.Essentials.Core.Bridges if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); } - Eisc.Register(); + var registerResult = Eisc.Register(); + + Debug.Console(2, this, "Registration result: {0}", registerResult); }); } From e8d42b701e7eec002f15545bcb06d017e0d5c442 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 8 Jul 2020 12:00:18 -0600 Subject: [PATCH 3/4] Updated logging to write to ErrorLog as well --- PepperDashEssentials/Bridges/EiscBridge.cs | 2 +- .../PepperDashEssentialsBase/Bridges/BridgeBase.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PepperDashEssentials/Bridges/EiscBridge.cs b/PepperDashEssentials/Bridges/EiscBridge.cs index 7561f028..7e8a5a7b 100644 --- a/PepperDashEssentials/Bridges/EiscBridge.cs +++ b/PepperDashEssentials/Bridges/EiscBridge.cs @@ -77,7 +77,7 @@ namespace PepperDash.Essentials.Bridges var registerResult = Eisc.Register(); - Debug.Console(2, this, "Registration result: {0}", registerResult); + Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Registration result: {0}", registerResult); }); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index 9c412d93..2d23a8d2 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -122,7 +122,7 @@ namespace PepperDash.Essentials.Core.Bridges var registerResult = Eisc.Register(); - Debug.Console(2, this, "Registration result: {0}", registerResult); + Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Registration result: {0}", registerResult); }); } From 38d6200409d39247d45605c0badbdaf2a55f3864 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 8 Jul 2020 12:06:40 -0600 Subject: [PATCH 4/4] Log error and notices when necessary --- PepperDashEssentials/Bridges/EiscBridge.cs | 10 ++++++++-- .../PepperDashEssentialsBase/Bridges/BridgeBase.cs | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/PepperDashEssentials/Bridges/EiscBridge.cs b/PepperDashEssentials/Bridges/EiscBridge.cs index 7e8a5a7b..9af277a9 100644 --- a/PepperDashEssentials/Bridges/EiscBridge.cs +++ b/PepperDashEssentials/Bridges/EiscBridge.cs @@ -74,10 +74,16 @@ namespace PepperDash.Essentials.Bridges } } Debug.Console(1, this, "Devices Linked."); - + var registerResult = Eisc.Register(); - Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Registration result: {0}", registerResult); + if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success) + { + Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult); + return; + } + + Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful"); }); } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs index 2d23a8d2..60f4d970 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs @@ -122,7 +122,13 @@ namespace PepperDash.Essentials.Core.Bridges var registerResult = Eisc.Register(); - Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Registration result: {0}", registerResult); + if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success) + { + Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult); + return; + } + + Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful"); }); }