Skip to content

Add missing properties to ValueMetadata #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Add missing properties to ValueMetadata #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb6e697
Add missing properties to ValueMetadata
spudwebb Dec 15, 2023
e16e7c1
Add ValueFormat parameter to ZWJSS_SetRawConfigParameterValue method
spudwebb Dec 18, 2023
f642436
Align SetRawConfigParameterValue with Options object Variants
marcus-j-davies Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
public class Enums
{

public enum ConfigValueFormat
{
SignedInteger = 0x00,
UnsignedInteger = 0x01,
Enumerated = 0x02,
BitField = 0x03
}

public enum SetValueStatus
{

Expand All @@ -13,7 +21,7 @@ public enum SetValueStatus
NotImplemented = 0x04,
InvalidValue = 0x05,
SuccessUnsupervised = 0xfe,
Success = 0xff,
Success = 0xff
}


Expand Down
9 changes: 9 additions & 0 deletions Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Structures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Dynamic;
using System.IO;
using Newtonsoft.Json;
using static ZWaveJS.NET.Enums;

namespace ZWaveJS.NET
{
Expand Down Expand Up @@ -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
Expand Down
59 changes: 57 additions & 2 deletions Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/ZWaveNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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()
{
Expand Down