muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got a working solution for detecting failed probes

Browse Source
This commit is contained in:
David Carley
2021-10-11 00:28:22 -07:00
parent 0983a7f3e2
commit c9efccec15
6 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/app.js
View File

@@ -117,8 +117,10 @@ module.exports = new Vue({
},
state: {
messages: [],
probing_active: false,
wait_for_probing_complete: false,
show_probe_complete_modal: false
show_probe_complete_modal: false,
show_probe_failed_modal: false
},
video_size: cookie.get('video-size', 'small'),
crosshair: cookie.get('crosshair', 'false') != 'false',
@@ -322,9 +324,6 @@ module.exports = new Vue({
this.check_ip_address();
this.check_ssid();
//.check_disk_space();
}.bind(this))
},
@@ -386,7 +385,12 @@ module.exports = new Vue({
}
if ('log' in e.data) {
this.$broadcast('log', e.data.log);
if (this.state.probing_active && e.data.log.msg === "Switch not found") {
this.$broadcast('probing_failed');
} else {
this.$broadcast('log', JSON.stringify(e.data.log, null, 4));
}
delete e.data.log;
}

16
src/js/control-view.js
View File

@@ -240,7 +240,18 @@ module.exports = {
this.send('M70\nG91\nG0' + axis + value + '\nM72');
},
probing_failed: function() {
Vue.set(this.state, "probing_active", false);
Vue.set(this.state, "wait_for_probing_complete", false);
Vue.set(this.state, "show_probe_complete_modal", false);
Vue.set(this.state, "goto_xy_zero_after_probe", false);
Vue.set(this.state, "show_probe_failed_modal", true);
},
probing_complete: function() {
Vue.set(this.state, "probing_active", false);
if (this.config.settings['probing-prompts']) {
Vue.set(this.state, "show_probe_complete_modal", true);
} else {
@@ -303,6 +314,10 @@ module.exports = {
on_finish();
},
hide_probe_failed_modal: function() {
Vue.set(this.state, "show_probe_failed_modal", false);
},
prep_and_show_tool_diameter_modal() {
this.tool_diameter_for_prompt = (this.mach_units == 'METRIC')
? this.tool_diameter
@@ -351,6 +366,7 @@ module.exports = {
// Also, add zlift to compensate for the fact that we lift after probing Z
const plunge = Math.min(12.7, zoffset * 0.75) + zlift;
Vue.set(this.state, "probing_active", true);
Vue.set(this.state, "goto_xy_zero_after_probe", !zOnly);
if (zOnly) {