Merge branch 'develop'

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

Author: pedrolamas

package-lock.json

@@ -92,17 +92,17 @@
     "eslint-plugin-regexp": "^2.10.0",
     "eslint-plugin-vue": "^9.33.0",
     "husky": "^9.1.7",
-    "jsdom": "^27.3.0",
+    "jsdom": "^27.4.0",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
     "neostandard": "^0.12.2",
-    "rollup": "^4.53.5",
+    "rollup": "^4.54.0",
     "sass": "~1.32.13",
     "skott": "^0.35.6",
     "standard-version": "^9.5.0",
     "svgo": "^4.0.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.50.0",
+    "typescript-eslint": "^8.51.0",
     "unplugin-vue-components": "^30.0.0",
     "vite": "^6.4.1",
     "vite-plugin-checker": "^0.12.0",

package.json

@@ -19,7 +19,6 @@ export const SocketActions = {
   machineServicesRestart (service: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'machine.services.restart', {
-        dispatch: 'void',
         wait: Waits.onServiceRestart,
         ...options,
         params: {
@@ -32,7 +31,6 @@ export const SocketActions = {
   machineServicesStart (service: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'machine.services.start', {
-        dispatch: 'void',
         wait: Waits.onServiceStart,
         ...options,
         params: {
@@ -45,7 +43,6 @@ export const SocketActions = {
   machineServicesStop (service: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'machine.services.stop', {
-        dispatch: 'void',
         wait: Waits.onServiceStop,
         ...options,
         params: {
@@ -58,7 +55,6 @@ export const SocketActions = {
   machineReboot (options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'machine.reboot', {
-        dispatch: 'void',
         ...options
       }
     )
@@ -67,7 +63,6 @@ export const SocketActions = {
   machineShutdown (options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'machine.shutdown', {
-        dispatch: 'void',
         ...options
       }
     )
@@ -326,7 +321,6 @@ export const SocketActions = {
   printerRestart (options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'printer.restart', {
-        dispatch: 'void',
         wait: Waits.onKlipperRestart,
         ...options
       }
@@ -336,7 +330,6 @@ export const SocketActions = {
   printerFirmwareRestart (options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'printer.firmware_restart', {
-        dispatch: 'void',
         wait: Waits.onKlipperFirmwareRestart,
         ...options
       }
@@ -377,7 +370,6 @@ export const SocketActions = {
   printerPrintStart (path: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'printer.print.start', {
-        dispatch: 'void',
         ...options,
         params: {
           filename: path
@@ -440,7 +432,6 @@ export const SocketActions = {
   printerEmergencyStop (options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'printer.emergency_stop', {
-        dispatch: 'void',
         ...options
       }
     )
@@ -571,7 +562,6 @@ export const SocketActions = {
   serverRestart (options?: NotifyOptions) {
     return baseEmit<Moonraker.OkResponse>(
       'server.restart', {
-        dispatch: 'void',
         ...options
       }
     )
@@ -766,7 +756,6 @@ export const SocketActions = {
   serverFilesMove (source: string, dest: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.Files.ChangeResponse>(
       'server.files.move', {
-        dispatch: 'void',
         wait: `${Waits.onFileSystem}/${source}/`,
         ...options,
         params: {
@@ -780,7 +769,6 @@ export const SocketActions = {
   serverFilesCopy (source: string, dest: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.Files.ChangeResponse>(
       'server.files.copy', {
-        dispatch: 'void',
         wait: `${Waits.onFileSystem}/${source}/`,
         ...options,
         params: {
@@ -794,7 +782,6 @@ export const SocketActions = {
   serverFilesZip (dest: string, items: string[], store_only?: boolean, options?: NotifyOptions) {
     return baseEmit<Moonraker.Files.ZipResponse>(
       'server.files.zip', {
-        dispatch: 'void',
         wait: `${Waits.onFileSystem}/${dest}/`,
         ...options,
         params: {
@@ -813,7 +800,6 @@ export const SocketActions = {
   serverFilesPostDirectory (path: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.Files.ChangeResponse>(
       'server.files.post_directory', {
-        dispatch: 'void',
         wait: `${Waits.onFileSystem}/${path}/`,
         ...options,
         params: {
@@ -826,7 +812,6 @@ export const SocketActions = {
   serverFilesDeleteFile (path: string, options?: NotifyOptions) {
     return baseEmit<Moonraker.Files.ChangeResponse>(
       'server.files.delete_file', {
-        dispatch: 'void',
         wait: `${Waits.onFileSystem}/${path}`,
         ...options,
         params: {
@@ -839,7 +824,6 @@ export const SocketActions = {
   serverFilesDeleteDirectory (path: string, force = false, options?: NotifyOptions) {
     return baseEmit<Moonraker.Files.ChangeResponse>(
       'server.files.delete_directory', {
-        dispatch: 'void',
         wait: `${Waits.onFileSystem}/${path}/`,
         ...options,
         params: {
@@ -862,7 +846,6 @@ export const SocketActions = {
   serverAnnouncementsDismiss (entry_id: string, wake_time?: number, options?: NotifyOptions) {
     return baseEmit<Moonraker.Announcements.DismissResponse>(
       'server.announcements.dismiss', {
-        dispatch: 'void',
         ...options,
         params: {
           entry_id,
@@ -938,7 +921,6 @@ export const SocketActions = {
     return baseEmit<Moonraker.Analysis.EstimateResponse>(
       'server.analysis.estimate', {
         wait: `${Waits.onFileSystem}/gcodes/${filename}`,
-        dispatch: 'void',
         ...options,
         params: {
           filename,

public/img/mmu/mmu_EMU.svg

@@ -82,9 +82,18 @@
                 v-safe-html="n.description"
                 class="notification-description"
               />
-              <v-list-item-subtitle class="notification-timestamp">
-                {{ $filters.formatRelativeTimeToNow(n.timestamp * 1000) }}
-              </v-list-item-subtitle>
+              <v-tooltip bottom>
+                <template #activator="{ on, attrs }">
+                  <v-list-item-subtitle
+                    v-bind="attrs"
+                    class="notification-timestamp"
+                    v-on="on"
+                  >
+                    {{ $filters.formatRelativeTimeToNow(n.timestamp * 1000) }}
+                  </v-list-item-subtitle>
+                </template>
+                <span>{{ $filters.formatDateTime(n.timestamp * 1000) }}</span>
+              </v-tooltip>
               <v-list-item-subtitle v-if="n.to">
                 <app-btn
                   v-if="!n.to.startsWith('http')"

src/api/socketActions.ts

@@ -51,7 +51,17 @@
                     >
                       <strong>{{ commit.author }}</strong>
                     </a>
-                    {{ $t('app.version.label.committed') }} {{ $filters.formatRelativeTimeToNow(+commit.date * 1000) }}
+                    <v-tooltip bottom>
+                      <template #activator="{ on, attrs }">
+                        <span
+                          v-bind="attrs"
+                          v-on="on"
+                        >
+                          {{ $t('app.version.label.committed') }} {{ $filters.formatRelativeTimeToNow(+commit.date * 1000) }}
+                        </span>
+                      </template>
+                      <span>{{ $filters.formatDateTime(+commit.date * 1000) }}</span>
+                    </v-tooltip>
                   </div>
                 </div>
                 <div>

src/components/layout/AppNotificationMenu.vue

@@ -65,7 +65,7 @@
 		},
 		"known_config_block_name": {
 			"name": "storage.type",
-			"match": "(?i)\\b(ad5206|adc_scaled|adc_temperature|adxl345|angle|bed_mesh|bed_screws|bed_tilt|bltouch|board_pins|controller_fan|delayed_gcode|delta_calibrate|display|display_data|display_glyph|display_status|display_template|dotstar|dual_carriage|duplicate_pin_override|endstop_phase|extruder_stepper|extruder[1-9]{0,1}|fan|fan_generic|filament_motion_sensor|filament_switch_sensor|firmware_retraction|force_move|gcode_arcs|gcode_button|gcode_macro|hall_filament_width_sensor|heater_bed|heater_fan|heater_generic|homing_heaters|homing_override|idle_timeout|include|input_shaper|led|manual_probe|manual_stepper|mcp4018|mcp4451|mcp4728|mcu|menu|multi_pin|neopixel|output_pin|palette2|pause_resume|pca9533|pca9632|printer|probe|quad_gantry_level|replicape|resonance_tester|respond|safe_z_home|samd_sercom|save_variables|screws_tilt_adjust|sdcard_loop|servo|skew_correction|smart_effector|static_digital_output|stepper_(bed|arm|[abcdxy]|z[1-9]{0,1})|sx1509|temperature_fan|temperature_sensor|thermistor|tsl1401cl_filament_width_sensor|verify_heater|virtual_sdcard|z_tilt)\\b"
+			"match": "(?i)\\b(ad5206|adc_scaled|adc_temperature|adxl345|angle|bed_mesh|bed_screws|bed_tilt|bltouch|board_pins|controller_fan|delayed_gcode|delta_calibrate|display|display_data|display_glyph|display_status|display_template|dotstar|dual_carriage|duplicate_pin_override|endstop_phase|extruder_stepper|extruder[1-9]{0,1}|fan|fan_generic|filament_motion_sensor|filament_switch_sensor|firmware_retraction|force_move|gcode_arcs|gcode_button|gcode_macro|hall_filament_width_sensor|heater_bed|heater_fan|heater_generic|homing_heaters|homing_override|idle_timeout|include|input_shaper|led|manual_probe|manual_stepper|mcp4018|mcp4451|mcp4728|mcu|menu|multi_pin|neopixel|output_pin|palette2|pause_resume|pca9533|pca9632|printer|probe|quad_gantry_level|replicape|resonance_tester|respond|safe_z_home|samd_sercom|save_variables|screws_tilt_adjust|sdcard_loop|servo|skew_correction|smart_effector|static_digital_output|static_pwm_clock|stepper_(bed|arm|[abcdxy]|z[1-9]{0,1})|sx1509|temperature_fan|temperature_sensor|thermistor|tsl1401cl_filament_width_sensor|verify_heater|virtual_sdcard|z_tilt)\\b"
 		},
 		"known_driver_type": {
 			"name": "support.type",

src/components/settings/VersionInformationDialog.vue

@@ -120,10 +120,23 @@ export const getters = {
       z: NaN
     }
 
-    for (let i = moveIndex; i >= 0 && (Number.isNaN(output.x) || Number.isNaN(output.y) || Number.isNaN(output.z)); i--) {
+    for (let i = moveIndex, count = 0; i >= 0 && count < 3; i--) {
       const move = moves[i]
 
-      Object.assign(output, move)
+      if (Number.isNaN(output.x) && move.x != null) {
+        output.x = move.x
+        count++
+      }
+
+      if (Number.isNaN(output.y) && move.y != null) {
+        output.y = move.y
+        count++
+      }
+
+      if (Number.isNaN(output.z) && move.z != null) {
+        output.z = move.z
+        count++
+      }
     }
 
     return {
@@ -285,7 +298,7 @@ export const getters = {
 
     const moves: readonly Move[] = state.moves
 
-    return binarySearch(moves, move => filePosition - move.filePosition)
+    return binarySearch(moves, move => filePosition - move.filePosition, true)
   },
 
   getLayerNrByFilePosition: (state, getters) => (filePosition: number): number => {

src/monaco/language/klipper-config.tmLanguage.json

@@ -939,6 +939,8 @@ declare namespace Klipper {
 
       [key: `load_cell ${Lowercase<string>}`]: LoadCellSettings;
 
+      [key: `static_pwm_clock ${Lowercase<string>}`]: StaticPwmClockSettings;
+
       // These keys are for kalico modules
 
       danger_options: KalicoPrinterDangerOptionsSettings;
@@ -1470,6 +1472,10 @@ declare namespace Klipper {
     vref?: string;
   }
 
+  export interface StaticPwmClockSettings {
+    frequency: number;
+  }
+
   export interface KalicoPrinterDangerOptionsSettings {
     minimal_logging: boolean;
     log_statistics: boolean;