Neil Dorin c99ba9ca1d Merge branch 'feature/ecs-1188' into bugfix/ecs-1192 ... # Conflicts: # PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs # essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingPort.cs		2019-11-27 11:22:27 -07:00
..
EssentialsGlsOccupancySensorBaseController.cs.orig	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
GlsOccupancySensorBaseController.cs	Continued work on bridge	2019-09-16 16:36:24 -06:00
GlsOdtOccupancySensorController.cs	Corrects issue where "new" GlsOdtCCn OccSensor needed to be assigned in GlsOdtOccupancySensorController constructor for adiditional feedbacks to work correctly and not throw null ref exceptions.	2019-11-19 14:50:40 -07:00
IOccupancyStatusProviderAggregator.cs	Updates to GlsOccupancySensorBaseController and created new GlsOdtOccupancySensorController. Added JoinMap class and started on bridge.	2019-09-16 16:20:03 -06:00