[Automated] Merged develop into target master

CHANGELOG.md

@@ -2,6 +2,11 @@
 # Changelog
 All notable changes to Mainsail will be documented in this file.
 
+## [2.11.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.1) - 2024-05-01
+### Bug Fixes and Improvements
+
+- **farm**: Fix switching to other printer function ([#1865](https://github.com/mainsail-crew/mainsail/pull/1865))
+
 ## [2.11.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.11.0) - 2024-04-28
 ### Features
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mainsail",
-    "version": "2.11.1",
+    "version": "2.11.2",
     "private": true,
     "decription": "a klipper web interface",
     "author": {

src/components/dialogs/SpoolmanChangeSpoolDialog.vue

@@ -163,6 +163,7 @@ export default class SpoolmanChangeSpoolDialog extends Mixins(BaseMixin) {
 
         const querySplits = search.toLowerCase().split(' ')
         const searchArray = [
+            item.id.toString(),
             item.comment,
             item.filament.name,
             item.filament.vendor.name,

src/components/inputs/MiscellaneousSlider.vue

@@ -199,9 +199,10 @@ export default class MiscellaneousSlider extends Mixins(BaseMixin) {
     sendCmd(newVal: number): void {
         if (this.value === newVal) return
 
-        let gcode = `SET_PIN PIN=${this.name} VALUE=${newVal.toFixed(2)}`
         if (newVal < this.min) newVal = 0
         newVal = newVal * this.multi
+
+        let gcode = `SET_PIN PIN=${this.name} VALUE=${newVal.toFixed(2)}`
         if (this.type === 'fan') gcode = `M106 S${newVal.toFixed(0)}`
         if (this.type === 'fan_generic') gcode = `SET_FAN_SPEED FAN=${this.name} SPEED=${newVal}`
         if (this.type === 'led')

src/store/gui/maintenance/getters.ts

@@ -30,7 +30,7 @@ export const getters: GetterTree<GuiMaintenanceState, any> = {
             }
 
             if (entry.reminder.printtime.bool) {
-                const end = entry.start_printtime + (entry.reminder.printtime.value ?? 0)
+                const end = entry.start_printtime + (entry.reminder.printtime.value ?? 0) * 3600
 
                 if (end <= currentTotalPrintTime) return true
             }