Handle new variant of Genmitsu version string (#2297)

winder · Aug 23, 2023 · 4d64d98 · 4d64d98
1 parent 4466f69
commit 4d64d98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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:(GD32 )?[vV]?(?<version>(?<major>\\d+)\\.(?<minor>\\d+)(?<char>[a-zA-Z])?).*?]$";
+    public static final String VERSION_REGEX = "^\\[VER:([a-zA-Z0-9\\s]*)?[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
@@ -88,4 +88,10 @@ public void parseGenmitsu32VersionString() {
         GrblVersion version = new GrblVersion("[VER:GD32 V2.1.20220827:]");
         assertEquals(2.1d, version.getVersionNumber(), 0.001);
     }
+
+    @Test
+    public void parseGenmitsuArm32VersionString() {
+        GrblVersion version = new GrblVersion("[VER:ARM32 V2.1.20220827:]");
+        assertEquals(2.1d, version.getVersionNumber(), 0.001);
+    }
 }