pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 20:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with Debug calls in PreActivation Actions for Cresnet Devices

Browse Source 
Fixed issues related to subscribing to GlsOccupancySensorBase Events

Resolves #292
This commit is contained in:
Trevor Payne
2020-07-01 16:57:42 -05:00
parent 00958164ff
commit 0d802bdeed
6 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/C2nRts/C2nRthsController.cs
View File

@@ -115,17 +115,17 @@ namespace PepperDash.Essentials.Core.CrestronIO
if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase)) if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nRths"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nRths", parentKey);
return new C2nRths(cresnetId, Global.ControlSystem); return new C2nRths(cresnetId, Global.ControlSystem);
} }
var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge; var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge;
if (cresnetBridge != null) if (cresnetBridge != null)
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nRths"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nRths", parentKey);
return new C2nRths(cresnetId, cresnetBridge.Branches[branchId]); return new C2nRths(cresnetId, cresnetBridge.Branches[branchId]);
} }
Debug.Console(0, "Device {0} is not a valid cresnet master", branchId); Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
return null; return null;
} }
#endregion #endregion

6
essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/StatusSign/StatusSignController.cs
View File

@@ -185,17 +185,17 @@ namespace PepperDash.Essentials.Core.CrestronIO
if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase)) if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new StatusSign"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new StatusSign", parentKey);
return new StatusSign(cresnetId, Global.ControlSystem); return new StatusSign(cresnetId, Global.ControlSystem);
} }
var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge; var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge;
if (cresnetBridge != null) if (cresnetBridge != null)
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new StatusSign"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new StatusSign", parentKey);
return new StatusSign(cresnetId, cresnetBridge.Branches[branchId]); return new StatusSign(cresnetId, cresnetBridge.Branches[branchId]);
} }
Debug.Console(0, "Device {0} is not a valid cresnet master", branchId); Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
return null; return null;
} }
#endregion #endregion

6
essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenRfgwController.cs
View File

@@ -113,7 +113,7 @@ namespace PepperDash.Essentials.Core
if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase)) if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new CenRfgw", parentKey);
if (type.Equals("cenerfgwpoe", StringComparison.InvariantCultureIgnoreCase)) if (type.Equals("cenerfgwpoe", StringComparison.InvariantCultureIgnoreCase))
{ {
return new CenErfgwPoeCresnet(cresnetId, Global.ControlSystem); return new CenErfgwPoeCresnet(cresnetId, Global.ControlSystem);
@@ -127,7 +127,7 @@ namespace PepperDash.Essentials.Core
if (cresnetBridge != null) if (cresnetBridge != null)
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new CenRfgw", parentKey);
if (type.Equals("cenerfgwpoe", StringComparison.InvariantCultureIgnoreCase)) if (type.Equals("cenerfgwpoe", StringComparison.InvariantCultureIgnoreCase))
{ {
@@ -138,7 +138,7 @@ namespace PepperDash.Essentials.Core
return new CenRfgwExCresnet(cresnetId, cresnetBridge.Branches[branchId]); return new CenRfgwExCresnet(cresnetId, cresnetBridge.Branches[branchId]);
} }
} }
Debug.Console(0, "Device {0} is not a valid cresnet master", branchId); Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
return null; return null;
} }

6
essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs
View File

@@ -243,17 +243,17 @@ namespace PepperDash.Essentials.Core
if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase)) if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsPartCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsPartCn", parentKey);
return new GlsPartCn(cresnetId, Global.ControlSystem); return new GlsPartCn(cresnetId, Global.ControlSystem);
} }
var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge; var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge;
if (cresnetBridge != null) if (cresnetBridge != null)
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsPartCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsPartCn", parentKey);
return new GlsPartCn(cresnetId, cresnetBridge.Branches[branchId]); return new GlsPartCn(cresnetId, cresnetBridge.Branches[branchId]);
} }
Debug.Console(0, "Device {0} is not a valid cresnet master", branchId); Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
return null; return null;
} }
#endregion #endregion

44
essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOccupancySensorBaseController.cs
View File

