diff options
| author | FormerLurker <hochgebe@gmail.com> | 2020-05-10 19:37:34 +0300 |
|---|---|---|
| committer | FormerLurker <hochgebe@gmail.com> | 2020-05-10 19:37:34 +0300 |
| commit | 4a1f1d55ff5e685a9f2818da7bf3f5e6bf0394d6 (patch) | |
| tree | 6651c47d87298138aad30b28212c91d948fc5a92 /ArcWelderInverseProcessor | |
| parent | 7be8bb7021bfe8e2ea79f572e798e17494253a5c (diff) | |
Replace math.h with cmath. Add settings and copyright to gcode output. Add line break to console progress output.
Diffstat (limited to 'ArcWelderInverseProcessor')
| -rw-r--r-- | ArcWelderInverseProcessor/inverse_processor.cpp | 4 | ||||
| -rw-r--r-- | ArcWelderInverseProcessor/inverse_processor.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ArcWelderInverseProcessor/inverse_processor.cpp b/ArcWelderInverseProcessor/inverse_processor.cpp index 449d6c1..6717700 100644 --- a/ArcWelderInverseProcessor/inverse_processor.cpp +++ b/ArcWelderInverseProcessor/inverse_processor.cpp @@ -48,7 +48,7 @@ */ #include "inverse_processor.h" - +#include <cmath> //#include "Marlin.h" //#include "stepper.h" @@ -308,7 +308,7 @@ void inverse_processor::mc_arc(float* position, float* target, float* offset, fl // 20200417 - FormerLurker - rename millimeters_of_travel to millimeters_of_travel_arc to better describe what we are // calculating here - float millimeters_of_travel_arc = hypot(angular_travel_total * radius, fabs(travel_z)); + float millimeters_of_travel_arc = hypot(angular_travel_total * radius, std::abs(travel_z)); if (millimeters_of_travel_arc < 0.001) { return; } // Calculate the total travel per segment // Calculate the number of arc segments diff --git a/ArcWelderInverseProcessor/inverse_processor.h b/ArcWelderInverseProcessor/inverse_processor.h index 7d5a313..d17386e 100644 --- a/ArcWelderInverseProcessor/inverse_processor.h +++ b/ArcWelderInverseProcessor/inverse_processor.h @@ -26,7 +26,6 @@ #include <string> #include "gcode_position.h" -#include "math.h" #include <iostream> #include <string> #include <sstream> |