diff --git a/components.d.ts b/components.d.ts index c56ec58331..1c7346e4f1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -74,6 +74,7 @@ declare module 'vue' { VExpansionPanelContent: typeof import('vuetify/lib')['VExpansionPanelContent'] VExpansionPanelHeader: typeof import('vuetify/lib')['VExpansionPanelHeader'] VExpansionPanels: typeof import('vuetify/lib')['VExpansionPanels'] + VFadeTransition: typeof import('vuetify/lib')['VFadeTransition'] VFooter: typeof import('vuetify/lib')['VFooter'] VForm: typeof import('vuetify/lib')['VForm'] VIcon: typeof import('vuetify/lib')['VIcon'] diff --git a/src/components/widgets/toolhead/ExtruderSelection.vue b/src/components/widgets/toolhead/ExtruderSelection.vue index f047f8886e..f4e795959c 100644 --- a/src/components/widgets/toolhead/ExtruderSelection.vue +++ b/src/components/widgets/toolhead/ExtruderSelection.vue @@ -3,6 +3,7 @@ v-model="extruder" :items="extruders" :readonly="printerPrinting" + :disabled="!klippyReady" item-value="key" item-text="name" hide-details diff --git a/src/components/widgets/toolhead/ExtruderStats.vue b/src/components/widgets/toolhead/ExtruderStats.vue new file mode 100644 index 0000000000..972c2d5916 --- /dev/null +++ b/src/components/widgets/toolhead/ExtruderStats.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/components/widgets/toolhead/Toolhead.vue b/src/components/widgets/toolhead/Toolhead.vue index 0bddc091ca..320e205d95 100644 --- a/src/components/widgets/toolhead/Toolhead.vue +++ b/src/components/widgets/toolhead/Toolhead.vue @@ -16,9 +16,11 @@ + + + - @@ -34,6 +36,7 @@ import ToolheadPosition from '@/components/widgets/toolhead/ToolheadPosition.vue import ZHeightAdjust from '@/components/widgets/toolhead/ZHeightAdjust.vue' import SpeedAndFlowAdjust from '@/components/widgets/toolhead/SpeedAndFlowAdjust.vue' import PressureAdvanceAdjust from '@/components/widgets/toolhead/PressureAdvanceAdjust.vue' +import ExtruderStats from '@/components/widgets/toolhead/ExtruderStats.vue' @Component({ components: { @@ -43,7 +46,8 @@ import PressureAdvanceAdjust from '@/components/widgets/toolhead/PressureAdvance ToolheadPosition, ZHeightAdjust, SpeedAndFlowAdjust, - PressureAdvanceAdjust + PressureAdvanceAdjust, + ExtruderStats } }) export default class Toolhead extends Mixins(StateMixin) { diff --git a/src/locales/en.yaml b/src/locales/en.yaml index 978e918573..d1cfb3ea79 100644 --- a/src/locales/en.yaml +++ b/src/locales/en.yaml @@ -609,6 +609,25 @@ app: screws_tilt_calculate: Screws_Tilt_Calculate bed_screws_adjust: BED_SCREWS_ADJUST force_move: FORCE_MOVE + label: + stats_active_extruder: >- + The active extruder configuration is set for + %{filamentDiameter} mm diameter filament + and + %{nozzleDiameter} mm nozzle + stats_volumetric_flow: >- + Extruding at %{extrudeSpeed} mm/s + , the extruder should be able to provide an + estimated volumetric flow of %{estimatedVolumetricFlow} mm³/s + stats_extruded_length: >- + Extruding %{extrudeLength} mm of filament at %{extrudeFactor} % flow + , will provide an + estimated output length of %{estimatedExtrudedLength} mm + stats_max_speed: >- + Assuming a + %{layerHeight} mm layer height + , the + estimated maximum print speed is %{estimatedMaxSpeed} mm/s version: btn: check_for_updates: Check for updates