h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stepper: No need to pass printer reference to kinematic/stepper constructors

Browse Source 
The config reference already stores a reference to the printer object.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2018-06-21 13:47:39 -04:00
parent 76e2b041b4
commit d0590ccb0e
6 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
klippy/extruder.py
View File

@@ -9,16 +9,16 @@ import stepper, homing, chelper
EXTRUDE_DIFF_IGNORE = 1.02
class PrinterExtruder:
def __init__(self, printer, config):
self.printer = printer
def __init__(self, config):
self.printer = config.get_printer()
self.name = config.get_name()
shared_heater = config.get('shared_heater', None)
pheater = printer.lookup_object('heater')
pheater = self.printer.lookup_object('heater')
if shared_heater is None:
self.heater = pheater.setup_heater(config)
else:
self.heater = pheater.lookup_heater(shared_heater)
self.stepper = stepper.PrinterStepper(printer, config)
self.stepper = stepper.PrinterStepper(config)
self.nozzle_diameter = config.getfloat('nozzle_diameter', above=0.)
filament_diameter = config.getfloat(
'filament_diameter', minval=self.nozzle_diameter)
@@ -28,7 +28,7 @@ class PrinterExtruder:
, above=0.)
self.max_extrude_ratio = max_cross_section / self.filament_area
logging.info("Extruder max_extrude_ratio=%.6f", self.max_extrude_ratio)
toolhead = printer.lookup_object('toolhead')
toolhead = self.printer.lookup_object('toolhead')
max_velocity, max_accel = toolhead.get_max_velocity()
self.max_e_velocity = config.getfloat(
'max_extrude_only_velocity', max_velocity * self.max_extrude_ratio
@@ -236,12 +236,11 @@ def add_printer_objects(printer, config):
section = 'extruder%d' % (i,)
if not config.has_section(section):
if not i and config.has_section('extruder'):
printer.add_object('extruder0', PrinterExtruder(
printer, config.getsection('extruder')))
pe = PrinterExtruder(config.getsection('extruder'))
printer.add_object('extruder0', pe)
continue
break
printer.add_object(section, PrinterExtruder(
printer, config.getsection(section)))
printer.add_object(section, PrinterExtruder(config.getsection(section)))
def get_printer_extruders(printer):
out = []