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

Moved generation of Mpc3TouchpanelController device from core device factory into ControlSystem LoadDevices() method.

Browse Source
This commit is contained in:
Neil Dorin
2020-03-12 12:46:21 -06:00
parent 7afcbaee61
commit 1b096de377
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PepperDashEssentials/ControlSystem.cs
View File

@@ -428,11 +428,30 @@ namespace PepperDash.Essentials
DeviceManager.AddDevice(dmpsRoutingController); DeviceManager.AddDevice(dmpsRoutingController);
} }
else if (this.ControllerPrompt.IndexOf("mpc3", StringComparison.OrdinalIgnoreCase) > -1)
{
Debug.Console(2, "MPC3 processor type detected. Adding Mpc3TouchpanelController.");
var butToken = devConf.Properties["buttons"];
if (butToken != null)
{
var buttons = butToken.ToObject<Dictionary<uint, Essentials.Core.Touchpanels.KeypadButton>>();
var tpController = new Essentials.Core.Touchpanels.Mpc3TouchpanelController(devConf.Key, devConf.Name, Global.ControlSystem, buttons);
DeviceManager.AddDevice(tpController);
}
else
{
Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Unable to deserialize buttons collection for device: {0}", devConf.Key);
}
}
else else
{ {
Debug.Console(2, "************Processor is not DMPS type***************"); Debug.Console(2, "************Processor is not DMPS type***************");
} }
continue; continue;
} }

15
essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs
View File

@@ -83,21 +83,6 @@ namespace PepperDash.Essentials.Core
return new C2nRthsController(key, name, new C2nRths(cresnetId, Global.ControlSystem)); return new C2nRthsController(key, name, new C2nRths(cresnetId, Global.ControlSystem));
} }
if (typeName.StartsWith("mpc3"))
{
var butToken = dc.Properties["buttons"];
if (butToken != null)
{
var buttons = butToken.ToObject<Dictionary<uint, KeypadButton>>();
return new Mpc3TouchpanelController(key, name, Global.ControlSystem, buttons);
}
else
{
Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Unable to deserialize buttons collection for device: {0}", key);
}
}
return null; return null;
} }