Added a setting to allow disabling probing prompts
This commit is contained in:
@@ -267,6 +267,11 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
start_probe_test: function(on_finish) {
|
start_probe_test: function(on_finish) {
|
||||||
|
if (!this.config.settings['probing-prompts']) {
|
||||||
|
on_finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.show_probe_test_modal = true;
|
this.show_probe_test_modal = true;
|
||||||
Vue.set(this.state, "saw_probe_connected", false);
|
Vue.set(this.state, "saw_probe_connected", false);
|
||||||
Vue.set(this.state, "on_probe_finish", on_finish);
|
Vue.set(this.state, "on_probe_finish", on_finish);
|
||||||
|
|||||||
@@ -35,6 +35,12 @@ script#settings-view-template(type="text/x-template")
|
|||||||
| units used in motor configuration. GCode #[tt program-start],
|
| units used in motor configuration. GCode #[tt program-start],
|
||||||
| set below, may also change the default machine units.
|
| set below, may also change the default machine units.
|
||||||
|
|
||||||
|
fieldset
|
||||||
|
h2 Probing safety prompts
|
||||||
|
templated-input(name="probing-prompts",
|
||||||
|
:model.sync="config.settings['probing-prompts']",
|
||||||
|
:template="template.settings['probing-prompts']")
|
||||||
|
|
||||||
fieldset
|
fieldset
|
||||||
h2 Probe Dimensions
|
h2 Probe Dimensions
|
||||||
templated-input(v-for="templ in template.probe", :name="$key",
|
templated-input(v-for="templ in template.probe", :name="$key",
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ class Config(object):
|
|||||||
if version < (1, 0, 7):
|
if version < (1, 0, 7):
|
||||||
config['settings']['max-deviation'] = 0.001
|
config['settings']['max-deviation'] = 0.001
|
||||||
config['settings']['junction-accel'] = 200000
|
config['settings']['junction-accel'] = 200000
|
||||||
|
config['settings']['probing-prompts'] = True
|
||||||
for motor in config['motors']:
|
for motor in config['motors']:
|
||||||
motor['stall-microstep'] = 8
|
motor['stall-microstep'] = 8
|
||||||
motor['stall-current'] = 1
|
motor['stall-current'] = 1
|
||||||
|
|||||||
@@ -22,6 +22,11 @@
|
|||||||
"max": 100000000,
|
"max": 100000000,
|
||||||
"unit": "mm/min²",
|
"unit": "mm/min²",
|
||||||
"default": 200000
|
"default": 200000
|
||||||
|
},
|
||||||
|
"probing-prompts": {
|
||||||
|
"help": "Enable or disable safety prompts during and after probing",
|
||||||
|
"type": "bool",
|
||||||
|
"default": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"motors": {
|
"motors": {
|
||||||
|
|||||||
@@ -29,7 +29,8 @@
|
|||||||
"settings": {
|
"settings": {
|
||||||
"junction-accel": 200000,
|
"junction-accel": 200000,
|
||||||
"max-deviation": 0.001,
|
"max-deviation": 0.001,
|
||||||
"units": "METRIC"
|
"units": "METRIC",
|
||||||
|
"probing-prompts": true
|
||||||
},
|
},
|
||||||
"motors": [
|
"motors": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,7 +29,8 @@
|
|||||||
"settings": {
|
"settings": {
|
||||||
"junction-accel": 200000,
|
"junction-accel": 200000,
|
||||||
"max-deviation": 0.001,
|
"max-deviation": 0.001,
|
||||||
"units": "METRIC"
|
"units": "METRIC",
|
||||||
|
"probing-prompts": true
|
||||||
},
|
},
|
||||||
"motors": [
|
"motors": [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user