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

ECS-1248 Duplicate join map entry 'DisablePir' - removed and shifted map up by one

Browse Source
This commit is contained in:
Trevor Payne
2020-01-27 11:02:15 -06:00
parent 8d3b409ec3
commit df6bd2a21f
1 changed files with 219 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

439
PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
View File

@@ -1,35 +1,35 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Crestron.SimplSharp; using Crestron.SimplSharp;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;
namespace PepperDash.Essentials.Bridges namespace PepperDash.Essentials.Bridges
{ {
public class GlsOccupancySensorBaseJoinMap : JoinMapBase public class GlsOccupancySensorBaseJoinMap : JoinMapBase
{ {
#region Digitals #region Digitals
/// <summary> /// <summary>
/// High when device is online /// High when device is online
/// </summary> /// </summary>
public uint IsOnline { get; set; } public uint IsOnline { get; set; }
/// <summary> /// <summary>
/// Forces the device to report occupied status /// Forces the device to report occupied status
/// </summary> /// </summary>
public uint ForceOccupied { get; set; } public uint ForceOccupied { get; set; }
/// <summary> /// <summary>
/// Forces the device to report vacant status /// Forces the device to report vacant status
/// </summary> /// </summary>
public uint ForceVacant { get; set; } public uint ForceVacant { get; set; }
/// <summary> /// <summary>
/// Enables raw status reporting /// Enables raw status reporting
/// </summary> /// </summary>
public uint EnableRawStates { get; set; } public uint EnableRawStates { get; set; }
/// <summary> /// <summary>
/// High when raw occupancy is detected /// High when raw occupancy is detected
/// </summary> /// </summary>
public uint RawOccupancyFeedback { get; set; } public uint RawOccupancyFeedback { get; set; }
/// <summary> /// <summary>
/// High when PIR sensor detects motion /// High when PIR sensor detects motion
@@ -38,194 +38,193 @@ namespace PepperDash.Essentials.Bridges
/// <summary> /// <summary>
/// High when US sensor detects motion /// High when US sensor detects motion
/// </summary> /// </summary>
public uint RawOccupancyUsFeedback { get; set; } public uint RawOccupancyUsFeedback { get; set; }
/// <summary> /// <summary>
/// High when occupancy is detected /// High when occupancy is detected
/// </summary> /// </summary>
public uint RoomOccupiedFeedback { get; set; } public uint RoomOccupiedFeedback { get; set; }
/// <summary> /// <summary>
/// Hich when occupancy is detected in the grace period /// Hich when occupancy is detected in the grace period
/// </summary> /// </summary>
public uint GraceOccupancyDetectedFeedback { get; set; } public uint GraceOccupancyDetectedFeedback { get; set; }
/// <summary> /// <summary>
/// High when vacancy is detected /// High when vacancy is detected
/// </summary> /// </summary>
public uint RoomVacantFeedback { get; set; } public uint RoomVacantFeedback { get; set; }
/// <summary> /// <summary>
/// Enables the LED Flash when set high /// Enables the LED Flash when set high
/// </summary> /// </summary>
public uint EnableLedFlash { get; set; } public uint EnableLedFlash { get; set; }
/// <summary> /// <summary>
/// Disables the LED flash when set high /// Disables the LED flash when set high
/// </summary> /// </summary>
public uint DisableLedFlash { get; set; } public uint DisableLedFlash { get; set; }
/// <summary> /// <summary>
/// Enables the Short Timeout /// Enables the Short Timeout
/// </summary> /// </summary>
public uint EnableShortTimeout { get; set; } public uint EnableShortTimeout { get; set; }
/// <summary> /// <summary>
/// Disables the Short Timout /// Disables the Short Timout
/// </summary> /// </summary>
public uint DisableShortTimeout { get; set; } public uint DisableShortTimeout { get; set; }
/// <summary> /// <summary>
/// Set high to enable one technology to trigger occupancy /// Set high to enable one technology to trigger occupancy
/// </summary> /// </summary>
public uint OrWhenVacated { get; set; } public uint OrWhenVacated { get; set; }
/// <summary> /// <summary>
/// Set high to require both technologies to trigger occupancy /// Set high to require both technologies to trigger occupancy
/// </summary> /// </summary>
public uint AndWhenVacated { get; set; } public uint AndWhenVacated { get; set; }
/// <summary> /// <summary>
/// Enables Ultrasonic Sensor A /// Enables Ultrasonic Sensor A
/// </summary> /// </summary>
public uint EnableUsA { get; set; } public uint EnableUsA { get; set; }
/// <summary> /// <summary>
/// Disables Ultrasonic Sensor A /// Disables Ultrasonic Sensor A
/// </summary> /// </summary>
public uint DisableUsA { get; set; } public uint DisableUsA { get; set; }
/// <summary> /// <summary>
/// Enables Ultrasonic Sensor B /// Enables Ultrasonic Sensor B
/// </summary> /// </summary>
public uint EnableUsB { get; set; } public uint EnableUsB { get; set; }
/// <summary> /// <summary>
/// Disables Ultrasonic Sensor B /// Disables Ultrasonic Sensor B
/// </summary> /// </summary>
public uint DisableUsB { get; set; } public uint DisableUsB { get; set; }
/// <summary> /// <summary>
/// Enables Pir /// Enables Pir
/// </summary> /// </summary>
public uint EnablePir { get; set; } public uint EnablePir { get; set; }
/// <summary> /// <summary>
/// Disables Pir /// Disables Pir
/// </summary> /// </summary>
public uint DisablePir { get; set; } public uint DisablePir { get; set; }
public uint IncrementUsInOccupiedState { get; set; } public uint IncrementUsInOccupiedState { get; set; }
public uint DecrementUsInOccupiedState { get; set; } public uint DecrementUsInOccupiedState { get; set; }
public uint IncrementUsInVacantState { get; set; } public uint IncrementUsInVacantState { get; set; }
public uint DecrementUsInVacantState { get; set; } public uint DecrementUsInVacantState { get; set; }
public uint IncrementPirInOccupiedState { get; set; } public uint IncrementPirInOccupiedState { get; set; }
public uint DecrementPirInOccupiedState { get; set; } public uint DecrementPirInOccupiedState { get; set; }
public uint IncrementPirInVacantState { get; set; } public uint IncrementPirInVacantState { get; set; }
public uint DecrementPirInVacantState { get; set; } public uint DecrementPirInVacantState { get; set; }
#endregion #endregion
#region Analogs #region Analogs
/// <summary> /// <summary>
/// Sets adn reports the remote timeout value /// Sets adn reports the remote timeout value
/// </summary> /// </summary>
public uint Timeout { get; set; } public uint Timeout { get; set; }
/// <summary> /// <summary>
/// Reports the local timeout value /// Reports the local timeout value
/// </summary> /// </summary>
public uint TimeoutLocalFeedback { get; set; } public uint TimeoutLocalFeedback { get; set; }
/// <summary> /// <summary>
/// Sets the minimum internal photo sensor value and reports the current level /// Sets the minimum internal photo sensor value and reports the current level
/// </summary> /// </summary>
public uint InternalPhotoSensorValue { get; set; } public uint InternalPhotoSensorValue { get; set; }
/// <summary> /// <summary>
/// Sets the minimum external photo sensor value and reports the current level /// Sets the minimum external photo sensor value and reports the current level
/// </summary> /// </summary>
public uint ExternalPhotoSensorValue { get; set; } public uint ExternalPhotoSensorValue { get; set; }
public uint UsSensitivityInOccupiedState { get; set; } public uint UsSensitivityInOccupiedState { get; set; }
public uint UsSensitivityInVacantState { get; set; } public uint UsSensitivityInVacantState { get; set; }
public uint PirSensitivityInOccupiedState { get; set; } public uint PirSensitivityInOccupiedState { get; set; }
public uint PirSensitivityInVacantState { get; set; } public uint PirSensitivityInVacantState { get; set; }
#endregion #endregion
public GlsOccupancySensorBaseJoinMap() public GlsOccupancySensorBaseJoinMap()
{ {
IsOnline = 1; IsOnline = 1;
ForceOccupied = 2; ForceOccupied = 2;
ForceVacant = 3; ForceVacant = 3;
EnableRawStates = 4; EnableRawStates = 4;
RoomOccupiedFeedback = 2; RoomOccupiedFeedback = 2;
GraceOccupancyDetectedFeedback = 3; GraceOccupancyDetectedFeedback = 3;
RoomVacantFeedback = 4; RoomVacantFeedback = 4;
RawOccupancyFeedback = 5; RawOccupancyFeedback = 5;
RawOccupancyPirFeedback = 6; RawOccupancyPirFeedback = 6;
RawOccupancyUsFeedback = 7; RawOccupancyUsFeedback = 7;
EnableLedFlash = 11; EnableLedFlash = 11;
DisableLedFlash = 12; DisableLedFlash = 12;
EnableShortTimeout = 13; EnableShortTimeout = 13;
DisableShortTimeout = 14; DisableShortTimeout = 14;
OrWhenVacated = 15; OrWhenVacated = 15;
AndWhenVacated = 16; AndWhenVacated = 16;
EnableUsA = 17; EnableUsA = 17;
DisableUsA = 18; DisableUsA = 18;
EnableUsB = 19; EnableUsB = 19;
DisableUsB = 20; DisableUsB = 20;
EnablePir = 21; EnablePir = 21;
DisablePir = 22; DisablePir = 22;
DisablePir = 23; IncrementUsInOccupiedState = 23;
IncrementUsInOccupiedState = 24; DecrementUsInOccupiedState = 24;
DecrementUsInOccupiedState = 25; IncrementUsInVacantState = 25;
IncrementUsInVacantState = 26; DecrementUsInVacantState = 26;
DecrementUsInVacantState = 27; IncrementPirInOccupiedState = 27;
IncrementPirInOccupiedState = 28; DecrementPirInOccupiedState = 28;
DecrementPirInOccupiedState = 29; IncrementPirInVacantState = 29;
IncrementPirInVacantState = 30; DecrementPirInVacantState = 30;
DecrementPirInVacantState = 31;
Timeout = 1;
Timeout = 1; TimeoutLocalFeedback = 2;
TimeoutLocalFeedback = 2; InternalPhotoSensorValue = 3;
InternalPhotoSensorValue = 3; ExternalPhotoSensorValue = 4;
ExternalPhotoSensorValue = 4; UsSensitivityInOccupiedState = 5;
UsSensitivityInOccupiedState = 5; UsSensitivityInVacantState = 6;
UsSensitivityInVacantState = 6; PirSensitivityInOccupiedState = 7;
PirSensitivityInOccupiedState = 7; PirSensitivityInVacantState = 8;
PirSensitivityInVacantState = 8; }
}
public override void OffsetJoinNumbers(uint joinStart)
public override void OffsetJoinNumbers(uint joinStart) {
{ var joinOffset = joinStart - 1;
var joinOffset = joinStart - 1;
IsOnline = IsOnline + joinOffset;
IsOnline = IsOnline + joinOffset; ForceOccupied = ForceOccupied + joinOffset;
ForceOccupied = ForceOccupied + joinOffset; ForceVacant = ForceVacant + joinOffset;
ForceVacant = ForceVacant + joinOffset; EnableRawStates = EnableRawStates + joinOffset;
EnableRawStates = EnableRawStates + joinOffset; RoomOccupiedFeedback = RoomOccupiedFeedback + joinOffset;
RoomOccupiedFeedback = RoomOccupiedFeedback + joinOffset; GraceOccupancyDetectedFeedback = GraceOccupancyDetectedFeedback + joinOffset;
GraceOccupancyDetectedFeedback = GraceOccupancyDetectedFeedback + joinOffset; RoomVacantFeedback = RoomVacantFeedback + joinOffset;
RoomVacantFeedback = RoomVacantFeedback + joinOffset;
RawOccupancyFeedback = RawOccupancyFeedback + joinOffset; RawOccupancyFeedback = RawOccupancyFeedback + joinOffset;
RawOccupancyPirFeedback = RawOccupancyPirFeedback + joinOffset; RawOccupancyPirFeedback = RawOccupancyPirFeedback + joinOffset;
RawOccupancyUsFeedback = RawOccupancyUsFeedback + joinOffset; RawOccupancyUsFeedback = RawOccupancyUsFeedback + joinOffset;
EnableLedFlash = EnableLedFlash + joinOffset; EnableLedFlash = EnableLedFlash + joinOffset;
DisableLedFlash = DisableLedFlash + joinOffset; DisableLedFlash = DisableLedFlash + joinOffset;
EnableShortTimeout = EnableShortTimeout + joinOffset; EnableShortTimeout = EnableShortTimeout + joinOffset;
DisableShortTimeout = DisableShortTimeout + joinOffset; DisableShortTimeout = DisableShortTimeout + joinOffset;
OrWhenVacated = OrWhenVacated + joinOffset; OrWhenVacated = OrWhenVacated + joinOffset;
AndWhenVacated = AndWhenVacated + joinOffset; AndWhenVacated = AndWhenVacated + joinOffset;
EnableUsA = EnableUsA + joinOffset; EnableUsA = EnableUsA + joinOffset;
DisableUsA = DisableUsA + joinOffset; DisableUsA = DisableUsA + joinOffset;
EnableUsB = EnableUsB + joinOffset; EnableUsB = EnableUsB + joinOffset;
DisableUsB = DisableUsB + joinOffset; DisableUsB = DisableUsB + joinOffset;
EnablePir = EnablePir + joinOffset; EnablePir = EnablePir + joinOffset;
DisablePir = DisablePir + joinOffset; DisablePir = DisablePir + joinOffset;
DisablePir = DisablePir + joinOffset; DisablePir = DisablePir + joinOffset;
IncrementUsInOccupiedState = IncrementUsInOccupiedState + joinOffset; IncrementUsInOccupiedState = IncrementUsInOccupiedState + joinOffset;
DecrementUsInOccupiedState = DecrementUsInOccupiedState + joinOffset; DecrementUsInOccupiedState = DecrementUsInOccupiedState + joinOffset;
IncrementUsInVacantState = IncrementUsInVacantState + joinOffset; IncrementUsInVacantState = IncrementUsInVacantState + joinOffset;
DecrementUsInVacantState = DecrementUsInVacantState + joinOffset; DecrementUsInVacantState = DecrementUsInVacantState + joinOffset;
IncrementPirInOccupiedState = IncrementPirInOccupiedState + joinOffset; IncrementPirInOccupiedState = IncrementPirInOccupiedState + joinOffset;
DecrementPirInOccupiedState = DecrementPirInOccupiedState + joinOffset; DecrementPirInOccupiedState = DecrementPirInOccupiedState + joinOffset;
IncrementPirInVacantState = IncrementPirInVacantState + joinOffset; IncrementPirInVacantState = IncrementPirInVacantState + joinOffset;
DecrementPirInVacantState = DecrementPirInVacantState + joinOffset; DecrementPirInVacantState = DecrementPirInVacantState + joinOffset;
Timeout = Timeout + joinOffset; Timeout = Timeout + joinOffset;
TimeoutLocalFeedback = TimeoutLocalFeedback + joinOffset; TimeoutLocalFeedback = TimeoutLocalFeedback + joinOffset;
InternalPhotoSensorValue = InternalPhotoSensorValue + joinOffset; InternalPhotoSensorValue = InternalPhotoSensorValue + joinOffset;
ExternalPhotoSensorValue = ExternalPhotoSensorValue + joinOffset; ExternalPhotoSensorValue = ExternalPhotoSensorValue + joinOffset;
UsSensitivityInOccupiedState = UsSensitivityInOccupiedState + joinOffset; UsSensitivityInOccupiedState = UsSensitivityInOccupiedState + joinOffset;
UsSensitivityInVacantState = UsSensitivityInVacantState + joinOffset; UsSensitivityInVacantState = UsSensitivityInVacantState + joinOffset;
PirSensitivityInOccupiedState = PirSensitivityInOccupiedState + joinOffset; PirSensitivityInOccupiedState = PirSensitivityInOccupiedState + joinOffset;
PirSensitivityInVacantState = PirSensitivityInVacantState + joinOffset; PirSensitivityInVacantState = PirSensitivityInVacantState + joinOffset;
} }
} }
} }