Skip to content

Commit

Permalink
WIP - GRBL Panel related changes
Browse files Browse the repository at this point in the history
  • Loading branch information
md8n committed Nov 28, 2024
1 parent 9861b4e commit 4fb1899
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 254 deletions.
4 changes: 2 additions & 2 deletions www/js/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function SendJogcommand(cmd, feedrate) {
feedratevalue = parseInt(id('controlpanel_xy_feedrate').value);
if (feedratevalue < 1 || isNaN(feedratevalue) || (feedratevalue === null)) {
alertdlg(translate_text_item("Out of range"), translate_text_item("XY Feedrate value must be at least 1 mm/min!"));
id('controlpanel_xy_feedrate').value = getPrefValue("enable_control_panel.xy_feedrate");
id('controlpanel_xy_feedrate').value = getPrefValue("xy_feedrate");
return;
}
} else {
Expand All @@ -240,7 +240,7 @@ function SendJogcommand(cmd, feedrate) {
var letter = "Z";
if (grblaxis() > 3) letter = "Axis";
alertdlg(translate_text_item("Out of range"), translate_text_item(letter + " Feedrate value must be at least 1 mm/min!"));
id('controlpanel_z_feedrate').value = getPrefValue("enable_control_panel.z_feedrate");
id('controlpanel_z_feedrate').value = getPrefValue("z_feedrate");
return;
}
}
Expand Down
5 changes: 2 additions & 3 deletions www/js/grbl.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,8 @@ function tryAutoReport() {
1
)
}
function onAutoReportIntervalChange() {
tryAutoReport()
}

const onAutoReportIntervalChange = () => tryAutoReport();

function disableAutoReport() {
SendPrinterCommand('$Report/Interval=0', true, null, null, 99.0, 1)
Expand Down
Loading

0 comments on commit 4fb1899

Please sign in to comment.