From e705d2191ab49483615b1dca863bdeb1c7240ccd Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Wed, 1 Jul 2020 19:30:45 -0500
Subject: [PATCH 1/2] Moved Occupancy Sensors into PepperDash.Essentials.Core

Resolves #298
---
 .../EssentialsHuddleVtc1FusionController.cs   | 22 ++++++-------------
 .../CenOdtOccupancySensorBaseController.cs    |  2 +-
 ...lsGlsOccupancySensorBaseController.cs.orig |  0
 .../GlsOccupancySensorBaseController.cs       |  2 +-
 .../GlsOdtOccupancySensorController.cs        |  2 +-
 .../IOccupancyStatusProviderAggregator.cs     |  6 ++---
 .../PepperDash_Essentials_Core.csproj         |  4 ++++
 .../Essentials Devices Common.csproj          |  4 ----
 .../Factory/DeviceFactory.cs                  |  2 +-
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs  |  2 +-
 .../VideoCodec/ZoomRoom/ZoomRoom.cs           |  2 +-
 11 files changed, 20 insertions(+), 28 deletions(-)
 rename essentials-framework/{Essentials Devices Common/Essentials Devices Common => Essentials Core/PepperDashEssentialsBase}/Occupancy/CenOdtOccupancySensorBaseController.cs (97%)
 rename essentials-framework/{Essentials Devices Common/Essentials Devices Common => Essentials Core/PepperDashEssentialsBase}/Occupancy/EssentialsGlsOccupancySensorBaseController.cs.orig (100%)
 rename essentials-framework/{Essentials Devices Common/Essentials Devices Common => Essentials Core/PepperDashEssentialsBase}/Occupancy/GlsOccupancySensorBaseController.cs (97%)
 rename essentials-framework/{Essentials Devices Common/Essentials Devices Common => Essentials Core/PepperDashEssentialsBase}/Occupancy/GlsOdtOccupancySensorController.cs (96%)
 rename essentials-framework/{Essentials Devices Common/Essentials Devices Common => Essentials Core/PepperDashEssentialsBase}/Occupancy/IOccupancyStatusProviderAggregator.cs (95%)

