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

Added feedback/action linking to SystemMonitorBridge

Browse source
This commit is contained in:
Neil Dorin 2018-12-10 16:33:24 -07:00
parent 9bc0269e78
commit 531e7186f2
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
PepperDashEssentials/Bridges/SystemMonitorBridge.cs
View file

@ -23,7 +23,12 @@ namespace PepperDash.Essentials.Bridges
joinMap.OffsetJoinNumbers(joinStart);
systemMonitorController.TimeZoneFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeZone]);
trilist.SetUShortSigAction(joinMap.TimeZone, new Action<ushort>(u => systemMonitorController.SetTimeZone(u)));
systemMonitorController.TimeZoneTextFeedback.LinkInputSig(trilist.StringInput[joinMap.TimeZoneName]);
systemMonitorController.IOControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
systemMonitorController.SnmpVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.SnmpAppVersion]);
foreach (var p in SystemMonitor.ProgramCollection)
@ -47,7 +52,7 @@ namespace PepperDash.Essentials.Bridges
//Serial
public uint TimeZoneName { get; set; }
public uint IOControllerVersion { get; set; }
public uint SNMPAppVersion { get; set; }
public uint SnmpAppVersion { get; set; }
public uint BACnetAppVersion { get; set; }
public uint ControllerVersion { get; set; }
@ -63,7 +68,7 @@ namespace PepperDash.Essentials.Bridges
TimeZoneName = 1;
IOControllerVersion = 2;
SNMPAppVersion = 3;
SnmpAppVersion = 3;
BACnetAppVersion = 4;
ControllerVersion = 5;
@ -86,7 +91,7 @@ namespace PepperDash.Essentials.Bridges
TimeZoneName = TimeZoneName + joinOffset;
IOControllerVersion = IOControllerVersion + joinOffset;
SNMPAppVersion = SNMPAppVersion + joinOffset;
SnmpAppVersion = SnmpAppVersion + joinOffset;
BACnetAppVersion = BACnetAppVersion + joinOffset;
ControllerVersion = ControllerVersion + joinOffset;

9
PepperDashEssentials/ControlSystem.cs
View file

@ -146,13 +146,17 @@ namespace PepperDash.Essentials
"------------------------------------------------");
}
SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
}
catch (Exception e)
{
Debug.Console(0, "FATAL INITIALIZE ERROR. System is in an inconsistent state:\r{0}", e);
}
// Notify the
SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
}
/// <summary>
@ -220,6 +224,9 @@ namespace PepperDash.Essentials
// Build the processor wrapper class
DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
// Add global System Monitor device
DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
foreach (var devConf in ConfigReader.ConfigObject.Devices)
{