fix: fix gcode from macros with single char attributes (#680)

mainsail-crew · Feb 28, 2022 · 18294b6 · 18294b6
1 parent 5d146e9
commit 18294b6
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/components/inputs/MacroButton.vue b/src/components/inputs/MacroButton.vue
@@ -79,7 +79,8 @@ export default class MacroButton extends Mixins(BaseMixin) {
     private paramArray: string[] = []
     private params: params = {}
 
-    @Prop({ required: true }) declare readonly macro: GuiMacrosStateMacrogroupMacro
+    @Prop({ required: true })
+    declare readonly macro: GuiMacrosStateMacrogroupMacro
     @Prop({ default: 'primary' }) declare readonly color: string
 
     get klipperMacro() {
@@ -110,15 +111,23 @@ export default class MacroButton extends Mixins(BaseMixin) {
     }
 
     doSendMacro(gcode: string) {
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$store.dispatch('server/addEvent', {
+            message: gcode,
+            type: 'command',
+        })
         this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'macro_' + gcode })
     }
 
     sendWithParams() {
         let params: string[] = []
         this.paramArray.forEach((paramname: string) => {
-            if (this.params[paramname].value !== null && this.params[paramname].value !== '')
-                params.push(paramname + '=' + this.params[paramname].value)
+            if (this.params[paramname].value !== null && this.params[paramname].value !== '') {
+                let tmp: string = paramname
+                if (paramname.length === 1) tmp += this.params[paramname].value
+                else tmp += '=' + this.params[paramname].value
+
+                params.push(tmp)
+            }
         })
 
         const gcode = this.macro.name + ' ' + params.join(' ')