Fix $337 setting validation in $$

luc-github · luc-github · commit e7b9c7c2c91d · 2025-02-09T16:45:55.000+08:00
diff --git a/config/targets/CNC/grblHAL/index.js b/config/targets/CNC/grblHAL/index.js
@@ -299,6 +299,7 @@ const commandsQuery = (req, res, SendWS) => {
                 "$133=300.000\n" +
                 "$134=300.000\n" +
                 "$135=300.000\n" +
+                "$337=\n" +
                 "ok\n"
         )
         res.send("")
diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz
diff --git a/src/targets/CNC/grblHAL/MachineSettings.js b/src/targets/CNC/grblHAL/MachineSettings.js
@@ -143,7 +143,10 @@ const MachineSettings = () => {
             } else {
                 fieldData.hasmodified = true
             }
-            if (fieldData.value.trim().length == 0) validation.valid = false
+            //$337  is optionnal setting, so it can be empty
+            if (fieldData.value.trim().length == 0 && fieldData.cmd != "$337"){
+                 validation.valid = false
+            }
         }
         if (!validation.valid) {
             validation.message = T("S42")

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ const commandsQuery = (req, res, SendWS) => {`
`299`	`299`	`"$133=300.000\n" +`
`300`	`300`	`"$134=300.000\n" +`
`301`	`301`	`"$135=300.000\n" +`
	`302`	`+ "$337=\n" +`
`302`	`303`	`"ok\n"`
`303`	`304`	`)`
`304`	`305`	`res.send("")`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,10 @@ const MachineSettings = () => {`
`143`	`143`	`} else {`
`144`	`144`	`fieldData.hasmodified = true`
`145`	`145`	`}`
`146`		`- if (fieldData.value.trim().length == 0) validation.valid = false`
	`146`	`+ //$337 is optionnal setting, so it can be empty`
	`147`	`+ if (fieldData.value.trim().length == 0 && fieldData.cmd != "$337"){`
	`148`	`+ validation.valid = false`
	`149`	`+ }`
`147`	`150`	`}`
`148`	`151`	`if (!validation.valid) {`
`149`	`152`	`validation.message = T("S42")`