From 9517eaa0b0c875151f7bbe37617afa7398a2b542 Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Thu, 4 Jun 2020 15:23:20 -0500
Subject: [PATCH 1/2] Adds proper xml string to send to RemoteOccupancyInfo

Resovles #226
---
 ...lsHuddleSpaceFusionSystemControllerBase.cs | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
index 1134f3e2..c964975d 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
@@ -115,7 +115,10 @@ namespace PepperDash.Essentials.Core.Fusion
         // For use with occ sensor attached to a scheduling panel in Fusion
         protected FusionOccupancySensorAsset FusionOccSensor;
 
-        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+
+	    private string _roomOccupancyRemoteString;
+        public StringFeedback RoomOccupancyRemoteStringFeedback { get; private set; }
 
         protected Func<bool> RoomIsOccupiedFeedbackFunc
         {
@@ -1365,14 +1368,25 @@ namespace PepperDash.Essentials.Core.Fusion
                 var occSensorShutdownMinutes = FusionRoom.CreateOffsetUshortSig(70, "Occ Shutdown - Minutes", eSigIoMask.InputOutputSig);
                 
                 // Tie to method on occupancy object
-                //occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));
+                //occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));
+
+
+                RoomOccupancyRemoteStringFeedback = new StringFeedback(() => _roomOccupancyRemoteString);
+                Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
+                Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
+                RoomOccupancyRemoteStringFeedback.LinkInputSig(occSensorAsset.RoomOccupancyInfo.InputSig);
                 
-
-                Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
             //}
-        }
-
-		/// <summary>
+        }
+
+        void RoomIsOccupiedFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            _roomOccupancyRemoteString = e.BoolValue ? @"<Occupancy><Type>Local</Type><State>Occupied</State></Occupancy>" 
+                : @"<Occupancy><Type>Local</Type><State>Unoccupied</State></Occupancy>";
+            RoomOccupancyRemoteStringFeedback.FireUpdate();
+        }
+
+	    /// <summary>
 		/// Helper to get the number from the end of a device's key string
 		/// </summary>
 		/// <returns>-1 if no number matched</returns>

From d68645ccb00d4a317d90ca5db30f34293e45eb17 Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Thu, 4 Jun 2020 15:41:34 -0500
Subject: [PATCH 2/2] Changes to the way the XML is built

---
 .../EssentialsHuddleSpaceFusionSystemControllerBase.cs     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
index c964975d..2fb9db12 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
@@ -105,7 +105,9 @@ namespace PepperDash.Essentials.Core.Fusion
         // Default poll time is 5 min unless overridden by config value
         public long SchedulePollInterval = 300000;
 
-        public long PushNotificationTimeout = 5000;
+        public long PushNotificationTimeout = 5000;
+
+	    private const string RemoteOccupancyXml = "<Occupancy><Type>Local</Type><State>{0}</State></Occupancy>";
 
         protected Dictionary<int, FusionAsset> FusionStaticAssets;
 
@@ -1381,8 +1383,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         void RoomIsOccupiedFeedback_OutputChange(object sender, FeedbackEventArgs e)
         {
-            _roomOccupancyRemoteString = e.BoolValue ? @"<Occupancy><Type>Local</Type><State>Occupied</State></Occupancy>" 
-                : @"<Occupancy><Type>Local</Type><State>Unoccupied</State></Occupancy>";
+            _roomOccupancyRemoteString = String.Format(RemoteOccupancyXml, e.BoolValue ? "Occupied" : "Unoccupied");
             RoomOccupancyRemoteStringFeedback.FireUpdate();
         }