Small fixes

marcus-j-davies · marcus-j-davies · commit 509e4aee4322 · 2023-11-12T08:27:25.000Z
diff --git a/Visual Studio Projects/ZWaveJS.NET/Debug/Debug.csproj b/Visual Studio Projects/ZWaveJS.NET/Debug/Debug.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Configurations>Debug;Release;DEBUG - Local ZWUS Server;Debug  - Local Update Server</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Visual Studio Projects/ZWaveJS.NET/Demo Application/Demo Application.csproj b/Visual Studio Projects/ZWaveJS.NET/Demo Application/Demo Application.csproj
@@ -7,6 +7,7 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Visual Studio Projects/ZWaveJS.NET/Demo Application/Main.cs b/Visual Studio Projects/ZWaveJS.NET/Demo Application/Main.cs
@@ -1,4 +1,5 @@
 using System.Security.Cryptography;
+using System.Xml.Linq;
 using ZWaveJS.NET;
 namespace Demo_Application
 {
@@ -159,6 +160,7 @@ private void _Driver_DriverReady()
                 ZWaveNode[] Nodes = _Driver.Controller.Nodes.AsArray();
                 foreach (ZWaveNode N in Nodes)
                 {
+                    N.NodeReady += Node_NodeReady;
                     ListViewItem LVI = new ListViewItem(string.Format("#{0}", N.id));
 
                     LVI.SubItems.Add(N.interviewStage != "Complete" ? "Interview" : N.status.ToString());
@@ -559,10 +561,11 @@ private void button18_Click(object sender, EventArgs e)
         {
             if (LST_Nodes.SelectedItems.Count > 0)
             {
-                if (MessageBox.Show("This will check if the Node has Failed, and if, so will be removed. Are you sure?","Are You Sure",MessageBoxButtons.YesNo,MessageBoxIcon.Question) == DialogResult.Yes)
+                if (MessageBox.Show("This will check if the Node has Failed, and if, so will be removed. Are you sure?", "Are You Sure", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
 
-                    _Driver.Controller.RemoveFailedNode((int)LST_Nodes.SelectedItems[0].Tag).ContinueWith((C) => {
+                    _Driver.Controller.RemoveFailedNode((int)LST_Nodes.SelectedItems[0].Tag).ContinueWith((C) =>
+                    {
 
                         if (!C.Result.Success)
                         {
@@ -571,7 +574,7 @@ private void button18_Click(object sender, EventArgs e)
                                 MessageBox.Show(C.Result.Message, "Could Not Remove Node", MessageBoxButtons.OK, MessageBoxIcon.Error);
                             }));
                         }
-                    
+
                     });
                 }
             }
diff --git a/Visual Studio Projects/ZWaveJS.NET/Demo Application/Program.cs b/Visual Studio Projects/ZWaveJS.NET/Demo Application/Program.cs
@@ -25,7 +25,6 @@ internal static class Program
         [STAThread]
         static void Main()
         {
-
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
diff --git a/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET.sln b/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET.sln
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZWaveJS.NET", "ZWaveJS.NET\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo Application", "Demo Application\Demo Application.csproj", "{737223B0-DD67-4A96-8429-AC16B2C4CF94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debug", "Debug\Debug.csproj", "{11947CCB-C963-49C2-B0DF-7F12624416FA}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{737223B0-DD67-4A96-8429-AC16B2C4CF94}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{737223B0-DD67-4A96-8429-AC16B2C4CF94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{737223B0-DD67-4A96-8429-AC16B2C4CF94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11947CCB-C963-49C2-B0DF-7F12624416FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11947CCB-C963-49C2-B0DF-7F12624416FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11947CCB-C963-49C2-B0DF-7F12624416FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11947CCB-C963-49C2-B0DF-7F12624416FA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Server.cs b/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Server.cs
@@ -48,20 +48,10 @@ internal static void Start(string SerialPort, ZWaveOptions Config, int WSPort)
             ProcessStartInfo PSI = new ProcessStartInfo();
             PSI.RedirectStandardError = true;
             PSI.RedirectStandardInput = true;
-            
-            // If Debugging and FWUS is setup locally, setup an EV to use it (will help with UI development)
-            if(System.Diagnostics.Debugger.IsAttached)
-            {
-                using (TcpClient tcpClient = new TcpClient())
-                {
-                    try
-                    {
-                        tcpClient.Connect("localhost", 8787);
-                        PSI.EnvironmentVariables.Add("ZWAVEJS_FW_SERVICE_URL", "http://localhost:8787");
-                    }
-                    catch (Exception){}
-                }
-            }
+
+#if FWULOCAL
+            PSI.EnvironmentVariables.Add("ZWAVEJS_FW_SERVICE_URL", "http://localhost:8787");
+#endif
             
             PSI.EnvironmentVariables.Add("CONFIG", _Config);
             PSI.EnvironmentVariables.Add("SERIAL_PORT", SerialPort);
diff --git a/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/VirtualNode.cs b/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/VirtualNode.cs
@@ -80,7 +80,7 @@ public Task<CMDResult> GetDefinedValueIDs()
                 CMDResult Res = new CMDResult(JO);
                 if (Res.Success)
                 {
-                    Res.SetPayload(JO.SelectToken("result.valueIds").ToObject<ValueID[]>());
+                    Res.SetPayload(JO.SelectToken("result.valueIDs").ToObject<ValueID[]>());
                 }
 
                 Result.SetResult(Res);
diff --git a/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/ZWaveJS.NET.csproj b/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/ZWaveJS.NET.csproj
@@ -14,8 +14,8 @@
     <PackageIcon>Logo.png</PackageIcon>
     <PackageIconUrl />
     <UserSecretsId>d23bfce5-76f4-45a1-820d-7afd4ac2a291</UserSecretsId>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Semver" Version="2.3.0" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Security.Cryptography;`
	`2`	`+using System.Xml.Linq;`
`2`	`3`	`using ZWaveJS.NET;`
`3`	`4`	`namespace Demo_Application`
`4`	`5`	`{`
`@@ -159,6 +160,7 @@ private void _Driver_DriverReady()`
`159`	`160`	`ZWaveNode[] Nodes = _Driver.Controller.Nodes.AsArray();`
`160`	`161`	`foreach (ZWaveNode N in Nodes)`
`161`	`162`	`{`
	`163`	`+ N.NodeReady += Node_NodeReady;`
`162`	`164`	`ListViewItem LVI = new ListViewItem(string.Format("#{0}", N.id));`
`163`	`165`
`164`	`166`	`LVI.SubItems.Add(N.interviewStage != "Complete" ? "Interview" : N.status.ToString());`
`@@ -559,10 +561,11 @@ private void button18_Click(object sender, EventArgs e)`
`559`	`561`	`{`
`560`	`562`	`if (LST_Nodes.SelectedItems.Count > 0)`
`561`	`563`	`{`
`562`		`- if (MessageBox.Show("This will check if the Node has Failed, and if, so will be removed. Are you sure?","Are You Sure",MessageBoxButtons.YesNo,MessageBoxIcon.Question) == DialogResult.Yes)`
	`564`	`+ if (MessageBox.Show("This will check if the Node has Failed, and if, so will be removed. Are you sure?", "Are You Sure", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)`
`563`	`565`	`{`
`564`	`566`
`565`		`- _Driver.Controller.RemoveFailedNode((int)LST_Nodes.SelectedItems[0].Tag).ContinueWith((C) => {`
	`567`	`+ _Driver.Controller.RemoveFailedNode((int)LST_Nodes.SelectedItems[0].Tag).ContinueWith((C) =>`
	`568`	`+ {`
`566`	`569`
`567`	`570`	`if (!C.Result.Success)`
`568`	`571`	`{`
`@@ -571,7 +574,7 @@ private void button18_Click(object sender, EventArgs e)`
`571`	`574`	`MessageBox.Show(C.Result.Message, "Could Not Remove Node", MessageBoxButtons.OK, MessageBoxIcon.Error);`
`572`	`575`	`}));`
`573`	`576`	`}`
`574`		`-`
	`577`	`+`
`575`	`578`	`});`
`576`	`579`	`}`
`577`	`580`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ internal static class Program`
`25`	`25`	`[STAThread]`
`26`	`26`	`static void Main()`
`27`	`27`	`{`
`28`		`-`
`29`	`28`	`// To customize application configuration such as set high DPI settings or default font,`
`30`	`29`	`// see https://aka.ms/applicationconfiguration.`
`31`	`30`	`ApplicationConfiguration.Initialize();`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public Task<CMDResult> GetDefinedValueIDs()`
`80`	`80`	`CMDResult Res = new CMDResult(JO);`
`81`	`81`	`if (Res.Success)`
`82`	`82`	`{`
`83`		`- Res.SetPayload(JO.SelectToken("result.valueIds").ToObject<ValueID[]>());`
	`83`	`+ Res.SetPayload(JO.SelectToken("result.valueIDs").ToObject<ValueID[]>());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`Result.SetResult(Res);`