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

Merge pull request #304 from PepperDash/feature/minor-updates

Browse Source 
Add bulk device add method and update Eisc
This commit is contained in:
Neil Dorin
2020-07-06 15:50:30 -06:00
committed by GitHub
parent 56e4488087 76033f53fc
commit a2e041652d
3 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PepperDashEssentials/Bridges/EiscBridge.cs
View File

@@ -151,12 +151,12 @@ namespace PepperDash.Essentials.Bridges
try try
{ {
if (Debug.Level >= 1) if (Debug.Level >= 1)
Debug.Console(1, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue); Debug.Console(2, this, "EiscApi change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
var uo = args.Sig.UserObject; var uo = args.Sig.UserObject;
if (uo == null) return; if (uo == null) return;
Debug.Console(1, this, "Executing Action: {0}", uo.ToString()); Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
if (uo is Action<bool>) if (uo is Action<bool>)
(uo as Action<bool>)(args.Sig.BoolValue); (uo as Action<bool>)(args.Sig.BoolValue);
else if (uo is Action<ushort>) else if (uo is Action<ushort>)

14
essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
View File

@@ -190,11 +190,11 @@ namespace PepperDash.Essentials.Core.Bridges
var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>; var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
if (uo != null) if (uo != null)
{ {
Debug.Console(1, this, "Executing Action: {0}", uo.ToString()); Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
uo(Convert.ToBoolean(state)); uo(Convert.ToBoolean(state));
} }
else else
Debug.Console(1, this, "User Action is null. Nothing to Execute"); Debug.Console(2, this, "User Action is null. Nothing to Execute");
break; break;
} }
case "analog": case "analog":
@@ -202,27 +202,27 @@ namespace PepperDash.Essentials.Core.Bridges
var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>; var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
if (uo != null) if (uo != null)
{ {
Debug.Console(1, this, "Executing Action: {0}", uo.ToString()); Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
uo(Convert.ToUInt16(state)); uo(Convert.ToUInt16(state));
} }
else else
Debug.Console(1, this, "User Action is null. Nothing to Execute"); break; Debug.Console(2, this, "User Action is null. Nothing to Execute"); break;
} }
case "serial": case "serial":
{ {
var uo = Eisc.BooleanOutput[join].UserObject as Action<string>; var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
if (uo != null) if (uo != null)
{ {
Debug.Console(1, this, "Executing Action: {0}", uo.ToString()); Debug.Console(2, this, "Executing Action: {0}", uo.ToString());
uo(Convert.ToString(state)); uo(Convert.ToString(state));
} }
else else
Debug.Console(1, this, "User Action is null. Nothing to Execute"); Debug.Console(2, this, "User Action is null. Nothing to Execute");
break; break;
} }
default: default:
{ {
Debug.Console(1, "Unknown join type. Use digital/serial/analog"); Debug.Console(2, "Unknown join type. Use digital/serial/analog");
break; break;
} }
} }

36
essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
View File

@@ -238,6 +238,42 @@ namespace PepperDash.Essentials.Core
} }
} }
public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
{
try
{
if (!DeviceCriticalSection.TryEnter())
{
Debug.Console(0, Debug.ErrorLogLevel.Error,
"Currently unable to add devices to Device Manager. Please try again");
return;
}
if (!AddDeviceEnabled)
{
Debug.Console(0, Debug.ErrorLogLevel.Error,
"All devices have been activated. Adding new devices is not allowed.");
return;
}
foreach (var dev in devicesToAdd)
{
try
{
Devices.Add(dev.Key, dev);
}
catch (ArgumentException ex)
{
Debug.Console(0, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
dev.Key, ex.Message, ex.StackTrace);
}
}
}
finally
{
DeviceCriticalSection.Leave();
}
}
public static void RemoveDevice(IKeyed newDev) public static void RemoveDevice(IKeyed newDev)
{ {
try try