From 28f4818ca311a830c8eaf5367f366d025e68a04b Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 31 Aug 2020 11:58:56 -0400 Subject: [PATCH] fix: Fixed "version" regex for 4-series --- CHANGELOG.md | 1 + ICD.Common.Utils/ProcessorUtils.SimplSharp.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 873868c..e21e375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Replaced Crestron Unzip with Yallie Unzip + - Fixed "version" regex for 4-series ## [12.1.0] - 2020-07-14 ### Added diff --git a/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs b/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs index 91abaf7..57ba86c 100644 --- a/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs +++ b/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs @@ -11,8 +11,10 @@ namespace ICD.Common.Utils { public static partial class ProcessorUtils { + // CP3 - CP3 Cntrl Eng [v1.601.3934.19631 (Oct 10 2019), #00A3BBE7] @E-00107f4a3474 + // CP4 - CP4 Cntrl Eng [v2.4474.00005 (Apr 9 2020), #8EB216B7] @E-00107feb538f private const string VER_REGEX = - @"(?'model'\S+) (?'type'\S+) (?'lang'\S+) \[v(?'version'\d+.\d+.\d+.\d+) \((?'date'\S+ \d+ \d+)\), #(?'serial'[A-F0-9]+)\] @E-(?'mac'[a-z0-9]+)"; + @"(?'model'\S+)\s+(?'type'\S+)\s+(?'lang'\S+)\s+\[v(?'version'\d+(\.\d+)+)\s+\((?'date'\S+\s+\d+ \d+)\),\s+#(?'serial'[A-F0-9]+)\]\s+@E-(?'mac'[a-z0-9]+)"; private const string UPTIME_COMMAND = "uptime"; private const string PROGUPTIME_COMMAND_ROOT = "proguptime:{0}";