Changed Lane Eject to still be an option when late is preped but not …

…loaded

Catch edge case where unit data is not parsed correctly and display an error.

src/components/panels/Afc/AfcExtruderToolsItem.vue

@@ -65,9 +65,10 @@ import Component from 'vue-class-component'
 import { Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { Extruder, Lane } from '@/store/server/afc/types'
+import ControlMixin from '@/components/mixins/control'
 
 @Component({})
-export default class AfcExtruderToolsItem extends Mixins(BaseMixin) {
+export default class AfcExtruderToolsItem extends Mixins(BaseMixin, ControlMixin) {
     @Prop({ type: Object, required: true }) readonly tool!: Extruder
 
     get currentLane(): Lane {
@@ -107,6 +108,10 @@ export default class AfcExtruderToolsItem extends Mixins(BaseMixin) {
             buffer = `${this.currentLane.buffer.name}: ${this.currentLane.buffer.state}`
         }
 
+        if (this.printerIsPrintingOnly) {
+            state = `${this.$t('Panels.AfcPanel.Printing')}`
+        }
+
         return { state, lane, buffer }
     }
 

src/components/panels/Afc/AfcUnitsItemLane.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div class="spool-card-header">
-            <v-menu v-if="laneReady" :offset-y="true" :close-on-content-click="true" left>
+            <v-menu v-if="lanePrep" :offset-y="true" :close-on-content-click="true" left>
                 <template #activator="{ on: onMenu, attrs }">
                     <v-tooltip top>
                         <template #activator="{ on: onTooltip }">
@@ -17,7 +17,7 @@
                         <template #activator="{ on: onExtruderTemp }">
                             <div v-on="onExtruderTemp">
                                 <v-list-item
-                                    v-if="!toolLoaded"
+                                    v-if="!toolLoaded && laneReady"
                                     :disabled="
                                         (!extrudePossible && lane.spool.material === '') || printerIsPrintingOnly
                                     "
@@ -105,6 +105,10 @@ export default class AfcUnits extends Mixins(BaseMixin, ExtruderMixin) {
         return this.lane.load && this.lane.prep
     }
 
+    get lanePrep() {
+        return this.lane.prep
+    }
+
     get toolLoaded() {
         return this.lane.tool_loaded
     }

src/components/panels/AfcPanel.vue

@@ -1,84 +1,95 @@
 <template>
-    <panel
-        v-if="showPanel"
-        :title="$t('Panels.AfcPanel.Headline')"
-        :collapsible="true"
-        :expanded="true"
-        card-class="afc-control-panel">
-        <template #title>
-            <span>{{ $t('Panels.AfcPanel.Headline') }}</span>
-        </template>
-        <template #icon>
-            <AFCLogo class="panel-icon" />
-        </template>
-        <template #buttons>
-            <v-menu v-if="showAfcMacros" :offset-y="true" :close-on-content-click="false" left>
-                <template #activator="{ on, attrs }">
-                    <v-btn icon tile v-bind="attrs" v-on="on">
-                        <v-icon>{{ mdiDotsVertical }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-list dense>
-                    <!-- NOZZLE CLEAN -->
-                    <v-list-item v-if="brushMacroEnabled">
-                        <macro-button
-                            :macro="afcBrushMacro"
-                            :alias="$t('Panels.AfcPanel.BrushNozzle')"
-                            :disabled="printerIsPrintingOnly"
-                            color="#272727" />
-                    </v-list-item>
-                    <!-- PARK NOZZLE -->
-                    <v-list-item v-if="parkMacroEnabled">
-                        <macro-button
-                            :macro="afcParkMacro"
-                            :alias="$t('Panels.AfcPanel.ParkNozzle')"
-                            :disabled="printerIsPrintingOnly"
-                            color="#272727" />
-                    </v-list-item>
-                </v-list>
-            </v-menu>
-            <afc-panel-settings :units="unitsData" />
-        </template>
-        <template v-if="display_message.message !== ''">
-            <v-container>
-                <v-row class="flex-nowrap">
-                    <v-col class="py-2" style="min-width: 0">
-                        <span :class="`${messageType.color}--text subtitle-2 px-0`">
-                            <v-icon class="mr-2 mt-1 float-left" :color="messageType.color" small>
-                                {{ messageType.icon }}
+    <div>
+        <panel
+            v-if="showPanel"
+            :title="$t('Panels.AfcPanel.Headline')"
+            :collapsible="true"
+            :expanded="true"
+            card-class="afc-control-panel">
+            <template #title>
+                <span>{{ $t('Panels.AfcPanel.Headline') }}</span>
+            </template>
+            <template #icon>
+                <AFCLogo class="panel-icon" />
+            </template>
+            <template #buttons>
+                <v-btn v-if="showAFC" icon tile :title="`Calibrate AFC`" @click="calibrateAFC">
+                    <v-icon small>{{ mdiWrench }}</v-icon>
+                </v-btn>
+                <v-menu v-if="showAfcMacros && showAFC" :offset-y="true" :close-on-content-click="false" left>
+                    <template #activator="{ on, attrs }">
+                        <v-btn icon tile v-bind="attrs" v-on="on">
+                            <v-icon>{{ mdiDotsVertical }}</v-icon>
+                        </v-btn>
+                    </template>
+                    <v-list dense>
+                        <!-- NOZZLE CLEAN -->
+                        <v-list-item v-if="brushMacroEnabled">
+                            <macro-button
+                                :macro="afcBrushMacro"
+                                :alias="$t('Panels.AfcPanel.BrushNozzle')"
+                                :disabled="printerIsPrintingOnly"
+                                color="#272727" />
+                        </v-list-item>
+                        <!-- PARK NOZZLE -->
+                        <v-list-item v-if="parkMacroEnabled">
+                            <macro-button
+                                :macro="afcParkMacro"
+                                :alias="$t('Panels.AfcPanel.ParkNozzle')"
+                                :disabled="printerIsPrintingOnly"
+                                color="#272727" />
+                        </v-list-item>
+                    </v-list>
+                </v-menu>
+                <afc-panel-settings v-if="showAFC" :units="unitsData" />
+            </template>
+            <template v-if="display_message.message !== ''">
+                <v-container>
+                    <v-row class="flex-nowrap">
+                        <v-col class="py-2" style="min-width: 0">
+                            <span :class="`${messageType.color}--text subtitle-2 px-0`">
+                                <v-icon class="mr-2 mt-1 float-left" :color="messageType.color" small>
+                                    {{ messageType.icon }}
+                                </v-icon>
+                                {{ display_message.message }}
+                            </span>
+                        </v-col>
+                        <v-col class="col-auto py-2">
+                            <v-icon class="text--disabled cursor-pointer" small @click="clearDisplayMessage">
+                                {{ mdiCloseCircle }}
                             </v-icon>
-                            {{ display_message.message }}
-                        </span>
-                    </v-col>
-                    <v-col class="col-auto py-2">
-                        <v-icon class="text--disabled cursor-pointer" small @click="clearDisplayMessage">
-                            {{ mdiCloseCircle }}
-                        </v-icon>
-                    </v-col>
-                </v-row>
-            </v-container>
-            <v-divider class="mt-0 mb-0" />
-        </template>
-        <v-expansion-panels v-model="toolExpandedIndex">
-            <v-expansion-panel>
-                <v-expansion-panel-header>
-                    <strong>
-                        {{ $t('Panels.AfcPanel.ExtruderTools') }}
-                        <span v-if="toolExpandedIndex !== 0" class="text-caption text--disabled pl-1">
-                            ( {{ toolCount }} )
-                        </span>
-                    </strong>
-                </v-expansion-panel-header>
-                <v-expansion-panel-content>
-                    <afc-extruder-tools :tools="toolData" />
-                </v-expansion-panel-content>
-            </v-expansion-panel>
-        </v-expansion-panels>
-
-        <v-expansion-panels v-model="unitExpandedIndex" multiple>
-            <afc-units :units="unitsData" />
-        </v-expansion-panels>
-    </panel>
+                        </v-col>
+                    </v-row>
+                </v-container>
+                <v-divider class="mt-0 mb-0" />
+            </template>
+            <div v-if="showAFC">
+                <v-expansion-panels v-model="toolExpandedIndex">
+                    <v-expansion-panel>
+                        <v-expansion-panel-header>
+                            <strong>
+                                {{ $t('Panels.AfcPanel.ExtruderTools') }}
+                                <span v-if="toolExpandedIndex !== 0" class="text-caption text--disabled pl-1">
+                                    ( {{ toolCount }} )
+                                </span>
+                            </strong>
+                        </v-expansion-panel-header>
+                        <v-expansion-panel-content>
+                            <afc-extruder-tools :tools="toolData" />
+                        </v-expansion-panel-content>
+                    </v-expansion-panel>
+                </v-expansion-panels>
+
+                <v-expansion-panels v-model="unitExpandedIndex" multiple>
+                    <afc-units :units="unitsData" />
+                </v-expansion-panels>
+            </div>
+            <div v-else>
+                <v-card-text class="text-center error--text py-10">{{ $t('Panels.AfcPanel.LoadError') }}</v-card-text>
+            </div>
+        </panel>
+        <afc-calibrate-dialog :show-dialog="showCalibrateDialog" @close="showCalibrateDialog = false" />
+    </div>
 </template>
 
 <script lang="ts">
@@ -88,7 +99,7 @@ import ControlMixin from '@/components/mixins/control'
 import { PrinterStateMacro } from '@/store/printer/types'
 import Panel from '@/components/ui/Panel.vue'
 import AFCLogo from '@/components/ui/AFCLogo.vue'
-import { mdiDotsVertical, mdiCloseCircle, mdiMessageProcessingOutline, mdiAlertOutline } from '@mdi/js'
+import { mdiDotsVertical, mdiCloseCircle, mdiMessageProcessingOutline, mdiAlertOutline, mdiWrench } from '@mdi/js'
 import { Extruder, Unit, Message } from '@/store/server/afc/types'
 
 @Component({
@@ -100,6 +111,7 @@ import { Extruder, Unit, Message } from '@/store/server/afc/types'
 export default class AfcPanel extends Mixins(BaseMixin, ControlMixin) {
     mdiDotsVertical = mdiDotsVertical
     mdiCloseCircle = mdiCloseCircle
+    mdiWrench = mdiWrench
 
     intervalId: ReturnType<typeof setInterval> | null = null
     toolExpandedIndex: number | null = null
@@ -108,6 +120,12 @@ export default class AfcPanel extends Mixins(BaseMixin, ControlMixin) {
     display_message: Message = { message: '', type: '' }
     old_message: Message = { message: '', type: '' }
 
+    showCalibrateDialog = false
+
+    get showAFC(): boolean {
+        return this.unitsData.length > 0
+    }
+
     get showPanel(): boolean {
         return this.klipperReadyForGui /* && Check if AFC is initialized */
     }
@@ -172,6 +190,8 @@ export default class AfcPanel extends Mixins(BaseMixin, ControlMixin) {
         }
     }
 
+    calibrateAFC() {}
+
     clearDisplayMessage() {
         this.old_message = this.display_message
         this.display_message = { message: '', type: '' }

src/locales/en.json

@@ -608,6 +608,19 @@
         "Headline": "Manual Probe"
     },
     "Panels": {
+        "AfcCalibratePanel": {
+            "AllLanes": "All Lanes",
+            "Back": "Back",
+            "BowdenLength": "Bowden Length",
+            "Calibrate": "Calibrate",
+            "CalibrateBowdenLength": "Calibrate Bowden Length",
+            "CalibrateLanes": "Calibrate Lanes",
+            "CalibrateOption": "Please select from the list of available calibration options.",
+            "Lanes": "Lanes",
+            "Search": "Search",
+            "UnitName": "Name",
+            "UnitType": "Type"
+        },
         "AfcPanel": {
             "BrushNozzle": "Brush Nozzle",
             "BufferDisabled": "Buffer Not Active",
@@ -631,12 +644,14 @@
             "LaneLoadedNone": "NONE",
             "LaneMap": "Remap current lane to selected T command",
             "Load": "Load Lane",
+            "LoadError": "There was an issue loading unit information. Please check your configurations and make sure you are on the latest version of AFC.",
             "Loading": "Loading",
             "Moving": "Moving",
             "OpenSpoolInfo": "Open Spool Info",
             "ParkNozzle": "Park Nozzle",
             "PostExtruderSensor": "Post-Extruder Sensor",
             "PreExtruderSensor": "Pre-Extruder Sensor",
+            "Printing": "Printing",
             "RammingSensor": "Ramming Sensor",
             "Restoring": "Restoring",
             "ShowInfiniteSpool": "Infinite Spool",

src/store/server/afc/actions.ts

@@ -23,7 +23,7 @@ export const actions: ActionTree<AFCState, RootState> = {
         const hubs: Hub[] = []
         const lanes: Lane[] = []
 
-        afcData.buffers.forEach((bufferName: string) => {
+        afcData.buffers?.forEach((bufferName: string) => {
             const bufferData: any = printer[`AFC_buffer ${bufferName}`]
             if (bufferData) {
                 const buffer: FilBuffer = {
@@ -35,7 +35,7 @@ export const actions: ActionTree<AFCState, RootState> = {
             }
         })
 
-        afcData.hubs.forEach((hubName: string) => {
+        afcData.hubs?.forEach((hubName: string) => {
             const hubData: any = printer[`AFC_hub ${hubName}`]
             if (hubData) {
                 const hub: Hub = {
@@ -49,7 +49,7 @@ export const actions: ActionTree<AFCState, RootState> = {
         })
 
         // Process extruders
-        afcData.extruders.forEach((extruderName: string) => {
+        afcData.extruders?.forEach((extruderName: string) => {
             const extruderData: any = printer[`AFC_extruder ${extruderName}`]
             if (!extruderData) {
                 console.error(`Missing extruder data for: ${extruderName}`)
@@ -70,7 +70,7 @@ export const actions: ActionTree<AFCState, RootState> = {
         })
 
         // Process units
-        afcData.units.forEach((unitEntry: string) => {
+        afcData.units?.forEach((unitEntry: string) => {
             const [type, name]: [string, string] = unitEntry.split(' ') as [string, string]
             if (!type || !name) {
                 console.error(`Invalid unit entry: ${unitEntry}`)
@@ -93,21 +93,21 @@ export const actions: ActionTree<AFCState, RootState> = {
                 buffers: [],
             }
 
-            unitData.hubs.forEach((hubName: string) => {
+            unitData.hubs?.forEach((hubName: string) => {
                 const hub = hubs.find((h) => h.name === hubName)
                 if (hub) {
                     unit.hubs.push(hub)
                 }
             })
 
-            unitData.extruders.forEach((extruderName: string) => {
+            unitData.extruders?.forEach((extruderName: string) => {
                 const extruder = extruders.find((e) => e.name === extruderName)
                 if (extruder) {
                     unit.extruders.push(extruder)
                 }
             })
 
-            unitData.buffers.forEach((bufferName: string) => {
+            unitData.buffers?.forEach((bufferName: string) => {
                 const buffer = buffers.find((b) => b.name === bufferName)
                 if (buffer) {
                     unit.buffers.push(buffer)
@@ -118,7 +118,7 @@ export const actions: ActionTree<AFCState, RootState> = {
         })
 
         // Process lanes
-        afcData.lanes.forEach((laneName: string) => {
+        afcData.lanes?.forEach((laneName: string) => {
             const laneData: any = printer[`AFC_stepper ${laneName}`]
             if (!laneData) {
                 console.error(`Missing lane data for: ${laneName}`)