Skip to content

Commit

Permalink
Merge pull request #31 from MatKlucznyk/add-support-for-redundancy
Browse files Browse the repository at this point in the history
Add support for redundancy
  • Loading branch information
MatKlucznyk authored Oct 6, 2023
2 parents 2e60614 + d316c7a commit 8ada9a6
Show file tree
Hide file tree
Showing 28 changed files with 2,115 additions and 1,972 deletions.
Binary file modified QscQsys/Q-Sys Designer File/Test.qsys
Binary file not shown.
760 changes: 492 additions & 268 deletions QscQsys/QscQsys/QsysCore.cs

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions QscQsys/QscQsys/QsysCoreManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ namespace QscQsys
{
public static class QsysCoreManager
{
private static readonly object _coresLock = new object();
private static readonly Dictionary<string, QsysCore> _cores = new Dictionary<string, QsysCore>();
private static readonly object CoresLock = new object();
private static readonly Dictionary<string, QsysCore> Cores = new Dictionary<string, QsysCore>();

internal static event EventHandler<CoreEventArgs> CoreAdded;
internal static event EventHandler<CoreEventArgs> CoreRemoved;
Expand All @@ -22,20 +22,20 @@ internal static bool Is3Series

public static bool TryGetCore(string coreId, out QsysCore core)
{
lock (_coresLock)
lock (CoresLock)
{
return _cores.TryGetValue(coreId, out core);
return Cores.TryGetValue(coreId, out core);
}
}

internal static void AddCore(QsysCore core)
{
try
{
lock (_coresLock)
lock (CoresLock)
{
if (!_cores.ContainsKey(core.CoreId))
_cores.Add(core.CoreId, core);
if (!Cores.ContainsKey(core.CoreId))
Cores.Add(core.CoreId, core);
}

RaiseCoreAdded(new CoreEventArgs(core.CoreId));
Expand All @@ -50,10 +50,10 @@ internal static void RemoveCore(QsysCore core)
{
try
{
lock (_coresLock)
lock (CoresLock)
{
if (_cores.ContainsKey(core.CoreId))
_cores.Remove(core.CoreId);
if (Cores.ContainsKey(core.CoreId))
Cores.Remove(core.CoreId);
}

RaiseCoreRemoved(new CoreEventArgs(core.CoreId));
Expand Down
Binary file modified QscQsys/QscQsys/bin/Debug/QscQsys.clz
Binary file not shown.
6 changes: 3 additions & 3 deletions QscQsys/QscQsys/bin/Debug/QscQsys.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<ArchiveName />
</RequiredInfo>
<OptionalInfo>
<CompiledOn>9/21/2023 11:56:12 AM</CompiledOn>
<CompilerRev>1.0.0.19685</CompilerRev>
<CompiledOn>2023-10-06 12:40:34 PM</CompiledOn>
<CompilerRev>1.0.0.21016</CompilerRev>
</OptionalInfo>
<Plugin>
<Version>Crestron.SIMPLSharp, Version=2.0.58.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
<Include4.dat>2.19.069</Include4.dat>
<Include4.dat>2.19.076</Include4.dat>
</Plugin>
</ProgramInfo>
Binary file modified QscQsys/QscQsys/bin/Debug/QscQsys.dll
Binary file not shown.
Binary file modified QscQsys/QscQsys/bin/Debug/QscQsys.pdb
Binary file not shown.
253 changes: 144 additions & 109 deletions QscQsys/QscQsys/bin/Debug/QscQsys.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file modified QscQsys/QscQsys/bin/Debug/SimplSharpHelperInterface.dll
Binary file not shown.
Binary file modified QscQsys/QscQsys/bin/Debug/SimplSharpNewtonsoft.dll
Binary file not shown.
Binary file modified QscQsys/QscQsys/bin/Debug/SimplSharpReflectionInterface.dll
Binary file not shown.
Binary file modified QscQsys/QscQsys/bin/Debug/SimplSharpSQLHelperInterface.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions QscQsys/QscQsys/bin/Debug/manifest.info
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MainAssembly=QscQsys.dll:580bae242ca2e7f2b70d0d193104155e
MainAssembly=QscQsys.dll:9aebfa54646b5afab137ed947252fd0f
MainAssemblyMinFirmwareVersion=1.007.0017
MainAssemblyResource=QscQsys.xml:e340eae22c57ac2970821cf9c52366a2
MainAssemblyResource=QscQsys.xml:59588033c4d98eef04c508e59e1e843d
MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c
MainAssemblyResource=SimplSharpData.dat.der:bf862965c00f3e6ec535e4e00e82d30c
MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c
Expand Down
Binary file modified QscQsys/QscQsys/bin/Debug/manifest.ser
Binary file not shown.
14 changes: 14 additions & 0 deletions QscQsys/QscQsys/obj/Debug/QscQsys.csproj.FileListAbsolute.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,17 @@ Z:\iporter\Repos\isaaacporter\Qsys\QscQsys\QscQsys\bin\Debug\Newtonsoft.Json.Com
Z:\iporter\Repos\isaaacporter\Qsys\QscQsys\QscQsys\obj\Debug\ResolveAssemblyReference.cache
Z:\iporter\Repos\isaaacporter\Qsys\QscQsys\QscQsys\obj\Debug\QscQsys.dll
Z:\iporter\Repos\isaaacporter\Qsys\QscQsys\QscQsys\obj\Debug\QscQsys.pdb
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\QscQsys.xml
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\QscQsys.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\QscQsys.pdb
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\ExtensionMethods.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\SimplSharpCustomAttributesInterface.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\SimplSharpHelperInterface.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\SimplSharpNewtonsoft.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\SimplSharpReflectionInterface.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\TCPClient.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\SimplSharpSQLHelperInterface.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\bin\Debug\Newtonsoft.Json.Compact.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\obj\Debug\ResolveAssemblyReference.cache
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\obj\Debug\QscQsys.dll
C:\Users\mathew.klucznyk.GUSS\OneDrive - GUSS\Crestron Modules\Mat\SIMPLSharp Projects\Qsys\QscQsys\QscQsys\obj\Debug\QscQsys.pdb
Binary file modified QscQsys/QscQsys/obj/Debug/QscQsys.dll
Binary file not shown.
Binary file modified QscQsys/QscQsys/obj/Debug/QscQsys.pdb
Binary file not shown.
Loading

0 comments on commit 8ada9a6

Please sign in to comment.