josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused step parameter in lay1cal sqaure

This commit is contained in:
Alex Voinea 2024-11-18 09:51:02 +01:00
parent 0b5afa3092
commit 44f9b953c5
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/first_lay_cal.cpp
View File

@ -224,17 +224,16 @@ void lay1cal_meander(float layer_height, float extrusion_width)
//! @brief Print square //! @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 cmd_buffer character buffer needed to format gcodes
//! @param i iteration void lay1cal_square(float layer_height, float extrusion_width)
void lay1cal_square(uint8_t step, float layer_height, float extrusion_width)
{ {
const float Y_spacing = spacing(layer_height, 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 long_extrusion = count_e(layer_height, extrusion_width, square_width);
const float short_extrusion = count_e(layer_height, extrusion_width, Y_spacing); 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_X, square_width*invert, long_extrusion);
enquecommandf_P(extrude_fmt_Y, -Y_spacing*invert, short_extrusion); enquecommandf_P(extrude_fmt_Y, -Y_spacing*invert, short_extrusion);

2
Firmware/first_lay_cal.h
View File

@ -12,7 +12,7 @@ void lay1cal_intro_line(bool skipExtraPurge, float layer_height, float extrusion
void lay1cal_before_meander(); void lay1cal_before_meander();
void lay1cal_meander_start(float layer_height, float extrusion_width); void lay1cal_meander_start(float layer_height, float extrusion_width);
void lay1cal_meander(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(); void lay1cal_finish();
#endif /* FIRMWARE_FIRST_LAY_CAL_H_ */ #endif /* FIRMWARE_FIRST_LAY_CAL_H_ */

8
Firmware/ultralcd.cpp
View File

@ -857,16 +857,16 @@ void lcd_commands()
lay1cal_meander(layer_height, extrusion_width); lay1cal_meander(layer_height, extrusion_width);
break; break;
case 6: case 6:
lay1cal_square(0, layer_height, extrusion_width); lay1cal_square(layer_height, extrusion_width);
break; break;
case 5: case 5:
lay1cal_square(1, layer_height, extrusion_width); lay1cal_square(layer_height, extrusion_width);
break; break;
case 4: case 4:
lay1cal_square(2, layer_height, extrusion_width); lay1cal_square(layer_height, extrusion_width);
break; break;
case 3: case 3:
lay1cal_square(3, layer_height, extrusion_width); lay1cal_square(layer_height, extrusion_width);
break; break;
case 2: case 2:
lay1cal_finish(); lay1cal_finish();