extruder: Remove deprecated commands and config
Remove the deprecated SET_EXTRUDER_STEP_DISTANCE and SYNC_STEPPER_TO_EXTRUDER commands. Remove the deprecated shared_heater config option. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
parent
b2ac0f1ce3
commit
2f7b234189
|
@ -71,25 +71,21 @@ pid_Kp: 39
|
||||||
pid_Ki: 2
|
pid_Ki: 2
|
||||||
pid_Kd: 210
|
pid_Kd: 210
|
||||||
|
|
||||||
[extruder1]
|
[extruder_stepper e1]
|
||||||
|
extruder:
|
||||||
step_pin: PA0
|
step_pin: PA0
|
||||||
dir_pin: !PB6
|
dir_pin: !PB6
|
||||||
enable_pin: !PA1
|
enable_pin: !PA1
|
||||||
microsteps: 16
|
microsteps: 16
|
||||||
rotation_distance: 32
|
rotation_distance: 32
|
||||||
nozzle_diameter: 0.4
|
|
||||||
filament_diameter: 1.75
|
|
||||||
shared_heater: extruder
|
|
||||||
|
|
||||||
[extruder2]
|
[extruder_stepper e2]
|
||||||
|
extruder:
|
||||||
step_pin: PB2
|
step_pin: PB2
|
||||||
dir_pin: !PB11
|
dir_pin: !PB11
|
||||||
enable_pin: !PC4
|
enable_pin: !PC4
|
||||||
microsteps: 16
|
microsteps: 16
|
||||||
rotation_distance: 32
|
rotation_distance: 32
|
||||||
nozzle_diameter: 0.4
|
|
||||||
filament_diameter: 1.75
|
|
||||||
shared_heater: extruder
|
|
||||||
|
|
||||||
[heater_bed]
|
[heater_bed]
|
||||||
heater_pin: PB1
|
heater_pin: PB1
|
||||||
|
|
|
@ -449,12 +449,6 @@ MOTION_QUEUE (as defined in an [extruder](Config_Reference.md#extruder)
|
||||||
config section). If MOTION_QUEUE is an empty string then the stepper
|
config section). If MOTION_QUEUE is an empty string then the stepper
|
||||||
will be desynchronized from all extruder movement.
|
will be desynchronized from all extruder movement.
|
||||||
|
|
||||||
#### SET_EXTRUDER_STEP_DISTANCE
|
|
||||||
This command is deprecated and will be removed in the near future.
|
|
||||||
|
|
||||||
#### SYNC_STEPPER_TO_EXTRUDER
|
|
||||||
This command is deprecated and will be removed in the near future.
|
|
||||||
|
|
||||||
### [fan_generic]
|
### [fan_generic]
|
||||||
|
|
||||||
The following command is available when a
|
The following command is available when a
|
||||||
|
|
|
@ -38,12 +38,6 @@ class ExtruderStepper:
|
||||||
gcode.register_mux_command("SYNC_EXTRUDER_MOTION", "EXTRUDER",
|
gcode.register_mux_command("SYNC_EXTRUDER_MOTION", "EXTRUDER",
|
||||||
self.name, self.cmd_SYNC_EXTRUDER_MOTION,
|
self.name, self.cmd_SYNC_EXTRUDER_MOTION,
|
||||||
desc=self.cmd_SYNC_EXTRUDER_MOTION_help)
|
desc=self.cmd_SYNC_EXTRUDER_MOTION_help)
|
||||||
gcode.register_mux_command("SET_EXTRUDER_STEP_DISTANCE", "EXTRUDER",
|
|
||||||
self.name, self.cmd_SET_E_STEP_DISTANCE,
|
|
||||||
desc=self.cmd_SET_E_STEP_DISTANCE_help)
|
|
||||||
gcode.register_mux_command("SYNC_STEPPER_TO_EXTRUDER", "STEPPER",
|
|
||||||
self.name, self.cmd_SYNC_STEPPER_TO_EXTRUDER,
|
|
||||||
desc=self.cmd_SYNC_STEPPER_TO_EXTRUDER_help)
|
|
||||||
def _handle_connect(self):
|
def _handle_connect(self):
|
||||||
toolhead = self.printer.lookup_object('toolhead')
|
toolhead = self.printer.lookup_object('toolhead')
|
||||||
toolhead.register_step_generator(self.stepper.generate_steps)
|
toolhead.register_step_generator(self.stepper.generate_steps)
|
||||||
|
@ -133,24 +127,6 @@ class ExtruderStepper:
|
||||||
self.sync_to_extruder(ename)
|
self.sync_to_extruder(ename)
|
||||||
gcmd.respond_info("Extruder '%s' now syncing with '%s'"
|
gcmd.respond_info("Extruder '%s' now syncing with '%s'"
|
||||||
% (self.name, ename))
|
% (self.name, ename))
|
||||||
cmd_SET_E_STEP_DISTANCE_help = "Set extruder step distance"
|
|
||||||
def cmd_SET_E_STEP_DISTANCE(self, gcmd):
|
|
||||||
step_dist = gcmd.get_float('DISTANCE', None, above=0.)
|
|
||||||
if step_dist is not None:
|
|
||||||
toolhead = self.printer.lookup_object('toolhead')
|
|
||||||
toolhead.flush_step_generation()
|
|
||||||
rd, steps_per_rotation = self.stepper.get_rotation_distance()
|
|
||||||
self.stepper.set_rotation_distance(step_dist * steps_per_rotation)
|
|
||||||
else:
|
|
||||||
step_dist = self.stepper.get_step_dist()
|
|
||||||
gcmd.respond_info("Extruder '%s' step distance set to %0.6f"
|
|
||||||
% (self.name, step_dist))
|
|
||||||
cmd_SYNC_STEPPER_TO_EXTRUDER_help = "Set extruder stepper"
|
|
||||||
def cmd_SYNC_STEPPER_TO_EXTRUDER(self, gcmd):
|
|
||||||
ename = gcmd.get('EXTRUDER')
|
|
||||||
self.sync_to_extruder(ename)
|
|
||||||
gcmd.respond_info("Extruder '%s' now syncing with '%s'"
|
|
||||||
% (self.name, ename))
|
|
||||||
|
|
||||||
# Tracking for hotend heater, extrusion motion queue, and extruder stepper
|
# Tracking for hotend heater, extrusion motion queue, and extruder stepper
|
||||||
class PrinterExtruder:
|
class PrinterExtruder:
|
||||||
|
@ -159,14 +135,9 @@ class PrinterExtruder:
|
||||||
self.name = config.get_name()
|
self.name = config.get_name()
|
||||||
self.last_position = 0.
|
self.last_position = 0.
|
||||||
# Setup hotend heater
|
# Setup hotend heater
|
||||||
shared_heater = config.get('shared_heater', None)
|
|
||||||
pheaters = self.printer.load_object(config, 'heaters')
|
pheaters = self.printer.load_object(config, 'heaters')
|
||||||
gcode_id = 'T%d' % (extruder_num,)
|
gcode_id = 'T%d' % (extruder_num,)
|
||||||
if shared_heater is None:
|
self.heater = pheaters.setup_heater(config, gcode_id)
|
||||||
self.heater = pheaters.setup_heater(config, gcode_id)
|
|
||||||
else:
|
|
||||||
config.deprecate('shared_heater')
|
|
||||||
self.heater = pheaters.lookup_heater(shared_heater)
|
|
||||||
# Setup kinematic checks
|
# Setup kinematic checks
|
||||||
self.nozzle_diameter = config.getfloat('nozzle_diameter', above=0.)
|
self.nozzle_diameter = config.getfloat('nozzle_diameter', above=0.)
|
||||||
filament_diameter = config.getfloat(
|
filament_diameter = config.getfloat(
|
||||||
|
|
Loading…
Reference in New Issue