Skip to content

Commit

Permalink
Fixed #2537: pa pattern issues on delta printers
Browse files Browse the repository at this point in the history
  • Loading branch information
SoftFever committed Nov 6, 2023
1 parent bea9b54 commit 9f599cd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
11 changes: 2 additions & 9 deletions src/libslic3r/calib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,14 @@ CalibPressureAdvancePattern::CalibPressureAdvancePattern(
};

void CalibPressureAdvancePattern::generate_custom_gcodes(const DynamicPrintConfig &config,
bool is_bbl_machine,
bool is_bbl_machine,
Model &model,
const Vec3d &origin)
{
std::stringstream gcode;
gcode << "; start pressure advance pattern for layer\n";

refresh_setup(config, is_bbl_machine, model, origin);
refresh_setup(config, is_bbl_machine, model, origin);

gcode << move_to(Vec2d(m_starting_point.x(), m_starting_point.y()), m_writer, "Move to start XY position");
gcode << m_writer.travel_to_z(height_first_layer(), "Move to start Z position");
Expand Down Expand Up @@ -686,8 +686,6 @@ void CalibPressureAdvancePattern::refresh_setup(const DynamicPrintConfig &config
m_config.apply(model.objects.front()->config.get(), true);
m_config.apply(model.objects.front()->volumes.front()->config.get(), true);

m_is_delta = (m_config.option<ConfigOptionPoints>("printable_area")->values.size() > 4);

_refresh_starting_point(model);
_refresh_writer(is_bbl_machine, model, origin);
}
Expand All @@ -702,11 +700,6 @@ void CalibPressureAdvancePattern::_refresh_starting_point(const Model &model)

m_starting_point = Vec3d(bbox.min.x(), bbox.max.y(), 0);
m_starting_point.y() += m_handle_spacing;

if (m_is_delta) {
m_starting_point.x() *= -1;
m_starting_point.y() -= (frame_size_y() / 2);
}
}

void CalibPressureAdvancePattern::_refresh_writer(bool is_bbl_machine, const Model &model, const Vec3d &origin)
Expand Down
1 change: 0 additions & 1 deletion src/libslic3r/calib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ class CalibPressureAdvancePattern : public CalibPressureAdvance
const Calib_Params &m_params;

GCodeWriter m_writer;
bool m_is_delta;
Vec3d m_starting_point;
bool m_is_start_point_fixed = false;

Expand Down

0 comments on commit 9f599cd

Please sign in to comment.