diff --git a/PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs b/PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs
index c6c85d1a..4b0ef2b2 100644
--- a/PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs
+++ b/PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs
@@ -1,23 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
+using System;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.Fusion;
 
 
-using PepperDash.Core;
-using PepperDash.Essentials;
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Fusion;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Devices.Common.Occupancy;
-
+using PepperDash.Essentials.Core.Fusion;
+
 namespace PepperDash.Essentials.Fusion
 {
     public class EssentialsHuddleVtc1FusionController : EssentialsHuddleSpaceFusionSystemControllerBase
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/CenOdtOccupancySensorBaseController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs
similarity index 97%
rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/CenOdtOccupancySensorBaseController.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs
index c64b62be..603abeef 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/CenOdtOccupancySensorBaseController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/CenOdtOccupancySensorBaseController.cs	
@@ -11,7 +11,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
-namespace PepperDash.Essentials.Devices.Common.Occupancy
+namespace PepperDash.Essentials.Core
 {
     [Description("Wrapper class for CEN-ODT-C-POE")]
     public class CenOdtOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/EssentialsGlsOccupancySensorBaseController.cs.orig b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/EssentialsGlsOccupancySensorBaseController.cs.orig
similarity index 100%
rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/EssentialsGlsOccupancySensorBaseController.cs.orig
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/EssentialsGlsOccupancySensorBaseController.cs.orig
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOccupancySensorBaseController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs
similarity index 97%
rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOccupancySensorBaseController.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs
index b6508920..cfe9f718 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOccupancySensorBaseController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOccupancySensorBaseController.cs	
@@ -11,7 +11,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
-namespace PepperDash.Essentials.Devices.Common.Occupancy
+namespace PepperDash.Essentials.Core
 {
     [Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
     public class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOdtOccupancySensorController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs
similarity index 96%
rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOdtOccupancySensorController.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs
index 26fec016..a4dbdc28 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOdtOccupancySensorController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/GlsOdtOccupancySensorController.cs	
@@ -11,7 +11,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
-namespace PepperDash.Essentials.Devices.Common.Occupancy
+namespace PepperDash.Essentials.Core
 {
     [Description("Wrapper class for Dual Technology GLS Occupancy Sensors")]
     public class GlsOdtOccupancySensorController : GlsOccupancySensorBaseController
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/IOccupancyStatusProviderAggregator.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/IOccupancyStatusProviderAggregator.cs
similarity index 95%
rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/IOccupancyStatusProviderAggregator.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/IOccupancyStatusProviderAggregator.cs
index 72f67f7d..c321dcad 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/IOccupancyStatusProviderAggregator.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/IOccupancyStatusProviderAggregator.cs	
@@ -5,9 +5,9 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Devices.Common.Occupancy
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Aggregates the RoomIsOccupied feedbacks of one or more IOccupancyStatusProvider objects
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index f4eeabe5..a8817ab8 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -214,6 +214,10 @@
     <Compile Include="Monitoring\SystemMonitorController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyControllerConfig.cs" />
+    <Compile Include="Occupancy\CenOdtOccupancySensorBaseController.cs" />
+    <Compile Include="Occupancy\GlsOccupancySensorBaseController.cs" />
+    <Compile Include="Occupancy\GlsOdtOccupancySensorController.cs" />
+    <Compile Include="Occupancy\IOccupancyStatusProviderAggregator.cs" />
     <Compile Include="Plugins\PluginLoader.cs" />
     <Compile Include="Presets\PresetBase.cs" />
     <Compile Include="Plugins\IPluginDeviceFactory.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 78a6e565..f46b8c64 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -114,8 +114,6 @@
     <Compile Include="Codec\iCodecAudio.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
     <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
-    <Compile Include="Occupancy\CenOdtOccupancySensorBaseController.cs" />
-    <Compile Include="Occupancy\GlsOdtOccupancySensorController.cs" />
     <Compile Include="PartitionSensor\GlsPartitionSensorController.cs" />
     <Compile Include="PartitionSensor\GlsPartitionSensorControllerFactory.cs" />
     <Compile Include="Power Controllers\Digitallogger.cs" />
@@ -152,8 +150,6 @@
     <Compile Include="Environment\Somfy\RelayControlledShade.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Generic\GenericSource.cs" />
-    <Compile Include="Occupancy\GlsOccupancySensorBaseController.cs" />
-    <Compile Include="Occupancy\IOccupancyStatusProviderAggregator.cs" />
     <Compile Include="SetTopBox\SetTopBoxPropertiesConfig.cs" />
     <Compile Include="Streaming\AppleTV.cs" />
     <Compile Include="Audio\GenericAudioOut.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs
index c860d0cb..dd99fe34 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs	
@@ -17,7 +17,7 @@ using PepperDash.Essentials.Core.CrestronIO;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.DSP;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Devices.Common.Occupancy;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.Environment;
 
 namespace PepperDash.Essentials.Devices.Common
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 05bd7b01..80f0b7fd 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.Occupancy;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index 13fa895d..c64bdf36 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.Occupancy;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

From 52bfbb6dcf13894232303b3ed267e6611c46c94f Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Thu, 2 Jul 2020 13:41:51 -0500
Subject: [PATCH 2/2] Fixed all Merging Conflicts

---
 .../PepperDash_Essentials_Core.csproj                      | 3 ---
 .../Essentials Devices Common.csproj                       | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 9efacf68..7e67f4e1 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -215,14 +215,11 @@
     <Compile Include="Monitoring\SystemMonitorController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyControllerConfig.cs" />
-<<<<<<< HEAD
     <Compile Include="Occupancy\CenOdtOccupancySensorBaseController.cs" />
     <Compile Include="Occupancy\GlsOccupancySensorBaseController.cs" />
     <Compile Include="Occupancy\GlsOdtOccupancySensorController.cs" />
     <Compile Include="Occupancy\IOccupancyStatusProviderAggregator.cs" />
-=======
     <Compile Include="PartitionSensor\GlsPartitionSensorController.cs" />
->>>>>>> development
     <Compile Include="Plugins\PluginLoader.cs" />
     <Compile Include="Presets\PresetBase.cs" />
     <Compile Include="Plugins\IPluginDeviceFactory.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index ed17d061..e33e54fd 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -114,13 +114,6 @@
     <Compile Include="Codec\iCodecAudio.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />
     <Compile Include="ImageProcessors\TVOneCorioPropertiesConfig.cs" />
-<<<<<<< HEAD
-    <Compile Include="PartitionSensor\GlsPartitionSensorController.cs" />
-    <Compile Include="PartitionSensor\GlsPartitionSensorControllerFactory.cs" />
-=======
-    <Compile Include="Occupancy\CenOdtOccupancySensorBaseController.cs" />
-    <Compile Include="Occupancy\GlsOdtOccupancySensorController.cs" />
->>>>>>> development
     <Compile Include="Power Controllers\Digitallogger.cs" />
     <Compile Include="Power Controllers\DigitalLoggerPropertiesConfig.cs" />
     <Compile Include="ImageProcessors\AnalogWay\AnalongWayLiveCore.cs" />