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

tmc2130: optimize mask when iterating over axes 

Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
This commit is contained in:
Alex Voinea 2023-04-09 17:49:28 +02:00
parent 4e31bb94ef
commit 339c080b19
No known key found for this signature in database
GPG Key ID: 37EDFD565CB33BAD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/tmc2130.cpp
View File

@ -268,11 +268,11 @@ void tmc2130_home_enter(uint8_t axes_mask)
{ {
printf_P(PSTR("tmc2130_home_enter(axes_mask=0x%02x)\n"), axes_mask); printf_P(PSTR("tmc2130_home_enter(axes_mask=0x%02x)\n"), axes_mask);
#ifdef TMC2130_SG_HOMING #ifdef TMC2130_SG_HOMING
if (axes_mask & 0x03) //X or Y if (axes_mask & (X_AXIS_MASK | Y_AXIS_MASK)) //X or Y
tmc2130_wait_standstill_xy(1000); tmc2130_wait_standstill_xy(1000);
for (uint8_t axis = X_AXIS; axis <= Z_AXIS; axis++) //X Y and Z axes for (uint8_t axis = X_AXIS, mask = X_AXIS_MASK; axis <= Z_AXIS; axis++, mask <<= 1) //X Y and Z axes
{ {
if (const uint8_t mask = axes_mask & _BV(axis); mask) if (axes_mask & mask)
{ {
tmc2130_sg_homing_axes_mask |= mask; tmc2130_sg_homing_axes_mask |= mask;
//Configuration to spreadCycle //Configuration to spreadCycle
@ -294,9 +294,9 @@ void tmc2130_home_exit()
tmc2130_wait_standstill_xy(1000); tmc2130_wait_standstill_xy(1000);
if (tmc2130_sg_homing_axes_mask) if (tmc2130_sg_homing_axes_mask)
{ {
for (uint8_t axis = X_AXIS; axis <= Z_AXIS; axis++) //X Y and Z axes for (uint8_t axis = X_AXIS, mask = X_AXIS_MASK; axis <= Z_AXIS; axis++, mask <<= 1) //X Y and Z axes
{ {
if (tmc2130_sg_homing_axes_mask & _BV(axis)) if (tmc2130_sg_homing_axes_mask & mask)
{ {
#ifndef TMC2130_STEALTH_Z #ifndef TMC2130_STEALTH_Z
if ((tmc2130_mode == TMC2130_MODE_SILENT) && (axis != Z_AXIS)) if ((tmc2130_mode == TMC2130_MODE_SILENT) && (axis != Z_AXIS))