Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/widgets/runout-sensors/RunoutSensorsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
>
<v-list-item-content>
<v-list-item-title>{{ item.prettyName }}</v-list-item-title>
<v-list-item-subtitle v-if="item.diameter != null">
{{ item.diameter.toFixed(2) }} mm
</v-list-item-subtitle>
</v-list-item-content>
<v-list-item-icon>
<v-icon
Expand Down
21 changes: 19 additions & 2 deletions src/store/printer/getters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -519,18 +519,35 @@ export const getters = {
getRunoutSensors: (state): RunoutSensor[] => {
return Object.keys(state.printer)
.filter(key => (
key === 'hall_filament_width_sensor' ||
key.startsWith('filament_switch_sensor ') ||
key.startsWith('filament_motion_sensor ')
))
.map(key => {
.map((key): RunoutSensor | null => {
const sensor = state.printer[key]

if (sensor?.filament_detected == null) {
return null
}

const name = key.trim().split(/\s+/).pop() || ''

const diameter = (
'is_active' in sensor &&
sensor.is_active &&
'Diameter' in sensor
)
? sensor.Diameter
: undefined

return {
...state.printer[key],
...sensor,
name,
prettyName: Vue.$filters.prettyCase(name),
diameter
}
})
.filter(sensor => sensor !== null)
},

getEndstops: (state): Endstop[] => {
Expand Down
1 change: 1 addition & 0 deletions src/store/printer/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export interface Sensor extends Partial<Klipper.TemperatureSensorState>, Partial
export interface RunoutSensor extends Partial<Klipper.FilamentSwitchSensorState>, Partial<Klipper.FilamentMotionSensorState> {
name: string;
prettyName: string;
diameter?: number;
}

export interface Endstop {
Expand Down
3 changes: 3 additions & 0 deletions src/typings/klipper.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ declare namespace Klipper {
is_active: boolean;
Diameter: number;
Raw: number;
enabled?: boolean;
filament_detected?: boolean;
flow_compensation_enabled?: boolean;
}

export interface ExtruderState {
Expand Down
Loading