Merge remote-tracking branch 'origin/develop' into develop

mainsail-crew · Aug 27, 2024 · abf2774 · abf2774
2 parents 29fd126 + cab5ea6
commit abf2774
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/components/panels/Extruder/ExtruderControlPanelControl.vue b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
@@ -263,13 +263,21 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ExtruderMixi
     }
 
     sendRetract(): void {
-        const gcode = `M83\nG1 E-${this.feedamount} F${this.feedrate * 60}`
+        const gcode =
+            `SAVE_GCODE_STATE NAME=ui_retract\n` +
+            `M83\n` +
+            `G1 E-${this.feedamount} F${this.feedrate * 60}\n` +
+            `RESTORE_GCODE_STATE NAME=ui_retract`
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
         this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnRetract' })
     }
 
     sendExtrude(): void {
-        const gcode = `M83\nG1 E${this.feedamount} F${this.feedrate * 60}`
+        const gcode =
+            `SAVE_GCODE_STATE NAME=ui_extrude\n` +
+            `M83\n` +
+            `G1 E${this.feedamount} F${this.feedrate * 60}\n` +
+            `RESTORE_GCODE_STATE NAME=ui_extrude`
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
         this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnDetract' })
     }