Filter messages from command response (#2627)

winder · Oct 25, 2024 · 8910a84 · 8910a84
1 parent 3101add
commit 8910a84
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/...ore/src/com/willwinder/universalgcodesender/firmware/fluidnc/commands/FluidNCCommand.java b/...ore/src/com/willwinder/universalgcodesender/firmware/fluidnc/commands/FluidNCCommand.java
@@ -53,6 +53,11 @@ public void appendResponse(String response) {
             return;
         }
 
+        // Do not append messages
+        if (response.startsWith("[MSG:")) {
+            return;
+        }
+
         super.appendResponse(response);
 
         if (response.startsWith("ok")) {

diff --git a/...winder/universalgcodesender/firmware/fluidnc/commands/GetFirmwareSettingsCommandTest.java b/...winder/universalgcodesender/firmware/fluidnc/commands/GetFirmwareSettingsCommandTest.java
@@ -1,13 +1,12 @@
 package com.willwinder.universalgcodesender.firmware.fluidnc.commands;
 
 import com.willwinder.universalgcodesender.types.CommandException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import java.util.Map;
 
+import static org.junit.Assert.*;
+
 public class GetFirmwareSettingsCommandTest {
     @Test
     public void appendResponseWithYamlConfigShouldParseSettingsAsYaml() {
@@ -29,6 +28,27 @@ public void appendResponseWithYamlConfigShouldParseSettingsAsYaml() {
         assertEquals("800", settings.get("axis/y/steps_per_mm"));
     }
 
+    @Test
+    public void appendResponseShouldIgnoreMessages() {
+        GetFirmwareSettingsCommand command = new GetFirmwareSettingsCommand();
+        command.appendResponse("axis:");
+        command.appendResponse("  shared_stepper_disable_pin: gpio.13:low");
+        command.appendResponse("  shared_stepper_reset_pin: NO_PIN");
+        command.appendResponse("  x:");
+        command.appendResponse("[MSG:INFO: Huanyang PD014 Accel:6.000]");
+        command.appendResponse("    steps_per_mm: 800");
+        command.appendResponse("  y:");
+        command.appendResponse("    steps_per_mm: 800");
+        command.appendResponse("ok");
+
+        Map<String, String> settings = command.getSettings();
+        assertEquals(4, settings.keySet().size());
+        assertEquals("gpio.13:low", settings.get("axis/shared_stepper_disable_pin"));
+        assertEquals("NO_PIN", settings.get("axis/shared_stepper_reset_pin"));
+        assertEquals("800", settings.get("axis/x/steps_per_mm"));
+        assertEquals("800", settings.get("axis/y/steps_per_mm"));
+    }
+
     @Test
     public void getSettingsShouldThrowExceptionOnFaultyYaml() {
         GetFirmwareSettingsCommand command = new GetFirmwareSettingsCommand();