diff --git a/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Driver.cs b/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Driver.cs index 3769adb..94cddfa 100644 --- a/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Driver.cs +++ b/Visual Studio Projects/ZWaveJS.NET/ZWaveJS.NET/Driver.cs @@ -23,7 +23,7 @@ public class Driver private Dictionary> NodeEventMap; private Dictionary> ControllerEventMap; private Dictionary> DriverEventMap; - private Semver.SemVersion SchemaVersionID = new Semver.SemVersion(1, 40, 0); + private int _schemaVersion = 42; private string SerialPort; private bool RequestedExit = false; private JsonSerializer _jsonSerializer; @@ -571,7 +571,7 @@ public Driver(Uri Server, int SchemaVersion = 0, int ServerErrorThrottleTime = 1 if (SchemaVersion > 0) { - SchemaVersionID = new Semver.SemVersion(1, SchemaVersion, 0); + _schemaVersion = SchemaVersion; } Callbacks = new Dictionary>(); @@ -710,7 +710,7 @@ private void DestroySocket() { if (ClientWebSocket.IsRunning) { - ClientWebSocket.Stop(WebSocketCloseStatus.NormalClosure, "Destroy"); + _ = ClientWebSocket.Stop(WebSocketCloseStatus.NormalClosure, "Destroy"); } if (Host) @@ -768,7 +768,7 @@ private void SettleCallbacksError() Callbacks[ID].Invoke(JO); Callbacks.Remove(ID); } - catch (Exception Error) + catch (Exception) { continue; } @@ -966,7 +966,7 @@ private void WebsocketClient_MessageReceived(object sender, ResponseMessage Mess Callbacks[MessageID].Invoke(JO); Callbacks.Remove(MessageID); } - catch (Exception Error) { } + catch (Exception) { } } @@ -978,26 +978,13 @@ private void WebsocketClient_MessageReceived(object sender, ResponseMessage Mess _ZWaveJSDriverVersion = JO.Value("driverVersion"); _ZWaveJSServerVersion = JO.Value("serverVersion"); - if (Semver.SemVersion.Parse(_ZWaveJSServerVersion, Semver.SemVersionStyles.Strict).Major != SchemaVersionID.Major) - { - StartUpError?.Invoke("The Server Schema version is not compatible with the library version"); - return; - } - - if (Semver.SemVersion.Parse(_ZWaveJSServerVersion, Semver.SemVersionStyles.Strict).ComparePrecedenceTo(SchemaVersionID) < 0) - { - StartUpError?.Invoke("The Server Schema version is lower than what was requested by the library"); - return; - - } - Guid CBID = Guid.NewGuid(); Callbacks.Add(CBID, SetAPIVersionCB); Dictionary Request = new Dictionary(); Request.Add("messageId", CBID.ToString()); Request.Add("command", Enums.Commands.SetAPIVersion); - Request.Add("schemaVersion", SchemaVersionID.Minor); + Request.Add("schemaVersion", _schemaVersion); string RequestPL = Newtonsoft.Json.JsonConvert.SerializeObject(Request);