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

Merge branch 'development' into release/1.5.7

Browse Source
This commit is contained in:
Andrew Welker
2020-07-10 08:35:26 -07:00
committed by GitHub
parent 8341631618 2312657a2f
commit 3152430584
1 changed files with 317 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs
View File

@@ -23,6 +23,9 @@ namespace PepperDash.Essentials.Core
{ {
private CenRfgwController _gateway; private CenRfgwController _gateway;
private GatewayBase _gatewayBase;
private Hr1x0WirelessRemoteBase _remote; private Hr1x0WirelessRemoteBase _remote;
public FeedbackCollection<Feedback> Feedbacks { get; set; } public FeedbackCollection<Feedback> Feedbacks { get; set; }
@@ -43,27 +46,31 @@ namespace PepperDash.Essentials.Core
var rfId = (uint)props.Control.InfinetIdInt; var rfId = (uint)props.Control.InfinetIdInt;
_config = config; _config = config;
GatewayBase gateway;
if (props.GatewayDeviceKey == "processor") if (props.GatewayDeviceKey == "processor")
{ {
gateway = Global.ControlSystem.ControllerRFGatewayDevice; {
AddPreActivationAction(() =>
{
_remote = preActivationFunc(config);
RegisterEvents();
});
return;
}
} }
else
var gatewayDev = DeviceManager.GetDeviceForKey(props.GatewayDeviceKey) as CenRfgwController;
if (gatewayDev == null)
{ {
var gatewayDev = DeviceManager.GetDeviceForKey(props.GatewayDeviceKey) as CenRfgwController; Debug.Console(0, "GetHr1x0WirelessRemote: Device '{0}' is not a valid device", props.GatewayDeviceKey);
if (gatewayDev == null)
{
Debug.Console(0, "GetHr1x0WirelessRemote: Device '{0}' is not a valid device", props.GatewayDeviceKey);
}
if (gatewayDev != null)
{
Debug.Console(0, "GetHr1x0WirelessRemote: Device '{0}' is a valid device", props.GatewayDeviceKey);
gateway = gatewayDev.GateWay;
_gateway = gatewayDev;
}
} }
if (gatewayDev != null)
{
Debug.Console(0, "GetHr1x0WirelessRemote: Device '{0}' is a valid device", props.GatewayDeviceKey);
_gateway = gatewayDev;
}
if (_gateway == null) return; if (_gateway == null) return;