From eb9c8c8c20c66f7ab9156124803b5304952ab446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Thu, 24 Jun 2021 17:20:55 +0000 Subject: [PATCH] Improve mc_arc() parameters - Make the mc_arc() function declaration consistent with the definition - isclockwise is supposed to be bool type, given how it is used. --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 2 +- Firmware/motion_control.cpp | 2 +- Firmware/motion_control.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index c2c5ca933..9bda145b8 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -246,7 +246,7 @@ void finishAndDisableSteppers(); //put an ASCII command at the begin of the current buffer, read from flash #define enquecommand_front_P(cmd) enquecommand_front(cmd, true) -void prepare_arc_move(char isclockwise); +void prepare_arc_move(bool isclockwise); void clamp_to_software_endstops(float target[3]); void refresh_cmd_timeout(void); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8131c4a97..023b646fa 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9751,7 +9751,7 @@ void prepare_move() set_current_to_destination(); } -void prepare_arc_move(char isclockwise) { +void prepare_arc_move(bool isclockwise) { float r = hypot(offset[X_AXIS], offset[Y_AXIS]); // Compute arc radius for mc_arc // Trace the arc diff --git a/Firmware/motion_control.cpp b/Firmware/motion_control.cpp index b26cbafc8..91d0bc641 100644 --- a/Firmware/motion_control.cpp +++ b/Firmware/motion_control.cpp @@ -26,7 +26,7 @@ // The arc is approximated by generating a huge number of tiny, linear segments. The length of each // segment is configured in settings.mm_per_arc_segment. void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8_t axis_1, - uint8_t axis_linear, float feed_rate, float radius, uint8_t isclockwise, uint8_t extruder) + uint8_t axis_linear, float feed_rate, float radius, bool isclockwise, uint8_t extruder) { // int acceleration_manager_was_enabled = plan_is_acceleration_manager_enabled(); // plan_set_acceleration_manager_enabled(false); // disable acceleration management for the duration of the arc diff --git a/Firmware/motion_control.h b/Firmware/motion_control.h index ca50f8098..8f5f6fff6 100644 --- a/Firmware/motion_control.h +++ b/Firmware/motion_control.h @@ -26,7 +26,7 @@ // offset == offset from current xyz, axis_XXX defines circle plane in tool space, axis_linear is // the direction of helical travel, radius == circle radius, isclockwise boolean. Used // for vector transformation direction. -void mc_arc(float *position, float *target, float *offset, unsigned char axis_0, unsigned char axis_1, - unsigned char axis_linear, float feed_rate, float radius, unsigned char isclockwise, uint8_t extruder); +void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8_t axis_1, + uint8_t axis_linear, float feed_rate, float radius, bool isclockwise, uint8_t extruder); #endif