3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 08:41:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Changed handling of extruder temperatures

Browse source 
for single_extruder_multi_material printers.
Fixed some compilation errors on OSX.
Disabled re-slicing on change of new G-code only parameters.
This commit is contained in:
bubnikv 2017-05-16 16:02:52 +02:00
parent 21be680ac2
commit 7b152919a6
5 changed files with 59 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View file

@ -98,7 +98,7 @@ public:
{ return extrude_explicit(x, m_current_pos.y, e, f); }
Writer& retract(float e, float f = 0.f)
{ return retract(-e, f); }
{ return deretract(-e, f); }
Writer& z_hop(float hop, float f = 0.f) {
m_gcode += std::string("G1") + set_format_Z(m_current_z + hop);
@ -277,7 +277,7 @@ std::pair<std::string, WipeTower::xy> WipeTowerPrusaMM::tool_change(int tool)
// or there must be a nonzero wipe tower partitions available.
assert(tool < 0 || it_layer_tools->wipe_tower_partitions > 0);
if (m_layer_change_in_layer == size_t(-1))
if (m_layer_change_in_layer == (unsigned int)(-1))
// First layer, prime the extruder.
return toolchange_Brim(tool);

5
xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View file

@ -2,6 +2,7 @@
#define WipeTowerPrusaMM_hpp_
#include <algorithm>
#include <cmath>
#include <string>
#include <utility>
@ -84,10 +85,10 @@ public:
m_is_first_layer = is_first_layer;
m_is_last_layer = is_last_layer;
// Start counting the color changes from zero.
m_layer_change_in_layer = is_first_layer ? size_t(-1) : 0;
m_layer_change_in_layer = is_first_layer ? (unsigned int)(-1) : 0;
m_current_wipe_start_y = 0.f;
int layer_idx = int(floor(layer_height * 100) + 0.5f);
int layer_idx = int(std::floor(layer_height * 100) + 0.5f);
switch (layer_idx)
{
case 15: