From 44f9b953c501b639e36368f9e2c0a3ca79964bfc Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 18 Nov 2024 09:51:02 +0100 Subject: [PATCH] remove unused step parameter in lay1cal sqaure --- Firmware/first_lay_cal.cpp | 7 +++---- Firmware/first_lay_cal.h | 2 +- Firmware/ultralcd.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index ff755ee50..018750cd4 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -224,17 +224,16 @@ void lay1cal_meander(float layer_height, float extrusion_width) //! @brief Print square //! -//! This function needs to be called 4 times with step of 0,4,8,12 +//! This function enqueues 4 lines of the square, so it needs to be called multiple times //! //! @param cmd_buffer character buffer needed to format gcodes -//! @param i iteration -void lay1cal_square(uint8_t step, float layer_height, float extrusion_width) +void lay1cal_square(float layer_height, float extrusion_width) { const float Y_spacing = spacing(layer_height, extrusion_width); const float long_extrusion = count_e(layer_height, extrusion_width, square_width); const float short_extrusion = count_e(layer_height, extrusion_width, Y_spacing); - for (uint8_t i = step; i < step+4; ++i) + for (uint8_t i = 0; i < 4; i++) { enquecommandf_P(extrude_fmt_X, square_width*invert, long_extrusion); enquecommandf_P(extrude_fmt_Y, -Y_spacing*invert, short_extrusion); diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 616938e4e..7a2b80f80 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -12,7 +12,7 @@ void lay1cal_intro_line(bool skipExtraPurge, float layer_height, float extrusion void lay1cal_before_meander(); void lay1cal_meander_start(float layer_height, float extrusion_width); void lay1cal_meander(float layer_height, float extrusion_width); -void lay1cal_square(uint8_t step, float layer_height, float extrusion_width); +void lay1cal_square(float layer_height, float extrusion_width); void lay1cal_finish(); #endif /* FIRMWARE_FIRST_LAY_CAL_H_ */ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6191e6a84..cc232611c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -857,16 +857,16 @@ void lcd_commands() lay1cal_meander(layer_height, extrusion_width); break; case 6: - lay1cal_square(0, layer_height, extrusion_width); + lay1cal_square(layer_height, extrusion_width); break; case 5: - lay1cal_square(1, layer_height, extrusion_width); + lay1cal_square(layer_height, extrusion_width); break; case 4: - lay1cal_square(2, layer_height, extrusion_width); + lay1cal_square(layer_height, extrusion_width); break; case 3: - lay1cal_square(3, layer_height, extrusion_width); + lay1cal_square(layer_height, extrusion_width); break; case 2: lay1cal_finish();