Merge branch 'develop'

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>

Author: pedrolamas

package-lock.json

@@ -33,22 +33,22 @@
   "main": "index.js",
   "dependencies": {
     "@ctrl/tinycolor": "^4.1.0",
-    "@fontsource/raleway": "^5.0.19",
-    "@fontsource/roboto": "^5.0.14",
+    "@fontsource/raleway": "^5.0.21",
+    "@fontsource/roboto": "^5.0.15",
     "@irojs/iro-core": "^1.2.1",
     "@jaames/iro": "^5.5.2",
-    "axios": "^1.7.4",
+    "axios": "^1.7.7",
     "consola": "^3.2.3",
     "dompurify": "^3.1.6",
     "echarts": "^5.5.1",
     "echarts-gl": "^2.0.9",
-    "hls.js": "^1.5.14",
+    "hls.js": "^1.5.15",
     "jwt-decode": "^4.0.0",
     "lodash-es": "^4.17.21",
-    "marked": "^14.0.0",
+    "marked": "^14.1.2",
     "marked-base-url": "^1.1.5",
     "md5": "^2.3.0",
-    "monaco-editor": "^0.50.0",
+    "monaco-editor": "^0.51.0",
     "monaco-editor-textmate": "^4.0.0",
     "monaco-textmate": "^3.0.1",
     "onigasm": "^2.2.5",
@@ -57,11 +57,11 @@
     "qrcode.vue": "^1.7.0",
     "semver": "^7.6.3",
     "shlex": "^2.1.2",
-    "sortablejs": "^1.15.2",
+    "sortablejs": "^1.15.3",
     "uuid": "^10.0.0",
     "vue": "^2.7.16",
     "vue-class-component": "^7.2.6",
-    "vue-echarts": "^7.0.2",
+    "vue-echarts": "^7.0.3",
     "vue-i18n": "^8.28.2",
     "vue-inline-svg": "^2.1.4",
     "vue-json-viewer": "^2.2.22",
@@ -81,34 +81,34 @@
     "@types/jsdom": "^21.1.7",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^20.14.15",
+    "@types/node": "^20.16.5",
     "@types/semver": "^7.5.8",
     "@types/sortablejs": "^1.15.8",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vitejs/plugin-vue2": "^2.3.1",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^1.3.6",
     "@vue/tsconfig": "~0.1.3",
     "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.27.0",
-    "husky": "^9.1.4",
-    "jsdom": "^24.1.1",
+    "eslint-plugin-vue": "^9.28.0",
+    "husky": "^9.1.6",
+    "jsdom": "^25.0.0",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
-    "rollup": "^4.20.0",
+    "rollup": "^4.21.3",
     "sass": "~1.32.13",
     "shx": "^0.3.4",
-    "skott": "^0.35.2",
+    "skott": "^0.35.3",
     "standard-version": "^9.5.0",
     "typescript": "^5.5.4",
     "unplugin-vue-components": "^0.27.4",
-    "vite": "^5.4.0",
+    "vite": "^5.4.4",
     "vite-plugin-checker": "^0.7.2",
     "vite-plugin-monaco-editor": "^1.1.0",
-    "vite-plugin-pwa": "^0.20.1",
+    "vite-plugin-pwa": "^0.20.5",
     "vitest": "^1.6.0",
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",

package.json

@@ -31,7 +31,7 @@ export default class ConsoleItem extends Vue {
   get itemMessage () {
     let message = this.value.message
     if (this.value.type === 'response') {
-      message = this.value.message.replace(/([A-Z0-9_]{2,})/gm, (match, command) => {
+      message = this.value.message.replace(/([A-Z0-9_]{2,})/g, (match, command) => {
         if (command in this.knownCommands) return `<a class="primary--text text--lighten-1">${command.toUpperCase()}</a>`
         return match
       })

src/components/widgets/console/ConsoleItem.vue

@@ -31,7 +31,7 @@ export default class StateExplorer extends Mixins(StateMixin) {
   handleClick (path: string) {
     const sanitizedPath = path
       .replace('$.', '')
-      .replace(/\.(\w*[^\w\S.]+\w*)/g, (_, match) => {
+      .replace(/\.(\w*\s+\w*)/g, (_, match) => {
         if (isNaN(match)) return `['${match}']`
         return `[${match}]`
       })

src/components/widgets/diagnostics/StateExplorer.vue

@@ -420,7 +420,10 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
             break
 
           case 'rolled_log_files':
-            if (file.type === 'file' && file.filename.match(/\.\d{4}-\d{2}-\d{2}(_\d{2}-\d{2}-\d{2})?$/)) {
+            if (file.type === 'file' && (
+              file.filename.match(/\.\d{4}-\d{2}-\d{2}(_\d{2}-\d{2}-\d{2})?$/) ||
+              file.filename.match(/\.log\.\d+$/)
+            )) {
               return false
             }
             break

src/components/widgets/filesystem/FileSystem.vue

@@ -172,7 +172,7 @@ async function setupMonaco () {
 
       const sectionBlocks = linesContent
         .reduce((state, lineContent, index) => {
-          const isSection = /^\[([^\]]+)\]/.test(lineContent)
+          const isSection = /^\[[^\]]+\]/.test(lineContent)
 
           if (isSection) {
             state.result.push(state.current = {

src/components/widgets/filesystem/setupMonaco.ts

@@ -79,12 +79,12 @@
             :value="minimumCruiseRatio"
             :reset-value="defaultMinimumCruiseRatio"
             :min="0"
-            :max="0.99"
-            :step="0.01"
+            :max="100"
             :disabled="!klippyReady"
             overridable
             :locked="isMobileViewport"
             :loading="hasWait($waits.onSetMinimumCruiseRatio)"
+            suffix="%"
             @submit="setMinimumCruiseRatio"
           />
 
@@ -144,11 +144,15 @@ export default class PrinterLimits extends Mixins(StateMixin, BrowserMixin) {
   get defaultMinimumCruiseRatio (): number {
     const defaultMinimumCruiseRatio = this.$store.getters['printer/getPrinterSettings']('printer.minimum_cruise_ratio') as number | undefined
 
-    return defaultMinimumCruiseRatio ?? 0.5
+    return Math.round((defaultMinimumCruiseRatio ?? 0.5) * 100)
   }
 
   get minimumCruiseRatio (): number | undefined {
-    return this.$store.state.printer.printer.toolhead.minimum_cruise_ratio as number | undefined
+    const minimumCruiseRatio = this.$store.state.printer.printer.toolhead.minimum_cruise_ratio as number | undefined
+
+    return minimumCruiseRatio != null
+      ? Math.round(minimumCruiseRatio * 100)
+      : undefined
   }
 
   get defaultSquareCornerVelocity (): number {
@@ -172,7 +176,7 @@ export default class PrinterLimits extends Mixins(StateMixin, BrowserMixin) {
   }
 
   setMinimumCruiseRatio (val: number) {
-    this.sendGcode(`SET_VELOCITY_LIMIT MINIMUM_CRUISE_RATIO=${val}`, this.$waits.onSetMinimumCruiseRatio)
+    this.sendGcode(`SET_VELOCITY_LIMIT MINIMUM_CRUISE_RATIO=${val / 100}`, this.$waits.onSetMinimumCruiseRatio)
   }
 
   setSquareCornerVelocity (val: number) {

src/components/widgets/limits/PrinterLimits.vue

@@ -98,6 +98,10 @@ export default class MacroBtn extends Mixins(StateMixin) {
     return ['m117', 'm118'].includes(this.macro.name)
   }
 
+  get isMacroForGcodeCommand () {
+    return /^[gm]\d+$/i.test(this.macro.name)
+  }
+
   get filteredListeners () {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { click, ...listeners } = this.$listeners
@@ -114,12 +118,29 @@ export default class MacroBtn extends Mixins(StateMixin) {
    */
   get runCommand () {
     const command = this.macro.name.toUpperCase()
+    const isMacroForGcodeCommand = this.isMacroForGcodeCommand
 
     if (this.params) {
       const params = this.isMacroWithRawParam
         ? this.params.message.value.toString()
         : Object.entries(this.params)
-          .map(([key, param]) => `${key.toUpperCase()}=${param.value}`)
+          .map(([key, param]) => {
+            const value = param.value.toString()
+
+            if (!value) {
+              return null
+            }
+
+            const valueDelimiter = value.includes(' ')
+              ? '"'
+              : ''
+            const paramSeparator = isMacroForGcodeCommand && !valueDelimiter
+              ? ''
+              : '='
+
+            return `${key.toUpperCase()}${paramSeparator}${valueDelimiter}${value}${valueDelimiter}`
+          })
+          .filter(x => x != null)
           .join(' ')
 
       if (params) {
@@ -148,7 +169,7 @@ export default class MacroBtn extends Mixins(StateMixin) {
       this.$set(this.params, 'message', { value: '', reset: '' })
     } else {
       for (const { name, value } of gcodeMacroParams(this.macro.config.gcode)) {
-        if (!this.params[name]) {
+        if (!name.startsWith('_') && !this.params[name]) {
           this.$set(this.params, name, { value, reset: value })
         }
       }

src/components/widgets/macros/MacroBtn.vue

@@ -260,10 +260,6 @@ import type { ChartData } from '@/store/charts/types'
   }
 })
 export default class TemperatureTargets extends Mixins(StateMixin) {
-  get colors () {
-    return this.$colorset.colorList
-  }
-
   get extruder () {
     return this.$store.state.printer.printer.extruder
   }

src/components/widgets/thermals/TemperatureTargets.vue

@@ -31,7 +31,7 @@
         <app-btn
           :disabled="!klippyReady || !extruderReady || !valid"
           block
-          @click="sendRetractGcode(extrudeLength, extrudeSpeed, $waits.onExtrude)"
+          @click="retract"
         >
           {{ $t('app.general.btn.retract') }}
           <v-icon>$chevronUp</v-icon>
@@ -68,7 +68,7 @@
         <app-btn
           :disabled="!klippyReady || !extruderReady || !valid"
           block
-          @click="sendExtrudeGcode(extrudeLength, extrudeSpeed, $waits.onExtrude)"
+          @click="extrude"
         >
           {{ $t('app.general.btn.extrude') }}
           <v-icon>$chevronDown</v-icon>
@@ -136,19 +136,15 @@ export default class ExtruderMoves extends Mixins(StateMixin, ToolheadMixin) {
     return this.$rules.numberLessThanOrEqual(this.maxExtrudeSpeed)(value)
   }
 
-  sendRetractGcode (amount: number, rate: number, wait?: string) {
+  retract () {
     if (this.valid) {
-      const gcode = `M83
-G1 E-${amount} F${rate * 60}`
-      this.sendGcode(gcode, wait)
+      this.sendExtrudeGcode(-this.extrudeLength, this.extrudeSpeed, this.$waits.onExtrude)
     }
   }
 
-  sendExtrudeGcode (amount: number, rate: number, wait?: string) {
+  extrude () {
     if (this.valid) {
-      const gcode = `M83
-G1 E${amount} F${rate * 60}`
-      this.sendGcode(gcode, wait)
+      this.sendExtrudeGcode(this.extrudeLength, this.extrudeSpeed, this.$waits.onExtrude)
     }
   }