3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of a G-code comment. Fixes

Browse source 
Incorrect filament profile being used during purge - always set to PLA.
This commit is contained in:
bubnikv 2019-01-29 18:28:52 +01:00
parent 7bfc60e805
commit 49bb90523a
2 changed files with 19 additions and 16 deletions

34
src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View file

@ -381,22 +381,7 @@ public:
Writer& comment_material(WipeTowerPrusaMM::material_type material) Writer& comment_material(WipeTowerPrusaMM::material_type material)
{ {
m_gcode += "; material : "; m_gcode += "; material : ";
switch (material) m_gcode += WipeTowerPrusaMM::to_string(material) + "\n";
{
case WipeTowerPrusaMM::PVA:
m_gcode += "#8 (PVA)";
break;
case WipeTowerPrusaMM::SCAFF:
m_gcode += "#5 (Scaffold)";
break;
case WipeTowerPrusaMM::FLEX:
m_gcode += "#4 (Flex)";
break;
default:
m_gcode += "DEFAULT (PLA)";
break;
}
m_gcode += "\n";
return *this; return *this;
}; };
@ -487,6 +472,23 @@ WipeTowerPrusaMM::material_type WipeTowerPrusaMM::parse_material(const char *nam
return INVALID; return INVALID;
} }
std::string WipeTowerPrusaMM::to_string(material_type material)
{
switch (material) {
case PLA: return "PLA";
case ABS: return "ABS";
case PET: return "PET";
case HIPS: return "HIPS";
case FLEX: return "FLEX";
case SCAFF: return "SCAFF";
case EDGE: return "EDGE";
case NGEN: return "NGEN";
case PVA: return "PVA";
case INVALID:
default: return "INVALID";
}
}
// Returns gcode to prime the nozzles at the front edge of the print bed. // Returns gcode to prime the nozzles at the front edge of the print bed.
WipeTower::ToolChangeResult WipeTowerPrusaMM::prime( WipeTower::ToolChangeResult WipeTowerPrusaMM::prime(
// print_z of the first layer. // print_z of the first layer.

1
src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View file

@ -38,6 +38,7 @@ public:
// Parse material name into material_type. // Parse material name into material_type.
static material_type parse_material(const char *name); static material_type parse_material(const char *name);
static std::string to_string(material_type material);
// x -- x coordinates of wipe tower in mm ( left bottom corner ) // x -- x coordinates of wipe tower in mm ( left bottom corner )
// y -- y coordinates of wipe tower in mm ( left bottom corner ) // y -- y coordinates of wipe tower in mm ( left bottom corner )