@@ -67,45 +67,47 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
RegisterCrestronGenericBase(OccSensor); RegisterCrestronGenericBase(OccSensor);
RegisterGlsOdtSensorBaseController(); RegisterGlsOdtSensorBaseController(OccSensor);
}); });
} }
public GlsOccupancySensorBaseController(string key, string name) : base(key, name) {} public GlsOccupancySensorBaseController(string key, string name) : base(key, name) {}
protected void RegisterGlsOdtSensorBaseController() protected void RegisterGlsOdtSensorBaseController(GlsOccupancySensorBase occSensor)
{ {
OccSensor = occSensor;
RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc); RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
PirSensorEnabledFeedback = new BoolFeedback(() => OccSensor.PirEnabledFeedback.BoolValue); PirSensorEnabledFeedback = new BoolFeedback(() => OccSensor.PirEnabledFeedback.BoolValue);
LedFlashEnabledFeedback = new BoolFeedback(() => OccSensor.LedFlashEnabledFeedback.BoolValue); LedFlashEnabledFeedback = new BoolFeedback(() => OccSensor.LedFlashEnabledFeedback.BoolValue);
ShortTimeoutEnabledFeedback = new BoolFeedback(() => OccSensor.ShortTimeoutEnabledFeedback.BoolValue); ShortTimeoutEnabledFeedback = new BoolFeedback(() => OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
PirSensitivityInVacantStateFeedback = PirSensitivityInVacantStateFeedback =
new IntFeedback(() => OccSensor.PirSensitivityInVacantStateFeedback.UShortValue); new IntFeedback(() => OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
PirSensitivityInOccupiedStateFeedback = PirSensitivityInOccupiedStateFeedback =
new IntFeedback(() => OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue); new IntFeedback(() => OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue);
CurrentTimeoutFeedback = new IntFeedback(() => OccSensor.CurrentTimeoutFeedback.UShortValue); CurrentTimeoutFeedback = new IntFeedback(() => OccSensor.CurrentTimeoutFeedback.UShortValue);
LocalTimoutFeedback = new IntFeedback(() => OccSensor.LocalTimeoutFeedback.UShortValue); LocalTimoutFeedback = new IntFeedback(() => OccSensor.LocalTimeoutFeedback.UShortValue);
GraceOccupancyDetectedFeedback = GraceOccupancyDetectedFeedback =
new BoolFeedback(() => OccSensor.GraceOccupancyDetectedFeedback.BoolValue); new BoolFeedback(() => OccSensor.GraceOccupancyDetectedFeedback.BoolValue);
RawOccupancyFeedback = new BoolFeedback(() => OccSensor.RawOccupancyFeedback.BoolValue); RawOccupancyFeedback = new BoolFeedback(() => OccSensor.RawOccupancyFeedback.BoolValue);
InternalPhotoSensorValue = new IntFeedback(() => OccSensor.InternalPhotoSensorValueFeedback.UShortValue); InternalPhotoSensorValue = new IntFeedback(() => OccSensor.InternalPhotoSensorValueFeedback.UShortValue);
ExternalPhotoSensorValue = new IntFeedback(() => OccSensor.ExternalPhotoSensorValueFeedback.UShortValue); ExternalPhotoSensorValue = new IntFeedback(() => OccSensor.ExternalPhotoSensorValueFeedback.UShortValue);
OccSensor.BaseEvent += new Crestron.SimplSharpPro.BaseEventHandler(OccSensor_BaseEvent); OccSensor.BaseEvent += OccSensor_BaseEvent;
OccSensor.GlsOccupancySensorChange += OccSensor_GlsOccupancySensorChange; OccSensor.GlsOccupancySensorChange += OccSensor_GlsOccupancySensorChange;
} }
@@ -420,17 +422,17 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase)) if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
return new GlsOirCCn(cresnetId, Global.ControlSystem); return new GlsOirCCn(cresnetId, Global.ControlSystem);
} }
var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge; var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge;
if (cresnetBridge != null) if (cresnetBridge != null)
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
return new GlsOirCCn(cresnetId, cresnetBridge.Branches[branchId]); return new GlsOirCCn(cresnetId, cresnetBridge.Branches[branchId]);
} }
Debug.Console(0, "Device {0} is not a valid cresnet master", branchId); Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
return null; return null;
} }
#endregion #endregion

8
essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOdtOccupancySensorController.cs
View File

@@ -45,7 +45,7 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
RegisterCrestronGenericBase(OccSensor); RegisterCrestronGenericBase(OccSensor);
RegisterGlsOdtSensorBaseController(); RegisterGlsOdtSensorBaseController(OccSensor);
AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue); AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue);
@@ -181,17 +181,17 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase)) if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
return new GlsOdtCCn(cresnetId, Global.ControlSystem); return new GlsOdtCCn(cresnetId, Global.ControlSystem);
} }
var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge; var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as ICresnetBridge;
if (cresnetBridge != null) if (cresnetBridge != null)
{ {
Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn"); Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
return new GlsOdtCCn(cresnetId, cresnetBridge.Branches[branchId]); return new GlsOdtCCn(cresnetId, cresnetBridge.Branches[branchId]);
} }
Debug.Console(0, "Device {0} is not a valid cresnet master", branchId); Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
return null; return null;
} }
#endregion #endregion