mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: readd M220 command 

1.Backup and restore extrusion speed when tool change

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0c00391f0169dde69dab0d5120d03238aafa0862
(cherry picked from commit 2d96a9078f41764cbd5b7f5be1285025fc69f8fa)
This commit is contained in:
xun.zhang 2024-09-24 11:45:58 +08:00 committed by Lane.Wei
parent 72bc6f44cf
commit 1e214c08a3
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/GCode/WipeTower.cpp
View File

@ -415,26 +415,22 @@ public:
return *this; return *this;
} }
// Let the firmware back up the active speed override value. // Let the firmware back up the active speed override value.
WipeTowerWriter& speed_override_backup() WipeTowerWriter& speed_override_backup()
{ {
// BBS: BBL machine don't support speed backup // BBS: BBL machine don't support speed backup
#if 0
if (m_gcode_flavor == gcfMarlinLegacy || m_gcode_flavor == gcfMarlinFirmware) if (m_gcode_flavor == gcfMarlinLegacy || m_gcode_flavor == gcfMarlinFirmware)
m_gcode += "M220 B\n"; m_gcode += "M220 B\n";
#endif return *this;
return *this;
} }
// Let the firmware restore the active speed override value. // Let the firmware restore the active speed override value.
WipeTowerWriter& speed_override_restore() WipeTowerWriter& speed_override_restore()
{ {
// BBS: BBL machine don't support speed restore // BBS: BBL machine don't support speed restore
#if 0
if (m_gcode_flavor == gcfMarlinLegacy || m_gcode_flavor == gcfMarlinFirmware) if (m_gcode_flavor == gcfMarlinLegacy || m_gcode_flavor == gcfMarlinFirmware)
m_gcode += "M220 R\n"; m_gcode += "M220 R\n";
#endif return *this;
return *this;
} }
// Set digital trimpot motor // Set digital trimpot motor
@ -776,7 +772,7 @@ WipeTower::ToolChangeResult WipeTower::tool_change(size_t tool, bool extrude_per
.append(";--------------------\n"); .append(";--------------------\n");
writer.speed_override_backup(); writer.speed_override_backup();
writer.speed_override(100); writer.speed_override(100);
Vec2f initial_position = cleaning_box.ld + Vec2f(0.f, m_depth_traversed); Vec2f initial_position = cleaning_box.ld + Vec2f(0.f, m_depth_traversed);
writer.set_initial_position(initial_position, m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation); writer.set_initial_position(initial_position, m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation);
@ -819,7 +815,7 @@ WipeTower::ToolChangeResult WipeTower::tool_change(size_t tool, bool extrude_per
//BBS //BBS
//if (m_set_extruder_trimpot) //if (m_set_extruder_trimpot)
// writer.set_extruder_trimpot(550); // Reset the extruder current to a normal value. // writer.set_extruder_trimpot(550); // Reset the extruder current to a normal value.
writer.speed_override_restore(); writer.speed_override_restore();
writer.feedrate(m_travel_speed * 60.f) writer.feedrate(m_travel_speed * 60.f)
.flush_planner_queue() .flush_planner_queue()
.reset_extruder() .reset_extruder()