feat: hide extruder controls if none defined

Signed-off-by: Pedro Lamas <[email protected]>

src/components/widgets/toolhead/Toolhead.vue

@@ -8,15 +8,15 @@
         align="start"
       >
         <v-col class="controls-wrapper">
-          <extruder-selection v-if="multipleExtruders" />
+          <extruder-selection v-if="hasMultipleExtruders" />
           <toolhead-control-cross v-if="!printerPrinting && toolheadControlStyle === 'cross'" />
           <toolhead-control-bars v-else-if="!printerPrinting && toolheadControlStyle === 'bars'" />
           <z-height-adjust v-if="printerPrinting" />
         </v-col>
 
         <v-col class="controls-wrapper">
           <toolhead-position />
-          <extruder-moves v-if="!printerPrinting" />
+          <extruder-moves v-if="!printerPrinting && hasExtruder" />
           <z-height-adjust v-if="!printerPrinting" />
         </v-col>
       </v-row>
@@ -42,6 +42,7 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
+import ToolheadMixin from '@/mixins/toolhead'
 import ToolheadControlCross from './ToolheadControlCross.vue'
 import ToolheadControlBars from './ToolheadControlBars.vue'
 import ExtruderMoves from './ExtruderMoves.vue'
@@ -53,7 +54,6 @@ import PressureAdvanceAdjust from './PressureAdvanceAdjust.vue'
 import ExtruderStats from './ExtruderStats.vue'
 import ExtruderSteppers from './ExtruderSteppers.vue'
 import ToolChangeCommands from './ToolChangeCommands.vue'
-import type { Extruder } from '@/store/printer/types'
 import type { ToolheadControlStyle } from '@/store/config/types'
 
 @Component({
@@ -71,14 +71,9 @@ import type { ToolheadControlStyle } from '@/store/config/types'
     ToolChangeCommands
   }
 })
-export default class Toolhead extends Mixins(StateMixin) {
-  get multipleExtruders (): boolean {
-    return this.$store.getters['printer/getExtruders'].length > 1
-  }
-
+export default class Toolhead extends Mixins(StateMixin, ToolheadMixin) {
   get showPressureAdvance (): boolean {
-    const extruder = this.$store.getters['printer/getActiveExtruder'] as Extruder | undefined
-    return extruder?.pressure_advance !== undefined
+    return this.activeExtruder?.pressure_advance !== undefined
   }
 
   get toolheadControlStyle (): ToolheadControlStyle {

src/components/widgets/toolhead/ToolheadCard.vue

@@ -15,7 +15,7 @@
       <v-tooltip bottom>
         <template #activator="{ on, attrs }">
           <v-icon
-            v-show="!extruderReady"
+            v-show="hasExtruder && !extruderReady"
             v-bind="attrs"
             class="ml-3"
             color="info"

src/mixins/toolhead.ts

@@ -4,15 +4,27 @@ import type { Extruder } from '@/store/printer/types'
 
 @Component
 export default class ToolheadMixin extends Vue {
+  get hasExtruder (): boolean {
+    return this.$store.getters['printer/getHasExtruder'] as boolean
+  }
+
+  get hasMultipleExtruders (): boolean {
+    return this.$store.getters['printer/getHasMultipleExtruders'] as boolean
+  }
+
   get activeExtruder (): Extruder | undefined {
     return this.$store.getters['printer/getActiveExtruder'] as Extruder | undefined
   }
 
   get extruderReady (): boolean {
-    const extruder = this.activeExtruder
-    return (extruder && extruder.temperature >= 0 && extruder.min_extrude_temp >= 0)
-      ? (extruder.temperature >= extruder.min_extrude_temp)
-      : false
+    const activeExtruder = this.activeExtruder
+
+    return (
+      activeExtruder !== undefined &&
+      activeExtruder.temperature >= 0 &&
+      activeExtruder.min_extrude_temp >= 0 &&
+      activeExtruder.temperature >= activeExtruder.min_extrude_temp
+    )
   }
 
   get filamentDiameter (): number {

src/store/printer/getters.ts

@@ -247,6 +247,17 @@ export const getters: GetterTree<PrinterState, RootState> = {
     return mcus
   },
 
+  getHasExtruder: (state) => {
+    return state.printer.extruder
+  },
+
+  getHasMultipleExtruders: (state) => {
+    return (
+      state.printer.extruder &&
+      state.printer.extruder1
+    )
+  },
+
   /**
  * Return known extruders, giving them a friendly name.
  */