Skip to content

Commit

Permalink
To test probe
Browse files Browse the repository at this point in the history
  • Loading branch information
kglovern committed Oct 27, 2022
1 parent 0bd463f commit 90295af
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/app/widgets/Probe/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,6 @@ class ProbeWidget extends PureComponent {
generateMultiAxisCommands(axes, xyThickness, zThickness, params) {
let code = [];
let { wcs, isSafe, probeCommand, retractDistance, normalFeedrate, quickFeedrate, units } = params;
//const unitModal = `G${modal}`;
const workspace = this.mapWCSToPValue(wcs);
const XYRetract = -retractDistance;
let XYProbeDistance = (units === METRIC_UNITS) ? this.PROBE_DISTANCE_METRIC.X : this.PROBE_DISTANCE_IMPERIAL.X;
Expand All @@ -515,7 +514,6 @@ class ProbeWidget extends PureComponent {
XYProbeDistance = (isSafe) ? -XYProbeDistance : XYProbeDistance;
const gcode = this.gcode;


// Calculate tool offset using radius and block thickness to origin
const toolDiameter = this.state.toolDiameter;
const toolRadius = (toolDiameter / 2);
Expand Down Expand Up @@ -590,12 +588,12 @@ class ProbeWidget extends PureComponent {
gcode('G4', {
P: this.DWELL_TIME
}),
gcode('G91'),
gcode('G10', {
L: 20,
P: workspace,
X: toolCompensatedThickness
}),
gcode('G91'),
// Move for Y Touch - toward front + to right
gcode('G0', {
X: -(2 * retractDistance)
Expand All @@ -621,12 +619,12 @@ class ProbeWidget extends PureComponent {
gcode('G4', {
P: this.DWELL_TIME
}),
gcode('G91'),
gcode('G10', {
L: 20,
P: workspace,
Y: toolCompensatedThickness
}),
gcode('G91'),
gcode('G0', {
Y: XYRetract
}),
Expand All @@ -644,7 +642,7 @@ class ProbeWidget extends PureComponent {

// Make sure we're in the correct mode at end of probe
code = code.concat([
this.gcode('G90 [UNITS]')
this.gcode('G90')
]);
return code;
}
Expand Down

0 comments on commit 90295af

Please sign in to comment.