Use float for elapsed_time
When accumulating elapsed_time from many moves that take less than 1 second, elapsed_time does not get incremented because (unsigned int)0.9 = 0.
This commit is contained in:
parent
4c622c504f
commit
3d73fbf5fd
3 changed files with 4 additions and 4 deletions
|
@ -198,7 +198,7 @@ Wipe::wipe(GCode &gcodegen, bool toolchange)
|
||||||
|
|
||||||
GCode::GCode()
|
GCode::GCode()
|
||||||
: placeholder_parser(NULL), enable_loop_clipping(true), enable_cooling_markers(false), layer_count(0),
|
: placeholder_parser(NULL), enable_loop_clipping(true), enable_cooling_markers(false), layer_count(0),
|
||||||
layer_index(-1), layer(NULL), first_layer(false), elapsed_time(0), volumetric_speed(0),
|
layer_index(-1), layer(NULL), first_layer(false), elapsed_time(0.0), volumetric_speed(0),
|
||||||
_last_pos_defined(false)
|
_last_pos_defined(false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,7 @@ class GCode {
|
||||||
const Layer* layer;
|
const Layer* layer;
|
||||||
std::map<const PrintObject*,Point> _seam_position;
|
std::map<const PrintObject*,Point> _seam_position;
|
||||||
bool first_layer; // this flag triggers first layer speeds
|
bool first_layer; // this flag triggers first layer speeds
|
||||||
unsigned int elapsed_time; // seconds
|
float elapsed_time; // seconds
|
||||||
double volumetric_speed;
|
double volumetric_speed;
|
||||||
|
|
||||||
GCode();
|
GCode();
|
||||||
|
|
|
@ -129,9 +129,9 @@
|
||||||
void set_first_layer(bool value)
|
void set_first_layer(bool value)
|
||||||
%code{% THIS->first_layer = value; %};
|
%code{% THIS->first_layer = value; %};
|
||||||
|
|
||||||
unsigned int elapsed_time()
|
float elapsed_time()
|
||||||
%code{% RETVAL = THIS->elapsed_time; %};
|
%code{% RETVAL = THIS->elapsed_time; %};
|
||||||
void set_elapsed_time(unsigned int value)
|
void set_elapsed_time(float value)
|
||||||
%code{% THIS->elapsed_time = value; %};
|
%code{% THIS->elapsed_time = value; %};
|
||||||
|
|
||||||
bool last_pos_defined();
|
bool last_pos_defined();
|
||||||
|
|
Loading…
Add table
Reference in a new issue