nedko/gcode-estimator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TimeCalc reset no longer removes the printer settings.

Browse Source
This commit is contained in:
DocWibbleyWobbley 2023-06-23 13:41:26 +03:00
parent a781743a45
commit ede43194c4
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TimeCalc.cpp
View File

@ -197,22 +197,21 @@ TimeCalc::PrinterMove::PrinterMove()
} }
TimeCalc::TimeCalc() TimeCalc::TimeCalc()
: m_time(0.0), m_print_accel_max(0.0), m_travel_accel_max(0.0) : m_time(0.0), m_print_accel_max(0.0), m_travel_accel_max(0.0),
m_retract_accel_max(0.0)
{ {
fill_n(m_accel_max, AXIS_COUNT, 0.0);
fill_n(m_vel_max, AXIS_COUNT, 0.0);
fill_n(m_jerk_max, AXIS_COUNT, 0.0);
reset(); reset();
} }
void TimeCalc::reset() void TimeCalc::reset()
{ {
m_time = 0.0; m_time = 0.0;
m_print_accel_max = 0.0;
m_travel_accel_max = 0.0;
fill_n(m_extruder_length, EXTRUDER_COUNT, 0.0); fill_n(m_extruder_length, EXTRUDER_COUNT, 0.0);
fill_n(m_pos, AXIS_COUNT, 0.0); fill_n(m_pos, AXIS_COUNT, 0.0);
fill_n(m_accel_max, AXIS_COUNT, 0.0);
fill_n(m_vel_max, AXIS_COUNT, 0.0);
fill_n(m_jerk_max, AXIS_COUNT, 0.0);
m_moves.clear(); m_moves.clear();
} }

2
main.cpp
View File

@ -270,11 +270,11 @@ int main(int argc, char **argv)
} }
init_map(gcode_map); init_map(gcode_map);
init_calc(argv[0], calc);
for (string& fname : filenames) for (string& fname : filenames)
{ {
calc.reset(); calc.reset();
init_calc(argv[0], calc);
speed = 0; speed = 0;
file.open(fname); file.open(fname);