From 7d3c416d04268ece849e28c603c456ec277b32c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Thu, 5 Oct 2023 12:02:38 +0000 Subject: [PATCH] cleanup: remove unused function sm4_line_xyze_ui No change in code size. Reason for removing this function is just to reduce lines of code that is maintained. --- Firmware/sm4.c | 54 -------------------------------------------------- Firmware/sm4.h | 1 - 2 files changed, 55 deletions(-) diff --git a/Firmware/sm4.c b/Firmware/sm4.c index 04befb77c..cfdae121a 100644 --- a/Firmware/sm4.c +++ b/Firmware/sm4.c @@ -148,60 +148,6 @@ void sm4_do_step(uint8_t axes_mask) #endif //((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3) || (MOTHERBOARD == BOARD_EINSY_1_0a)) } -uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de) -{ - uint16_t dd = (uint16_t)(sqrt((float)(((uint32_t)dx)*dx + ((uint32_t)dy*dy) + ((uint32_t)dz*dz) + ((uint32_t)de*de))) + 0.5); - uint16_t nd = dd; - uint16_t cx = dd; - uint16_t cy = dd; - uint16_t cz = dd; - uint16_t ce = dd; - uint16_t x = 0; - uint16_t y = 0; - uint16_t z = 0; - uint16_t e = 0; - while (nd) - { - if (sm4_stop_cb && (*sm4_stop_cb)()) break; - uint8_t sm = 0; //step mask - if (cx <= dx) - { - sm |= 1; - cx += dd; - x++; - } - if (cy <= dy) - { - sm |= 2; - cy += dd; - y++; - } - if (cz <= dz) - { - sm |= 4; - cz += dd; - z++; - } - if (ce <= de) - { - sm |= 8; - ce += dd; - e++; - } - cx -= dx; - cy -= dy; - cz -= dz; - ce -= de; - sm4_do_step(sm); - uint16_t delay = SM4_DEFDELAY; - if (sm4_calc_delay_cb) delay = (*sm4_calc_delay_cb)(nd, dd); - if (delay) delayMicroseconds(delay); - nd--; - } - if (sm4_update_pos_cb) (*sm4_update_pos_cb)(x, y, z, e); - return nd; -} - uint16_t sm4_line_xyz_ui(uint16_t dx, uint16_t dy, uint16_t dz){ uint16_t dd = (uint16_t)(sqrt((float)(((uint32_t)dx)*dx + ((uint32_t)dy*dy) + ((uint32_t)dz*dz))) + 0.5); uint16_t nd = dd; diff --git a/Firmware/sm4.h b/Firmware/sm4.h index 9b5531548..a1b22a1f4 100644 --- a/Firmware/sm4.h +++ b/Firmware/sm4.h @@ -47,7 +47,6 @@ extern void sm4_set_dir_bits(uint8_t dir_bits); extern void sm4_do_step(uint8_t axes_mask); // xyze linear-interpolated relative move, returns remaining diagonal steps (>0 means stoped) -extern uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); extern uint16_t sm4_line_xyz_ui(uint16_t dx, uint16_t dy, uint16_t dz);