mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-11 18:54:52 +00:00
Merge branch 'main' into feature/add-fusion-joinmaps
This commit is contained in:
@@ -28,6 +28,33 @@ namespace PepperDash.Essentials
|
||||
private Dictionary<string, string> _currentPresets;
|
||||
private ScheduledEventGroup _roomScheduledEventGroup;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
protected override Func<bool> IsWarmingFeedbackFunc
|
||||
{
|
||||
get
|
||||
{
|
||||
return () =>
|
||||
{
|
||||
return _displays.All(kv => kv.Value.IsWarmingUpFeedback.BoolValue);
|
||||
};
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
protected override Func<bool> IsCoolingFeedbackFunc
|
||||
{
|
||||
get
|
||||
{
|
||||
return () =>
|
||||
{
|
||||
return _displays.All(kv => kv.Value.IsCoolingDownFeedback.BoolValue);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public EssentialsTechRoom(DeviceConfig config) : base(config)
|
||||
{
|
||||
_config = config.Properties.ToObject<EssentialsTechRoomConfig>();
|
||||
@@ -111,7 +138,12 @@ namespace PepperDash.Essentials
|
||||
foreach (var display in _displays)
|
||||
{
|
||||
display.Value.PowerIsOnFeedback.OutputChange +=
|
||||
(sender, args) => RoomPowerIsOnFeedback.InvokeFireUpdate();
|
||||
(sender, args) =>
|
||||
{
|
||||
RoomPowerIsOnFeedback.InvokeFireUpdate();
|
||||
IsWarmingUpFeedback.InvokeFireUpdate();
|
||||
IsCoolingDownFeedback.InvokeFireUpdate();
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -229,8 +261,16 @@ namespace PepperDash.Essentials
|
||||
|
||||
CrestronInvoke.BeginInvoke((o) =>
|
||||
{
|
||||
Debug.Console(2, this, "There are {0} actions to execute for this event.", eventConfig.Actions.Count);
|
||||
|
||||
foreach (var a in eventConfig.Actions)
|
||||
{
|
||||
Debug.Console(2, this,
|
||||
@"Attempting to run action:
|
||||
DeviceKey: {0}
|
||||
MethodName: {1}
|
||||
Params: {2}"
|
||||
, a.DeviceKey, a.MethodName, a.Params);
|
||||
DeviceJsonApi.DoDeviceAction(a);
|
||||
}
|
||||
});
|
||||
@@ -239,6 +279,8 @@ namespace PepperDash.Essentials
|
||||
|
||||
public void RoomPowerOn()
|
||||
{
|
||||
Debug.Console(2, this, "Room Powering On");
|
||||
|
||||
var dummySource = DeviceManager.GetDeviceForKey(_config.DummySourceKey) as IRoutingOutputs;
|
||||
|
||||
if (dummySource == null)
|
||||
@@ -255,6 +297,8 @@ namespace PepperDash.Essentials
|
||||
|
||||
public void RoomPowerOff()
|
||||
{
|
||||
Debug.Console(2, this, "Room Powering Off");
|
||||
|
||||
foreach (var display in _displays)
|
||||
{
|
||||
display.Value.PowerOff();
|
||||
@@ -281,16 +325,6 @@ namespace PepperDash.Essentials
|
||||
|
||||
#region Overrides of EssentialsRoomBase
|
||||
|
||||
protected override Func<bool> IsWarmingFeedbackFunc
|
||||
{
|
||||
get { return () => false; }
|
||||
}
|
||||
|
||||
protected override Func<bool> IsCoolingFeedbackFunc
|
||||
{
|
||||
get { return () => false; }
|
||||
}
|
||||
|
||||
protected override Func<bool> OnFeedbackFunc
|
||||
{
|
||||
get { return () => RoomPowerIsOn; }
|
||||
@@ -358,6 +392,8 @@ namespace PepperDash.Essentials
|
||||
feedback.Value.FireUpdate();
|
||||
}
|
||||
};
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
@@ -366,6 +402,8 @@ namespace PepperDash.Essentials
|
||||
var tuner = setTopBox;
|
||||
|
||||
trilist.SetStringSigAction(joinMap.CurrentPreset.JoinNumber + i, s => _tunerPresets.Dial(s, tuner.Value));
|
||||
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user