update loadingQGL to generic function
report klippy state in browser console log Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
parent
479f2245e3
commit
d0d36470ba
@ -61,7 +61,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState, mapGetters, mapMutations } from 'vuex'
|
import { mapState, mapGetters } from 'vuex'
|
||||||
import Vue from "vue";
|
import Vue from "vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@ -74,19 +74,16 @@
|
|||||||
loadingHomeX: false,
|
loadingHomeX: false,
|
||||||
loadingHomeY: false,
|
loadingHomeY: false,
|
||||||
loadingHomeZ: false,
|
loadingHomeZ: false,
|
||||||
|
loadingQGL: false,
|
||||||
loadingZTilt: false,
|
loadingZTilt: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
loadingQGL: state => state.socket.loadingQGL,
|
|
||||||
homedAxes: state => state.printer.toolhead.homed_axes,
|
homedAxes: state => state.printer.toolhead.homed_axes,
|
||||||
config: state => state.config,
|
config: state => state.config,
|
||||||
loadings: state => state.loadings,
|
loadings: state => state.loadings,
|
||||||
}),
|
}),
|
||||||
...mapMutations([
|
|
||||||
'setLoadingQGL',
|
|
||||||
]),
|
|
||||||
...mapGetters([
|
...mapGetters([
|
||||||
'getMacros',
|
'getMacros',
|
||||||
'is_printing'
|
'is_printing'
|
||||||
@ -115,7 +112,7 @@
|
|||||||
},
|
},
|
||||||
doQGL() {
|
doQGL() {
|
||||||
this.$store.commit('addGcodeResponse', "QUAD_GANTRY_LEVEL");
|
this.$store.commit('addGcodeResponse', "QUAD_GANTRY_LEVEL");
|
||||||
this.$store.commit('setLoadingQGL', true);
|
this.$store.commit('setLoading', { name: 'controlQGL' });
|
||||||
this.$socket.sendObj('post_printer_gcode_script', { script: "QUAD_GANTRY_LEVEL" }, "responseQGL");
|
this.$socket.sendObj('post_printer_gcode_script', { script: "QUAD_GANTRY_LEVEL" }, "responseQGL");
|
||||||
},
|
},
|
||||||
doZtilt() {
|
doZtilt() {
|
||||||
@ -141,6 +138,7 @@
|
|||||||
this.loadingHomeX = loadings.includes('controlHomeX');
|
this.loadingHomeX = loadings.includes('controlHomeX');
|
||||||
this.loadingHomeY = loadings.includes('controlHomeY');
|
this.loadingHomeY = loadings.includes('controlHomeY');
|
||||||
this.loadingHomeZ = loadings.includes('controlHomeZ');
|
this.loadingHomeZ = loadings.includes('controlHomeZ');
|
||||||
|
this.loadingQGL = loadings.includes('controlQGL');
|
||||||
this.loadingZTilt = loadings.includes('controlZTilt');
|
this.loadingZTilt = loadings.includes('controlZTilt');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,6 +32,8 @@ export default {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'notify_klippy_state_changed':
|
case 'notify_klippy_state_changed':
|
||||||
|
window.console.log('notify_klippy_state_changed');
|
||||||
|
window.console.log(data.params[0]);
|
||||||
commit('setKlippyStatus', data.params[0]);
|
commit('setKlippyStatus', data.params[0]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -105,8 +107,6 @@ export default {
|
|||||||
version: data.version
|
version: data.version
|
||||||
});
|
});
|
||||||
|
|
||||||
commit('setKlippyStatus', 'ready');
|
|
||||||
|
|
||||||
Vue.prototype.$socket.sendObj('get_printer_objects_list', {}, 'getObjectInfo');
|
Vue.prototype.$socket.sendObj('get_printer_objects_list', {}, 'getObjectInfo');
|
||||||
Vue.prototype.$socket.sendObj('get_printer_objects_status', { heaters: [] }, 'getHeatersInfo');
|
Vue.prototype.$socket.sendObj('get_printer_objects_status', { heaters: [] }, 'getHeatersInfo');
|
||||||
Vue.prototype.$socket.sendObj('get_printer_objects_status', { configfile: ['config'] }, 'getPrinterConfig');
|
Vue.prototype.$socket.sendObj('get_printer_objects_status', { configfile: ['config'] }, 'getPrinterConfig');
|
||||||
@ -122,7 +122,7 @@ export default {
|
|||||||
});
|
});
|
||||||
Vue.prototype.$socket.sendObj('get_directory', { path: 'gcodes' }, 'getDirectory');
|
Vue.prototype.$socket.sendObj('get_directory', { path: 'gcodes' }, 'getDirectory');
|
||||||
Vue.prototype.$socket.sendObj('get_printer_gcode_help', {}, 'getHelpList');
|
Vue.prototype.$socket.sendObj('get_printer_gcode_help', {}, 'getHelpList');
|
||||||
} else if (data !== undefined && !data.is_ready) commit('setKlippyStatus', 'disconnect');
|
}
|
||||||
|
|
||||||
commit('setPrinterStatusDetails', data);
|
commit('setPrinterStatusDetails', data);
|
||||||
|
|
||||||
@ -276,7 +276,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
responseQGL({commit}) {
|
responseQGL({commit}) {
|
||||||
commit('setLoadingQGL', false);
|
commit('removeLoading', { name: 'controlQGL' });
|
||||||
},
|
},
|
||||||
|
|
||||||
responseZTilt({commit}) {
|
responseZTilt({commit}) {
|
||||||
|
@ -20,7 +20,6 @@ export default new Vuex.Store({
|
|||||||
loadingEmergencyStop: false,
|
loadingEmergencyStop: false,
|
||||||
loadingPrintPause: false,
|
loadingPrintPause: false,
|
||||||
loadingPrintResume: false,
|
loadingPrintResume: false,
|
||||||
loadingQGL: false,
|
|
||||||
loadingRestart: false,
|
loadingRestart: false,
|
||||||
loadingRestartFirmware: false,
|
loadingRestartFirmware: false,
|
||||||
loadingRebootHost: false,
|
loadingRebootHost: false,
|
||||||
|
@ -139,7 +139,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// update target temp in temperature chart
|
// update target temp in temperature chart
|
||||||
if (index_target >= 0) {
|
if (index_target >= 0 && payload.value.target !== undefined) {
|
||||||
for (let i = 0; i < ticks; i++) state.temperaturChart.datasets[index_target].data.push(payload.value.target.toFixed(1));
|
for (let i = 0; i < ticks; i++) state.temperaturChart.datasets[index_target].data.push(payload.value.target.toFixed(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -443,17 +443,22 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
setKlippyStatus(state, value) {
|
setKlippyStatus(state, value) {
|
||||||
state.socket.klippy_state = value;
|
if (value !== undefined) {
|
||||||
if (value === "disconnect") {
|
state.socket.klippy_state = value;
|
||||||
state.socket.is_ready = false;
|
|
||||||
state.socket.klippy_message = "";
|
if (value === "disconnect") {
|
||||||
} else if (value === "ready") Vue.prototype.$socket.sendObj('get_printer_info', {}, 'getKlipperInfo');
|
state.socket.is_ready = false;
|
||||||
|
state.socket.klippy_message = "";
|
||||||
|
} else if (value === "ready") Vue.prototype.$socket.sendObj('get_printer_info', {}, 'getKlipperInfo');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
setPrinterStatusDetails(state, data) {
|
setPrinterStatusDetails(state, data) {
|
||||||
state.socket.error_detected = data.error_detected;
|
if (data !== undefined && data.is_ready !== undefined) {
|
||||||
state.socket.is_ready = data.is_ready;
|
state.socket.error_detected = data.error_detected;
|
||||||
state.socket.klippy_message = data.message;
|
state.socket.is_ready = data.is_ready;
|
||||||
|
state.socket.klippy_message = data.message;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
setLoadingGcodeUpload(state, value) {
|
setLoadingGcodeUpload(state, value) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user