diff --git a/docs/Status_Reference.md b/docs/Status_Reference.md index 0303ae41..e8f7f2c0 100644 --- a/docs/Status_Reference.md +++ b/docs/Status_Reference.md @@ -242,6 +242,8 @@ The following information is available in the `gcode_move` object The following information is available in the [hall_filament_width_sensor](Config_Reference.md#hall_filament_width_sensor) object: +- all items from + [filament_switch_sensor](Status_Reference.md#filament_switch_sensor) - `is_active`: Returns True if the sensor is currently active. - `Diameter`: The last reading from the sensor in mm. - `Raw`: The last raw ADC reading from the sensor. diff --git a/klippy/extras/hall_filament_width_sensor.py b/klippy/extras/hall_filament_width_sensor.py index c71b2b2e..865e49af 100644 --- a/klippy/extras/hall_filament_width_sensor.py +++ b/klippy/extras/hall_filament_width_sensor.py @@ -209,10 +209,12 @@ class HallFilamentWidthSensor: +self.lastFilamentWidthReading2)) gcmd.respond_info(response) def get_status(self, eventtime): - return {'Diameter': self.diameter, + status = self.runout_helper.get_status(eventtime) + status.update({'Diameter': self.diameter, 'Raw':(self.lastFilamentWidthReading+ self.lastFilamentWidthReading2), - 'is_active':self.is_active} + 'is_active':self.is_active}) + return status def cmd_log_enable(self, gcmd): self.is_log = True gcmd.respond_info("Filament width logging Turned On")