3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bugfix: use Lift-z option for 2. extruder #3385

Browse source 
Thanks to https://github.com/platsch
https://github.com/alexrj/Slic3r/pull/3392
This commit is contained in:
bubnikv 2016-09-26 12:49:29 +02:00
parent edc70e27d9
commit 088b0dab90
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/libslic3r/GCodeWriter.cpp
View file

@ -500,10 +500,10 @@ GCodeWriter::lift()
// check whether the above/below conditions are met // check whether the above/below conditions are met
double target_lift = 0; double target_lift = 0;
{ {
double above = this->config.retract_lift_above.get_at(0); double above = this->config.retract_lift_above.get_at(this->_extruder->id);
double below = this->config.retract_lift_below.get_at(0); double below = this->config.retract_lift_below.get_at(this->_extruder->id);
if (this->_pos.z >= above && (below == 0 || this->_pos.z <= below)) if (this->_pos.z >= above && (below == 0 || this->_pos.z <= below))
target_lift = this->config.retract_lift.get_at(0); target_lift = this->config.retract_lift.get_at(this->_extruder->id);
} }
if (this->_lifted == 0 && target_lift > 0) { if (this->_lifted == 0 && target_lift > 0) {
this->_lifted = target_lift; this->_lifted = target_lift;

8
xs/src/libslic3r/GCodeWriter.hpp
View file

@ -10,7 +10,7 @@
namespace Slic3r { namespace Slic3r {
class GCodeWriter { class GCodeWriter {
public: public:
GCodeConfig config; GCodeConfig config;
std::map<unsigned int,Extruder> extruders; std::map<unsigned int,Extruder> extruders;
bool multiple_extruders; bool multiple_extruders;
@ -48,7 +48,7 @@ class GCodeWriter {
std::string unlift(); std::string unlift();
Pointf3 get_position() const; Pointf3 get_position() const;
private: private:
std::string _extrusion_axis; std::string _extrusion_axis;
Extruder* _extruder; Extruder* _extruder;
unsigned int _last_acceleration; unsigned int _last_acceleration;
@ -60,6 +60,6 @@ class GCodeWriter {
std::string _retract(double length, double restart_extra, const std::string &comment); std::string _retract(double length, double restart_extra, const std::string &comment);
}; };
} } /* namespace Slic3r */
#endif #endif /* slic3r_GCodeWriter_hpp_ */