more feedrate checks

BarbourSmith · Dec 20, 2024 · a4b35e2 · a4b35e2
1 parent 77e7ccd
commit a4b35e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/www/js/controls.js b/www/js/controls.js
@@ -230,7 +230,7 @@ function SendJogcommand(cmd, feedrate) {
 	if (errorList.length) {
 		// error text was "(something) Feedrate value must be at least 1 mm/min!"
 		alertdlg(translate_text_item("Out of range"), errorList.join("\n"));
-		id(controlName).value = getPrefValue(prefName);
+		id(controlName).value = feedrate.startsWith("Z") ? preferenceslist[0].z_feedrate : preferenceslist[0].xy_feedrate ;
 		return;
 	}
 

diff --git a/www/js/utilValidation.js b/www/js/utilValidation.js
@@ -50,8 +50,8 @@ const valueIsInt = (value, valueDef) => {
 const valueIsFloat = (value, valueDef) => {
   const errorList = [];
   const vFloat = Number.parseFloat(value);
-  if (Number.isNaN(vInt)) {
-    errorList.push(`'${valueDef.label}' ${translate_text_item("must be an float")}`);
+  if (Number.isNaN(vFloat)) {
+    errorList.push(`'${valueDef.label}' ${translate_text_item("must be a float")}`);
   } else {
     errorList.push(valueMinTest(vFloat, valueDef));
     errorList.push(valueMaxTest(vFloat, valueDef));