Implemented a probe continuity test before probing
This commit is contained in:
@@ -67,6 +67,7 @@ module.exports = {
|
||||
deleteGCode: false,
|
||||
tab: 'auto',
|
||||
jog_incr: 1.0,
|
||||
probe_test: false,
|
||||
tool_msg: false,
|
||||
tool_diameter: 6.35,
|
||||
toolpath_msg: {x: false, y: false, z: false, a: false, b: false, c: false},
|
||||
@@ -259,8 +260,27 @@ module.exports = {
|
||||
|
||||
},
|
||||
|
||||
set_tool_diameter : function (new_diameter) {
|
||||
start_probe_test: function(on_finish) {
|
||||
this.probe_test = true;
|
||||
Vue.set(this.state, "probe_connected", false);
|
||||
Vue.set(this.state, "on_probe_finish", on_finish);
|
||||
},
|
||||
|
||||
finish_probe_test: function() {
|
||||
this.probe_test = false;
|
||||
Vue.set(this.state, "probe_connected", false);
|
||||
|
||||
const on_finish = this.state.on_probe_finish;
|
||||
Vue.set(this.state, "on_probe_finish", undefined);
|
||||
|
||||
on_finish();
|
||||
},
|
||||
|
||||
show_tool_diameter_prompt: function() {
|
||||
this.tool_msg = true;
|
||||
},
|
||||
|
||||
set_tool_diameter : function (new_diameter) {
|
||||
if(isNaN(new_diameter))
|
||||
return;
|
||||
|
||||
@@ -269,7 +289,6 @@ module.exports = {
|
||||
this.tool_diameter = parseFloat(new_diameter);
|
||||
|
||||
this.probe_xyz();
|
||||
|
||||
},
|
||||
|
||||
set_jog_incr: function(newValue) {
|
||||
@@ -334,7 +353,6 @@ module.exports = {
|
||||
var zoffset = this.config.probe["probe-zdim"];
|
||||
var fastSeek = this.config.probe["probe-fast-seek"];
|
||||
var slowSeek = this.config.probe["probe-slow-seek"];
|
||||
debugger;
|
||||
|
||||
if(this.mach_units == "METRIC") {
|
||||
|
||||
@@ -442,8 +460,6 @@ module.exports = {
|
||||
var slowSeek = this.config.probe["probe-slow-seek"];
|
||||
var zoffset = this.config.probe["probe-zdim"];
|
||||
|
||||
debugger;
|
||||
|
||||
if(this.mach_units == "METRIC") {
|
||||
fastSeek = "F" + fastSeek;
|
||||
slowSeek = "F" + slowSeek;
|
||||
@@ -488,9 +504,6 @@ module.exports = {
|
||||
var zcmd = "Z" + z_jog * this.jog_incr;
|
||||
var acmd = "A" + a_jog * this.jog_incr;
|
||||
|
||||
console.log("Jog command: " + this.jog_incr);
|
||||
//debugger;
|
||||
|
||||
this.send('G91\nG0' + xcmd + ycmd + zcmd + acmd + '\n');
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user