Skip to content

Commit d533b99

Browse files
committed
feat: bed mesh, runout sensors & end stops
- add stop motors button - stop actions being fired on response error - app no longer requests a metadata update for 'standby' - supports managing bed meshes - supports toggling sensor runout switches on / off - supports end stop status for printer setup - web errors now presented in a snack bar with better messaging
1 parent 4c6e316 commit d533b99

28 files changed

Lines changed: 3906 additions & 256 deletions

package-lock.json

Lines changed: 3061 additions & 143 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"vue": "^2.6.11",
2929
"vue-chartjs": "^3.5.1",
3030
"vue-class-component": "^7.2.3",
31+
"vue-plotly": "^1.1.0",
3132
"vue-property-decorator": "^8.4.2",
3233
"vue-router": "^3.2.0",
3334
"vuetify": "^2.2.11",
@@ -38,6 +39,7 @@
3839
"@types/chai": "^4.2.11",
3940
"@types/lodash-es": "^4.17.3",
4041
"@types/mocha": "^5.2.4",
42+
"@types/plotly.js": "^1.50.21",
4143
"@typescript-eslint/eslint-plugin": "^2.33.0",
4244
"@typescript-eslint/parser": "^2.33.0",
4345
"@vue/cli-plugin-babel": "~4.5.0",

src/components/AppBar.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
</v-toolbar-title>
1212
<v-spacer />
1313
<v-btn color="secondary" class="mr-2" to="/"><v-icon small class="mr-2">mdi-home</v-icon> Dashboard</v-btn>
14-
<!-- <v-btn color="secondary" class="mr-2" to="/configuration"><v-icon small class="mr-2">mdi-tune</v-icon> Configuration</v-btn> -->
14+
<v-btn color="secondary" class="mr-2" to="/configuration"><v-icon small class="mr-2">mdi-tune</v-icon> Configuration</v-btn>
15+
<v-btn color="secondary" class="mr-2" to="/settings"><v-icon small class="mr-2">mdi-cog</v-icon> Settings</v-btn>
1516
<v-spacer />
1617
<v-tooltip bottom v-if="printerConnected && klippyConnected">
1718
<template v-slot:activator="{ on, attrs }">
1819
<v-btn @click="emergencyStop()" v-bind="attrs" v-on="on" icon color="error"><v-icon>mdi-car-brake-alert</v-icon></v-btn>
1920
</template>
2021
Emergency Stop
2122
</v-tooltip>
22-
<v-btn icon color="white" class="mr-2" to="/settings"><v-icon small>mdi-cog</v-icon></v-btn>
23+
<!-- <v-btn icon color="white" class="mr-2" to="/settings"><v-icon small>mdi-cog</v-icon></v-btn> -->
2324
</v-app-bar>
2425
</template>
2526

@@ -54,8 +55,8 @@ export default class AppBar extends Mixins(UtilsMixin) {
5455
// Watch currentfile and refresh its metadata to ensure
5556
// our status has the correct data.
5657
@Watch('currentFile')
57-
oncurrentFileChanged (val: string) {
58-
if (val && val.length > 0) {
58+
onCurrentFileChanged (val: string) {
59+
if (val && val.length > 0 && val !== 'standby') {
5960
SocketActions.serverFilesMetaData(val)
6061
}
6162
}

src/components/AppDisconnected.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</v-col>
2222
<v-col cols="6" v-if="!printerConnected">
2323
<v-progress-linear
24+
class="mb-4"
2425
color="warning"
2526
indeterminate
2627
rounded

src/components/cards/ToolheadCard.vue

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
<v-icon large left>mdi-printer-3d-nozzle-outline</v-icon>
55
<span class="title font-weight-light text-h5">Toolhead</span>
66
<v-spacer />
7+
<v-btn
8+
v-if="!printerPrinting"
9+
@click="sendGcode('M84')"
10+
:disabled="hasWaits"
11+
class="mr-2"
12+
color="secondary">
13+
MOTORS OFF
14+
</v-btn>
715
<v-btn
816
v-if="!printerPrinting && printerSupportsZtilt"
917
@click="sendGcode('Z_TILT', waits.onZTilt)"
@@ -28,7 +36,7 @@
2836
:loading="hasWait(waits.onHomeAll)"
2937
:disabled="hasWaits"
3038
:color="(!allHomed) ? 'warning' : 'secondary'">
31-
<v-icon>mdi-home</v-icon> All
39+
<v-icon small class="mr-1">mdi-home</v-icon> All
3240
</v-btn>
3341
</v-card-title>
3442
<toolhead-widget></toolhead-widget>
@@ -48,17 +56,5 @@ import { Waits } from '@/globals'
4856
})
4957
export default class ToolheadCard extends Mixins(UtilsMixin) {
5058
waits = Waits
51-
52-
get printerSupportsQgl (): boolean {
53-
return 'quad_gantry_level' in this.$store.state.socket.printer.configfile.config
54-
}
55-
56-
get printerSupportsZtilt (): boolean {
57-
return 'z_tilt' in this.$store.state.socket.printer.configfile.config
58-
}
59-
60-
get allHomed (): boolean {
61-
return this.$store.getters['socket/getHomedAxes']('xyz')
62-
}
6359
}
6460
</script>

src/components/dialogs/dialogInput.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<v-dialog
33
@input="emitChange(value)"
44
:value="value"
5+
:max-width="maxWidthValue"
56
persistent
6-
max-width="250px"
77
>
88
<v-card>
99
<v-card-title>
@@ -33,6 +33,13 @@ export default class DialogInput extends Mixins(UtilsMixin) {
3333
@Prop({ type: String, required: true })
3434
title!: string
3535
36+
@Prop({ type: Number, required: false, default: 250 })
37+
maxWidth!: number
38+
39+
get maxWidthValue (): string | undefined {
40+
return (this.maxWidth) ? this.maxWidth.toString() + 'px' : undefined
41+
}
42+
3643
emitChange (val: boolean) {
3744
this.$emit('input', val)
3845
}

0 commit comments

Comments
 (0)