From 0021e4e61739470c65606f1c18d12f7cb04a4a0a Mon Sep 17 00:00:00 2001
From: Joacim Breiler <joacim@breiler.com>
Date: Thu, 13 Jul 2023 18:20:54 +0200
Subject: [PATCH] Now parses genmitsu version strings

---
 pom.xml                                                     | 2 +-
 .../universalgcodesender/firmware/grbl/GrblVersion.java     | 2 +-
 .../universalgcodesender/firmware/grbl/GrblVersionTest.java | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6a709437d..9f0e5b029d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
     <miglayout.version>3.7.4</miglayout.version>
     <guava.version>28.1-jre</guava.version>
     <jssc.version>2.8.0</jssc.version>
-    <jserialcomm.version>2.9.3</jserialcomm.version>
+    <jserialcomm.version>2.9.2</jserialcomm.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-io.version>2.11.0</commons-io.version>
     <commons-csv.version>1.9.0</commons-csv.version>
diff --git a/ugs-core/src/com/willwinder/universalgcodesender/firmware/grbl/GrblVersion.java b/ugs-core/src/com/willwinder/universalgcodesender/firmware/grbl/GrblVersion.java
index 28ad85110e..907b221b9b 100644
--- a/ugs-core/src/com/willwinder/universalgcodesender/firmware/grbl/GrblVersion.java
+++ b/ugs-core/src/com/willwinder/universalgcodesender/firmware/grbl/GrblVersion.java
@@ -10,7 +10,7 @@
  */
 public class GrblVersion {
     public static final GrblVersion NO_VERSION = new GrblVersion("");
-    public static final String VERSION_REGEX = "^\\[VER:[v]?(?<version>(?<major>\\d+)\\.(?<minor>\\d+)(?<char>[a-zA-Z])?).*?]$";
+    public static final String VERSION_REGEX = "^\\[VER:(GD32 )?[vV]?(?<version>(?<major>\\d+)\\.(?<minor>\\d+)(?<char>[a-zA-Z])?).*?]$";
     private final double versionNumber;           // The 0.8 in '[VER:0.8c.20220620:Machine1]'
     private final Character versionLetter;  // The c in '[VER:0.8c.20220620:Machine1]'
 
diff --git a/ugs-core/test/com/willwinder/universalgcodesender/firmware/grbl/GrblVersionTest.java b/ugs-core/test/com/willwinder/universalgcodesender/firmware/grbl/GrblVersionTest.java
index 050109a9a7..b406040969 100644
--- a/ugs-core/test/com/willwinder/universalgcodesender/firmware/grbl/GrblVersionTest.java
+++ b/ugs-core/test/com/willwinder/universalgcodesender/firmware/grbl/GrblVersionTest.java
@@ -82,4 +82,10 @@ public void parseOldVersion() {
         assertEquals(0.7d, version.getVersionNumber(), 0.001);
         assertEquals('-', version.getVersionLetter().charValue());
     }
+
+    @Test
+    public void parseGenmitsu32VersionString() {
+        GrblVersion version = new GrblVersion("[VER:GD32 V2.1.20220827:]");
+        assertEquals(2.1d, version.getVersionNumber(), 0.001);
+    }
 }