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

Updates feedback funcs for combined room type

Browse Source
This commit is contained in:
Neil Dorin
2021-08-12 09:36:03 -06:00
parent 397a5b1794
commit 1bf828b8a9
2 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
View File

@@ -57,11 +57,12 @@ namespace PepperDash.Essentials
{ {
return () => return () =>
{ {
var displays = Displays.Where((d) => d is DisplayBase) as List<DisplayBase>;
var displays = Displays.OfType<DisplayBase>().ToList();
var val = CurrentSourceInfo != null var val = CurrentSourceInfo != null
&& CurrentSourceInfo.Type == eSourceListItemType.Route && CurrentSourceInfo.Type == eSourceListItemType.Route
&& displays.Count() > 0; && displays.Count > 0;
//&& disp.PowerIsOnFeedback.BoolValue; //&& disp.PowerIsOnFeedback.BoolValue;
return val; return val;
}; };
@@ -74,23 +75,7 @@ namespace PepperDash.Essentials
{ {
get get
{ {
return () => return () => Displays.OfType<TwoWayDisplayBase>().Any((d) => d.IsWarmingUpFeedback.BoolValue);
{
var displays = Displays.Where((d) => d is TwoWayDisplayBase) as List<TwoWayDisplayBase>;
if (displays != null)
{
var warmingDisplays = displays.Where((d) => d.IsWarmingUpFeedback.BoolValue);
if (warmingDisplays.Count() > 0)
{
return true;
}
else
return false;
}
else
return false;
};
} }
} }
/// <summary> /// <summary>
@@ -100,23 +85,7 @@ namespace PepperDash.Essentials
{ {
get get
{ {
return () => return () => Displays.OfType<TwoWayDisplayBase>().Any((d) => d.IsCoolingDownFeedback.BoolValue);
{
var displays = Displays.Where((d) => d is TwoWayDisplayBase) as List<TwoWayDisplayBase>;
if (displays != null)
{
var coolingDisplays = displays.Where((d) => d.IsCoolingDownFeedback.BoolValue);
if (coolingDisplays.Count() > 0)
{
return true;
}
else
return false;
}
else
return false;
};
} }
} }

3
devjson commands.json
View File

@@ -42,3 +42,6 @@ devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [
devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []} devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []}
devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["combined"]}
devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["divided"]}