Changed handling of extruder temperatures

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

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: