pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-10 18:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrap up Friday - null ref in RoomBase on Occ sensor event

Browse Source
This commit is contained in:
Heath Volmer
2018-01-22 11:31:23 -07:00
parent 6f028c06ae
commit cb41b31018
18 changed files with 57103 additions and 9477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs
View File

@@ -201,7 +201,7 @@ namespace PepperDash.Essentials.Devices.Common
{
if (props.PortNumber > cs.NumberOfVersiPorts)
{
Debug.Console(0, "WARNING: Cannot register Vesiport {0} on {1}. Out of range",
Debug.Console(0, "WARNING: Cannot add Vesiport {0} on {1}. Out of range",
props.PortNumber, props.PortDeviceKey);
return null;
}
@@ -290,16 +290,17 @@ namespace PepperDash.Essentials.Devices.Common
else if (typeName == "occsensor")
{
var props = JsonConvert.DeserializeObject<GlsOccupancySensorConfigurationProperties>(properties.ToString());
uint id = 0x00;
GlsOccupancySensorBase occSensor = null;
try
{
id = Convert.ToUInt32(props.CresnetId, 8);
id = Convert.ToUInt32(props.CresnetId, 16);
}
catch (Exception e)
{
Debug.Console(0, "Unable to convert Crestnet ID: {0} to hex. Error:\n{1}", props.CresnetId, e);
Debug.Console(0, "ERROR:Unable to convert Crestnet ID: {0} to hex. Error:\n{1}", props.CresnetId, e);
}
switch (props.Model.ToLower())
@@ -324,7 +325,7 @@ namespace PepperDash.Essentials.Devices.Common
if (occSensor != null)
return new EssentialsGlsOccupancySensorBaseController(key, name, occSensor, props);
else
Debug.Console(0, "Unable to create Occupancy Sensor Device. Key: '{0}'", key);
Debug.Console(0, "ERROR: Unable to create Occupancy Sensor Device. Key: '{0}'", key);
}
return null;

3
Essentials Devices Common/Essentials Devices Common/Occupancy/EssentialsGlsOccupancySensorBaseController.cs
View File

@@ -39,6 +39,9 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
}
}
/// <summary>
///
/// </summary>
public class GlsOccupancySensorConfigurationProperties
{
public string CresnetId { get; set; }