Change go to zero

Go to zero button on movement panel will now call systemdir/workzero.g

Dashboard will includes analog sensors and will show the last reported value.

Author: Sindarius

package.json

@@ -1,6 +1,6 @@
 {
   "name": "duetwebcontrol",
-  "version": "3.3.0-CNC06",
+  "version": "3.3.0-CNC07",
   "pkgVersion": "3.3.0",
   "repository": "github:chrishamm/DuetWebControl",
   "homepage": "https://forum.duet3d.com/category/27/duet-web-control",

src/components/panels/CNCContainerPanel.vue

@@ -92,6 +92,14 @@
 											<span :class="probeSpanClasses(probe, index)" :key="index" class="pa-1 probe-span" v-for="(probe, index) in probes">{{ formatProbeValue(probe.value) }}</span>
 										</div>
 									</v-col>
+
+									<v-col class="d-flex flex-column align-center" v-for="(analog, index) in analogs" :key="index" >
+										<strong>{{analog.name}}</strong>
+										<div class="d-flex-inline">
+											<span class="pa-1 probe-span" >{{ analog.lastReading }}</span>
+										</div>
+									</v-col>
+
 								</v-row>
 							</v-col>
 						</v-row>
@@ -107,7 +115,7 @@
 
 <script>
 import {mapState} from 'vuex';
-import {ProbeType, isPrinting} from '../../store/machine/modelEnums.js';
+import {ProbeType, isPrinting, AnalogSensorType} from '../../store/machine/modelEnums.js';
 export default {
 	computed: {
 		...mapState('machine/model', {
@@ -141,6 +149,12 @@ export default {
 		sensorsPresent() {
 			return (this.boards.length && this.boards[0].vIn.current > 0) || (this.boards.length && this.boards[0].v12.current > 0) || (this.boards.length && this.boards[0].mcuTemp.current > -273) || this.fanRPM.length !== 0 || this.probesPresent;
 		},
+		analogsPresent() {
+			return this.sensors.analog.some((analog) => analog && analog.type !== AnalogSensorType.unknown && analog.type !== null);
+		},
+		analogs() {
+			return this.sensors.analog.filter((analog) => analog !== null && analog.name !== null && analog.name !== '' && analog.type !== AnalogSensorType.unknown && analog.type !== null);
+		},
 	},
 	methods: {
 		displayAxisPosition(axis) {

src/components/panels/CNCMovementPanel.vue

@@ -36,15 +36,15 @@
 
 						<v-card>
 							<v-list>
-								<template v-show="move.compensation">
+								<div v-show="move.compensation">
 									<v-list-item>
 										<v-spacer></v-spacer>
 										{{ $t('panel.movement.compensationInUse', [move.compensation.type]) }}
 										<v-spacer></v-spacer>
 									</v-list-item>
 
 									<v-divider></v-divider>
-								</template>
+								</div>
 
 								<v-list-item @click="sendCode('G32')">
 									<v-icon class="mr-1">mdi-format-vertical-align-center</v-icon>
@@ -129,7 +129,7 @@
 
 			<v-row dense>
 				<v-col>
-					<v-btn color="warning" @click="gotoWorkspaceZero" tile block class="move-btn">GOTO Work XYZ Zero</v-btn>
+					<v-btn color="warning" @click="gotoWorkspaceZero" tile block class="move-btn">{{$t('panel.movement.workzero')}}</v-btn>
 				</v-col>
 			</v-row>
 		</v-card-text>
@@ -156,13 +156,15 @@
 
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex';
 import { KinematicsName } from '../../store/machine/modelEnums.js';
+import { combine  } from '../../utils/path'
 
 export default {
 	computed: {
 		...mapGetters(['isConnected', 'uiFrozen']),
 		...mapState('machine/model', {
 			move: state => state.move,
 			workspaceNumber: state => state.move.workplaceNumber,
+			systemDir : state => state.directories.system
 		}),
 		...mapState('machine/settings', ['moveFeedrate']),
 		...mapGetters('machine/settings', ['moveSteps', 'numMoveSteps']),
@@ -226,10 +228,8 @@ export default {
 			await this.sendCode(`G10 L20 P${this.currentWorkspace}`);
 		},
 		async gotoWorkspaceZero() {
-			let code = `G0`;
-			this.visibleAxes.forEach(axis => (code += ` ${axis.letter}0 F${this.moveFeedrate}`));
-			console.log(code);
-			await this.sendCode(code);
+			var gotoZeroPath = combine(this.systemDir, 'workzero.g');
+			await this.sendCode({code : `M98 P"${gotoZeroPath}"`});
 		},
 		async updateWorkspaceCoordinate() {
 			let code;
@@ -255,7 +255,6 @@ export default {
 			this.moveStepDialog.shown = false;
 		},
 		workspaceNumber: function (to) {
-			console.log(`workplace number change ${to}`);
 			this.currentWorkspace = to + 1;
 		},
 	},

src/i18n/en.js

@@ -642,7 +642,8 @@ export default {
 			runMesh: 'Run Mesh Compensation (G29)',
 			loadMesh: 'Load Saved Height Map from SD Card (G29 S1)',
 			axesNotHomed: 'The following axis is not homed:|The following axes are not homed:',
-			noAxes: 'No Axes'
+			noAxes: 'No Axes',
+			workzero: 'Go To Zero'
 		},
 		settingsAbout: {
 			caption: 'About',