Merge branch 'develop' into mellow-theme

fluidd-core · Aug 8, 2024 · 1654bf8 · 1654bf8
2 parents e8e5016 + 79f9999
commit 1654bf8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/components/widgets/toolhead/ToolheadControlBarsAxis.vue b/src/components/widgets/toolhead/ToolheadControlBarsAxis.vue
@@ -79,8 +79,8 @@ export default class ToolheadControlBarsAxis extends Mixins(StateMixin, Toolhead
 
   sendMoveGcode (distance: number) {
     this.sendGcode(`G91
-    G1 ${this.axis}${distance} F${this.rate * 60}
-    G90`)
+G1 ${this.axis}${distance} F${this.rate * 60}
+G90`)
   }
 
   sendHomeGcode () {

diff --git a/src/components/widgets/toolhead/ToolheadControlCircle.vue b/src/components/widgets/toolhead/ToolheadControlCircle.vue
@@ -736,8 +736,8 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
       this.sendGcode(`FORCE_MOVE STEPPER=stepper_${axis.toLowerCase()} DISTANCE=${distance} VELOCITY=${rate} ACCEL=${accel}`)
     } else {
       this.sendGcode(`G91
-      G1 ${axis}${distance} F${rate * 60}
-      G90`)
+G1 ${axis}${distance} F${rate * 60}
+G90`)
     }
   }
 

diff --git a/src/components/widgets/toolhead/ToolheadControlCross.vue b/src/components/widgets/toolhead/ToolheadControlCross.vue
@@ -259,8 +259,8 @@ export default class ToolheadControlCross extends Mixins(StateMixin, ToolheadMix
       this.sendGcode(`FORCE_MOVE STEPPER=stepper_${axis.toLowerCase()} DISTANCE=${distance} VELOCITY=${rate} ACCEL=${accel}`)
     } else {
       this.sendGcode(`G91
-      G1 ${axis}${distance} F${rate * 60}
-      G90`)
+G1 ${axis}${distance} F${rate * 60}
+G90`)
     }
   }
 }

diff --git a/src/components/widgets/toolhead/ToolheadPosition.vue b/src/components/widgets/toolhead/ToolheadPosition.vue
@@ -175,7 +175,7 @@ export default class ToolheadPosition extends Mixins(StateMixin, ToolheadMixin)
         this.sendGcode(`FORCE_MOVE STEPPER=stepper_${axis.toLowerCase()} DISTANCE=${pos} VELOCITY=${rate} ACCEL=${accel}`)
       } else {
         this.sendGcode(`G90
-        G1 ${axis}${pos} F${rate * 60}`)
+G1 ${axis}${pos} F${rate * 60}`)
       }
     }
   }