diff options
Diffstat (limited to 'klippy/extras/tsl1401cl_filament_width_sensor.py')
| -rw-r--r-- | klippy/extras/tsl1401cl_filament_width_sensor.py | 83 |
1 files changed, 44 insertions, 39 deletions
diff --git a/klippy/extras/tsl1401cl_filament_width_sensor.py b/klippy/extras/tsl1401cl_filament_width_sensor.py index 83480f46..72ddc423 100644 --- a/klippy/extras/tsl1401cl_filament_width_sensor.py +++ b/klippy/extras/tsl1401cl_filament_width_sensor.py @@ -9,20 +9,19 @@ ADC_SAMPLE_TIME = 0.001 ADC_SAMPLE_COUNT = 8 MEASUREMENT_INTERVAL_MM = 10 + class FilamentWidthSensor: def __init__(self, config): self.printer = config.get_printer() self.reactor = self.printer.get_reactor() - self.pin = config.get('pin') + self.pin = config.get("pin") self.nominal_filament_dia = config.getfloat( - 'default_nominal_filament_diameter', above=1.0) - self.measurement_delay = config.getfloat('measurement_delay', above=0.) - self.measurement_max_difference = config.getfloat('max_difference', - above=0.) - self.max_diameter = (self.nominal_filament_dia - + self.measurement_max_difference) - self.min_diameter = (self.nominal_filament_dia - - self.measurement_max_difference) + "default_nominal_filament_diameter", above=1.0 + ) + self.measurement_delay = config.getfloat("measurement_delay", above=0.0) + self.measurement_max_difference = config.getfloat("max_difference", above=0.0) + self.max_diameter = self.nominal_filament_dia + self.measurement_max_difference + self.min_diameter = self.nominal_filament_dia - self.measurement_max_difference self.is_active = True # filament array [position, filamentWidth] self.filament_array = [] @@ -31,31 +30,30 @@ class FilamentWidthSensor: self.toolhead = self.ppins = self.mcu_adc = None self.printer.register_event_handler("klippy:ready", self.handle_ready) # Start adc - self.ppins = self.printer.lookup_object('pins') - self.mcu_adc = self.ppins.setup_pin('adc', self.pin) + self.ppins = self.printer.lookup_object("pins") + self.mcu_adc = self.ppins.setup_pin("adc", self.pin) self.mcu_adc.setup_adc_sample(ADC_SAMPLE_TIME, ADC_SAMPLE_COUNT) self.mcu_adc.setup_adc_callback(ADC_REPORT_TIME, self.adc_callback) # extrude factor updating self.extrude_factor_update_timer = self.reactor.register_timer( - self.extrude_factor_update_event) + self.extrude_factor_update_event + ) # Register commands - self.gcode = self.printer.lookup_object('gcode') - self.gcode.register_command('QUERY_FILAMENT_WIDTH', self.cmd_M407) - self.gcode.register_command('RESET_FILAMENT_WIDTH_SENSOR', - self.cmd_ClearFilamentArray) - self.gcode.register_command('DISABLE_FILAMENT_WIDTH_SENSOR', - self.cmd_M406) - self.gcode.register_command('ENABLE_FILAMENT_WIDTH_SENSOR', - self.cmd_M405) + self.gcode = self.printer.lookup_object("gcode") + self.gcode.register_command("QUERY_FILAMENT_WIDTH", self.cmd_M407) + self.gcode.register_command( + "RESET_FILAMENT_WIDTH_SENSOR", self.cmd_ClearFilamentArray + ) + self.gcode.register_command("DISABLE_FILAMENT_WIDTH_SENSOR", self.cmd_M406) + self.gcode.register_command("ENABLE_FILAMENT_WIDTH_SENSOR", self.cmd_M405) # Initialization def handle_ready(self): # Load printer objects - self.toolhead = self.printer.lookup_object('toolhead') + self.toolhead = self.printer.lookup_object("toolhead") # Start extrude factor update timer - self.reactor.update_timer(self.extrude_factor_update_timer, - self.reactor.NOW) + self.reactor.update_timer(self.extrude_factor_update_timer, self.reactor.NOW) def adc_callback(self, read_time, read_value): # read sensor value @@ -66,15 +64,16 @@ class FilamentWidthSensor: if len(self.filament_array) > 0: # Get last reading position in array & calculate next # reading position - next_reading_position = (self.filament_array[-1][0] - + MEASUREMENT_INTERVAL_MM) + next_reading_position = self.filament_array[-1][0] + MEASUREMENT_INTERVAL_MM if next_reading_position <= (last_epos + self.measurement_delay): - self.filament_array.append([last_epos + self.measurement_delay, - self.lastFilamentWidthReading]) + self.filament_array.append( + [last_epos + self.measurement_delay, self.lastFilamentWidthReading] + ) else: # add first item to array - self.filament_array.append([self.measurement_delay + last_epos, - self.lastFilamentWidthReading]) + self.filament_array.append( + [self.measurement_delay + last_epos, self.lastFilamentWidthReading] + ) def extrude_factor_update_event(self, eventtime): # Update extrude factor @@ -91,10 +90,12 @@ class FilamentWidthSensor: # Get first item in filament_array queue item = self.filament_array.pop(0) filament_width = item[1] - if ((filament_width <= self.max_diameter) - and (filament_width >= self.min_diameter)): - percentage = round(self.nominal_filament_dia**2 - / filament_width**2 * 100) + if (filament_width <= self.max_diameter) and ( + filament_width >= self.min_diameter + ): + percentage = round( + self.nominal_filament_dia**2 / filament_width**2 * 100 + ) self.gcode.run_script("M221 S" + str(percentage)) else: self.gcode.run_script("M221 S100") @@ -110,8 +111,9 @@ class FilamentWidthSensor: def cmd_M407(self, gcmd): response = "" if self.lastFilamentWidthReading > 0: - response += ("Filament dia (measured mm): " - + str(self.lastFilamentWidthReading)) + response += "Filament dia (measured mm): " + str( + self.lastFilamentWidthReading + ) else: response += "Filament NOT present" gcmd.respond_info(response) @@ -129,8 +131,9 @@ class FilamentWidthSensor: else: self.is_active = True # Start extrude factor update timer - self.reactor.update_timer(self.extrude_factor_update_timer, - self.reactor.NOW) + self.reactor.update_timer( + self.extrude_factor_update_timer, self.reactor.NOW + ) gcmd.respond_info(response) def cmd_M406(self, gcmd): @@ -140,13 +143,15 @@ class FilamentWidthSensor: else: self.is_active = False # Stop extrude factor update timer - self.reactor.update_timer(self.extrude_factor_update_timer, - self.reactor.NEVER) + self.reactor.update_timer( + self.extrude_factor_update_timer, self.reactor.NEVER + ) # Clear filament array self.filament_array = [] # Set extrude multiplier to 100% self.gcode.run_script_from_command("M221 S100") gcmd.respond_info(response) + def load_config(config): return FilamentWidthSensor(config) |