Add missing properties to ValueMetadata (#57)

* Add missing properties to ValueMetadata

* Add ValueFormat parameter to ZWJSS_SetRawConfigParameterValue method

* Align SetRawConfigParameterValue with Options object Variants

---------

Co-authored-by: Marcus Davies <[email protected]>

Author: spudwebb

Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Enums.cs

@@ -3,6 +3,14 @@
     public class Enums
     {
 
+        public enum ConfigValueFormat
+        {
+            SignedInteger = 0x00,
+            UnsignedInteger = 0x01,
+            Enumerated = 0x02,
+            BitField = 0x03
+        }
+
         public enum SetValueStatus
         {
 
@@ -13,7 +21,7 @@ public enum SetValueStatus
             NotImplemented = 0x04,
             InvalidValue = 0x05,
             SuccessUnsupervised = 0xfe,
-            Success = 0xff,
+            Success = 0xff
         }
 
 

Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Structures.cs

@@ -3,6 +3,7 @@
 using System.Dynamic;
 using System.IO;
 using Newtonsoft.Json;
+using static ZWaveJS.NET.Enums;
 
 namespace ZWaveJS.NET
 {
@@ -240,6 +241,14 @@ internal ValueMetadata() { }
         public Dictionary<string, string> states { get; internal set; }
         [Newtonsoft.Json.JsonProperty]
         public Dictionary<string, object> ccSpecific { get; internal set; }
+        [Newtonsoft.Json.JsonProperty]
+        public int? valueSize { get; internal set; }
+        [Newtonsoft.Json.JsonProperty]
+        public ConfigValueFormat? format { get; internal set; }
+        [Newtonsoft.Json.JsonProperty]
+        public bool? allowManualEntry { get; internal set; }
+        [Newtonsoft.Json.JsonProperty]
+        public bool? isFromConfig { get; internal set; }
     }
 
     public class DeviceClass

Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/ZWaveNode.cs

@@ -398,8 +398,34 @@ public Task<CMDResult> PollValue(ValueID ValueID)
             return Result.Task;
         }
 
-        // FIX ME
-        public Task<CMDResult> ZWJSS_SetRawConfigParameterValue(int Parameter, int Value, int ValueSize)
+        // CHECKED - Variant 1: Normal parameter, defined in a config file
+        public Task<CMDResult> ZWJSS_SetRawConfigParameterValue(int Parameter, int Value)
+        {
+            Guid ID = Guid.NewGuid();
+
+            TaskCompletionSource<CMDResult> Result = new TaskCompletionSource<CMDResult>();
+            Driver.Instance.Callbacks.Add(ID, (JO) =>
+            {
+                CMDResult Res = new CMDResult(JO);
+                Result.SetResult(Res);
+            });
+
+            Dictionary<string, object> Request = new Dictionary<string, object>();
+            Request.Add("messageId", ID);
+            Request.Add("command", Enums.Commands.SetRawConfigParameterValue);
+            Request.Add("nodeId", this.id);
+            Request.Add("parameter", Parameter);
+            Request.Add("value", Value);
+
+
+            string RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
+            Driver.Instance.ClientWebSocket.SendInstant(RequestPL);
+
+            return Result.Task;
+        }
+
+        // CHECKED - Variant 2: Normal parameter, not defined in a config file
+        public Task<CMDResult> ZWJSS_SetRawConfigParameterValue(int Parameter, int Value, int ValueSize, Enums.ConfigValueFormat ValueFormat)
         {
             Guid ID = Guid.NewGuid();
 
@@ -417,13 +443,42 @@ public Task<CMDResult> ZWJSS_SetRawConfigParameterValue(int Parameter, int Value
             Request.Add("parameter", Parameter);
             Request.Add("value", Value);
             Request.Add("valueSize", ValueSize);
+            Request.Add("valueFormat", ValueFormat);
+
 
             string RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
             Driver.Instance.ClientWebSocket.SendInstant(RequestPL);
 
             return Result.Task;
         }
 
+        // CHECKED - Variant 3: Partial parameter, must be defined in a config file
+        public Task<CMDResult> ZWJSS_SetRawConfigParameterValue(int Parameter, int Bitmask, int Value)
+        {
+            Guid ID = Guid.NewGuid();
+
+            TaskCompletionSource<CMDResult> Result = new TaskCompletionSource<CMDResult>();
+            Driver.Instance.Callbacks.Add(ID, (JO) =>
+            {
+                CMDResult Res = new CMDResult(JO);
+                Result.SetResult(Res);
+            });
+
+            Dictionary<string, object> Request = new Dictionary<string, object>();
+            Request.Add("messageId", ID);
+            Request.Add("command", Enums.Commands.SetRawConfigParameterValue);
+            Request.Add("nodeId", this.id);
+            Request.Add("parameter", Parameter);
+            Request.Add("bitMask", Bitmask);
+            Request.Add("value", Value);
+
+
+            string RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);
+            Driver.Instance.ClientWebSocket.SendInstant(RequestPL);
+
+            return Result.Task;
+        }
+        
         // CHECKED
         public Task<CMDResult> RefreshValues()
         {