Separated the Marlin G-code flavor from the RepRap G-code flavor

due to the differences in the M203 code
(RepRap firmware has it in mm/min, Marlin in mm/sec).
This difference is important to the G-code time estimator.

Changed the g-code flavor to Marlin for all Prusa3D bundled profiles.
This commit is contained in:
bubnikv 2018-01-06 18:49:28 +01:00
parent 60a6e7ba8e
commit fec1fcdca8
11 changed files with 45 additions and 49 deletions

View file

@ -2,6 +2,7 @@
#define slic3r_GCodeTimeEstimator_hpp_
#include "libslic3r.h"
#include "PrintConfig.hpp"
#include "GCodeReader.hpp"
namespace Slic3r {
@ -24,17 +25,6 @@ namespace Slic3r {
Num_Axis
};
enum EDialect : unsigned char
{
Unknown,
Marlin,
Repetier,
Smoothieware,
RepRapFirmware,
Teacup,
Num_Dialects
};
enum EPositioningType : unsigned char
{
Absolute,
@ -62,7 +52,7 @@ namespace Slic3r {
struct State
{
EDialect dialect;
GCodeFlavor dialect;
EUnits units;
EPositioningType positioning_xyz_type;
EPositioningType positioning_e_type;
@ -222,8 +212,8 @@ namespace Slic3r {
void set_extrude_factor_override_percentage(float percentage);
float get_extrude_factor_override_percentage() const;
void set_dialect(EDialect dialect);
EDialect get_dialect() const;
void set_dialect(GCodeFlavor dialect);
GCodeFlavor get_dialect() const;
void set_units(EUnits units);
EUnits get_units() const;