Merge branch 'master' into amf_activate_existing_presets

This commit is contained in:
bubnikv 2018-06-28 22:00:10 +02:00
commit 6b3c24359b
22 changed files with 135 additions and 236 deletions

View file

@ -142,10 +142,10 @@ public:
}
m_gcode += "G1";
if (std::abs(dx) > EPSILON)
if (std::abs(rot.x - rotated_current_pos.x) > EPSILON)
m_gcode += set_format_X(rot.x);
if (std::abs(dy) > EPSILON)
if (std::abs(rot.y - rotated_current_pos.y) > EPSILON)
m_gcode += set_format_Y(rot.y);
if (e != 0.f)