Merge pull request #30 from Bounz/master

Changed the way how CentralSceneValue is serialized
genielabs · Sep 24, 2018 · 35f6007 · 35f6007
2 parents 1f59819 + b116c1f
commit 35f6007
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,5 +16,6 @@ Thumbs.db
 packages/*
 !packages/repositories.config
 
+\.vs/
 # VisualStudio For Mac
 .vs/**/*
diff --git a/README.md b/README.md
@@ -33,6 +33,9 @@ controller.DiscoveryProgress += Controller_DiscoveryProgress;
 controller.NodeOperationProgress += Controller_NodeOperationProgress;
 controller.NodeUpdated += Controller_NodeUpdated;
 
+// Open connection
+controller.Connect();
+
 // Issue some commands on a dimmer and a thermostat node
 
 var dimmer = controller.GetNode(4);

diff --git a/ZWaveLib/Values/CentralSceneValue.cs b/ZWaveLib/Values/CentralSceneValue.cs
@@ -1,4 +1,4 @@
-/*
+/*
   This file is part of ZWaveLib (https://github.com/genielabs/zwave-lib-dotnet)
 
   Copyright (2012-2018) G-Labs (https://github.com/genielabs)
@@ -58,10 +58,10 @@ public static CentralSceneValue Parse(byte[] message)
             };
 
         }
-
+        
         public override string ToString()
         {
-            return $"SceneId: {SceneId}, Level: {Level}, PressType: {PressType}";
+            return $"{{\"SceneId\":{SceneId}, \"Level\":{Level}, \"PressType\":\"{PressType}\"}}";
         }
     }
 }
diff --git a/ZWaveLib/ZWaveController.cs b/ZWaveLib/ZWaveController.cs
@@ -191,7 +191,7 @@ public void Connect()
         /// </summary>
         public void Disconnect()
         {
-            new Thread(() => { serialPort.Disconnect(); }).Start();
+            serialPort.Disconnect();
         }
 
         /// <summary>