From ede43194c44afe42b1a16bcf59346582948e0d8b Mon Sep 17 00:00:00 2001 From: DocWibbleyWobbley Date: Fri, 23 Jun 2023 13:41:26 +0300 Subject: [PATCH] TimeCalc reset no longer removes the printer settings. --- TimeCalc.cpp | 11 +++++------ main.cpp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/TimeCalc.cpp b/TimeCalc.cpp index b278f55..203c500 100644 --- a/TimeCalc.cpp +++ b/TimeCalc.cpp @@ -197,22 +197,21 @@ TimeCalc::PrinterMove::PrinterMove() } 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(); } void TimeCalc::reset() { 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_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(); } diff --git a/main.cpp b/main.cpp index bafd47b..9a1b61c 100644 --- a/main.cpp +++ b/main.cpp @@ -270,11 +270,11 @@ int main(int argc, char **argv) } init_map(gcode_map); + init_calc(argv[0], calc); for (string& fname : filenames) { calc.reset(); - init_calc(argv[0], calc); speed = 0; file.open(fname);