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

Add support to expose names - fix some issues with feedbacks from occ sensors

Browse source
This commit is contained in:
Trevor Payne 2020-03-03 12:37:19 -06:00
parent cd15b4e93b
commit 6c32c6154e
4 changed files with 155 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs
View file

@ -31,6 +31,7 @@ namespace PepperDash.Essentials.Bridges
#region Single and Dual Sensor Stuff
occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
trilist.StringInput[joinMap.Name].StringValue = occController.Name;
// Occupied status
trilist.SetSigTrueAction(joinMap.ForceOccupied, new Action(() => occController.ForceOccupied()));
@ -38,6 +39,7 @@ namespace PepperDash.Essentials.Bridges
occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback]);
occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback]);
occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback]);
trilist.SetBoolSigAction(joinMap.EnableRawStates, new Action<bool>((b) => occController.EnableRawStates(b)));
// Timouts
trilist.SetUShortSigAction(joinMap.Timeout, new Action<ushort>((u) => occController.SetRemoteTimeout(u)));

9
PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
View file

@ -137,6 +137,10 @@ namespace PepperDash.Essentials.Bridges
public uint PirSensitivityInVacantState { get; set; }
#endregion
#region Serial
public uint Name { get; set; }
#endregion
public GlsOccupancySensorBaseJoinMap()
{
IsOnline = 1;
@ -178,6 +182,9 @@ namespace PepperDash.Essentials.Bridges
UsSensitivityInVacantState = 6;
PirSensitivityInOccupiedState = 7;
PirSensitivityInVacantState = 8;
Name = 1;
}
public override void OffsetJoinNumbers(uint joinStart)
@ -224,6 +231,8 @@ namespace PepperDash.Essentials.Bridges
UsSensitivityInVacantState = UsSensitivityInVacantState + joinOffset;
PirSensitivityInOccupiedState = PirSensitivityInOccupiedState + joinOffset;
PirSensitivityInVacantState = PirSensitivityInVacantState + joinOffset;
Name = Name + joinOffset;
}
}

10
essentials-framework/Essentials Devices Common/Essentials Devices Common/Occupancy/GlsOdtOccupancySensorController.cs
View file

@ -77,6 +77,16 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId)
UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
else if (args.EventId == GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId)
{
Debug.Console(2, this, "Occsensor has had Raw PIR");
RawOccupancyPirFeedback.FireUpdate();
}
else if (args.EventId == GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId)
{
Debug.Console(2, this, "Occsensor has had Raw US");
RawOccupancyUsFeedback.FireUpdate();
}
base.OccSensor_GlsOccupancySensorChange(device, args);
}

2
essentials-framework/pepperdashcore-builds

@ -1 +1 @@
Subproject commit 7db7cb27f613b52dd0b056f6973ead05ffe1c14a
Subproject commit 27a665b68a0725729bb09138bb85f575833df4b2