Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/js/cam.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ jscut.cam = jscut.cam || {};
else
gcode += "G21 ; Set units to mm\r\n";
gcode += "G90 ; Absolute positioning\r\n";
gcode += "G1 Z" + (topZ + material.clearance * fromMatConv * toGcodeConv) +
" F" + tool.rapidRate * fromToolConv * toGcodeConv + " ; Move to clearance level\r\n"
gcode += "G0 Z" + (topZ + material.clearance * fromMatConv * toGcodeConv) +
" ; Move to clearance level\r\n"
return gcode;
}

Expand Down
4 changes: 2 additions & 2 deletions js/Cam.js
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,8 @@ jscut.priv.cam = jscut.priv.cam || {};
currentZ = Math.max(finishedZ, tabZ);
gcode +=
'; Rapid to initial position\r\n' +
'G1' + convertPoint(origPath[0], false) + rapidFeedGcode + '\r\n' +
'G1 Z' + currentZ.toFixed(decimal) + '\r\n';
'G0' + convertPoint(origPath[0], false) + '\r\n' +
'G0 Z' + currentZ.toFixed(decimal) + '\r\n';

var selectedPaths;
if (nextZ >= tabZ || useZ)
Expand Down
2 changes: 1 addition & 1 deletion js/GcodeConversionViewModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function GcodeConversionViewModel(options, miscViewModel, materialViewModel, too
else
gcode += "G21 ; Set units to mm\r\n";
gcode += "G90 ; Absolute positioning\r\n";
gcode += "G1 Z" + safeZ + " F" + rapidRate + " ; Move to clearance level\r\n"
gcode += "G0 Z" + safeZ + " ; Move to clearance level\r\n"

for (var opIndex = 0; opIndex < ops.length; ++opIndex) {
var op = ops[opIndex];
Expand Down