gcode: Rename run_script() to run_script_from_command()
Emphasize that the run_script() method is only valid when run from a g-code command. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
parent
53b718a621
commit
4ad44e3e83
|
@ -46,7 +46,7 @@ class BedTiltCalibrate:
|
|||
desc=self.cmd_BED_TILT_CALIBRATE_help)
|
||||
cmd_BED_TILT_CALIBRATE_help = "Bed tilt calibration script"
|
||||
def cmd_BED_TILT_CALIBRATE(self, params):
|
||||
self.gcode.run_script("G28")
|
||||
self.gcode.run_script_from_command("G28")
|
||||
self.probe_helper.start_probe()
|
||||
def get_probed_position(self):
|
||||
kin = self.printer.lookup_object('toolhead').get_kinematics()
|
||||
|
|
|
@ -28,7 +28,7 @@ class DeltaCalibrate:
|
|||
desc=self.cmd_DELTA_CALIBRATE_help)
|
||||
cmd_DELTA_CALIBRATE_help = "Delta calibration script"
|
||||
def cmd_DELTA_CALIBRATE(self, params):
|
||||
self.gcode.run_script("G28")
|
||||
self.gcode.run_script_from_command("G28")
|
||||
self.probe_helper.start_probe()
|
||||
def get_probed_position(self):
|
||||
kin = self.printer.lookup_object('toolhead').get_kinematics()
|
||||
|
|
|
@ -21,7 +21,7 @@ class GCodeMacro:
|
|||
raise self.gcode.error("Macro %s called recursively" % (self.alias,))
|
||||
self.in_script = True
|
||||
try:
|
||||
self.gcode.run_script(self.script)
|
||||
self.gcode.run_script_from_command(self.script)
|
||||
finally:
|
||||
self.in_script = False
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ class HomingOverride:
|
|||
# Perform homing
|
||||
try:
|
||||
self.in_script = True
|
||||
self.gcode.run_script(self.script)
|
||||
self.gcode.run_script_from_command(self.script)
|
||||
finally:
|
||||
self.in_script = False
|
||||
|
||||
|
|
|
@ -106,10 +106,10 @@ class ProbeEndstopWrapper:
|
|||
self.query_endstop_wait = self.mcu_endstop.query_endstop_wait
|
||||
self.TimeoutError = self.mcu_endstop.TimeoutError
|
||||
def home_prepare(self):
|
||||
self.gcode.run_script(self.activate_gcode)
|
||||
self.gcode.run_script_from_command(self.activate_gcode)
|
||||
self.mcu_endstop.home_prepare()
|
||||
def home_finalize(self):
|
||||
self.gcode.run_script(self.deactivate_gcode)
|
||||
self.gcode.run_script_from_command(self.deactivate_gcode)
|
||||
self.mcu_endstop.home_finalize()
|
||||
|
||||
# Wrapper that records the last XY position of a virtual endstop probe
|
||||
|
@ -186,7 +186,7 @@ class ProbePointsHelper:
|
|||
if self.probe is not None:
|
||||
try:
|
||||
while self.busy:
|
||||
self.gcode.run_script("PROBE")
|
||||
self.gcode.run_script_from_command("PROBE")
|
||||
self.cmd_NEXT({})
|
||||
except:
|
||||
self.finalize(False)
|
||||
|
|
|
@ -235,7 +235,7 @@ class GCodeParser:
|
|||
self.process_pending()
|
||||
self.is_processing_data = False
|
||||
return True
|
||||
def run_script(self, script):
|
||||
def run_script_from_command(self, script):
|
||||
prev_need_ack = self.need_ack
|
||||
try:
|
||||
self.process_commands(script.split('\n'), need_ack=False)
|
||||
|
@ -390,7 +390,7 @@ class GCodeParser:
|
|||
e = extruders[index]
|
||||
if self.extruder is e:
|
||||
return
|
||||
self.run_script(self.extruder.get_activate_gcode(False))
|
||||
self.run_script_from_command(self.extruder.get_activate_gcode(False))
|
||||
try:
|
||||
self.toolhead.set_extruder(e)
|
||||
except homing.EndstopError as e:
|
||||
|
@ -399,7 +399,7 @@ class GCodeParser:
|
|||
self.reset_last_position()
|
||||
self.extrude_factor = 1.
|
||||
self.base_position[3] = self.last_position[3]
|
||||
self.run_script(self.extruder.get_activate_gcode(True))
|
||||
self.run_script_from_command(self.extruder.get_activate_gcode(True))
|
||||
def cmd_mux(self, params):
|
||||
key, values = self.mux_commands[params['#command']]
|
||||
if None in values:
|
||||
|
|
Loading…
Reference in New Issue