Commit 81a6c274 authored by 崔立宝's avatar 崔立宝

变更项2、去掉电机零点检测前面的判断条件#ifdef STEPPER_MOTOR_X_ZERO_SW(X=0、1、2、3)和与其配套的#endif

parent 97495bbe
......@@ -7,6 +7,8 @@
******************************************************************************/
#include "Stepper_Motor.h"
#include "GPIO.h"
volatile uint16_t StepperMotor0CurStep;
volatile uint16_t StepperMotor0DstStep;
......@@ -517,7 +519,7 @@ void Stepper_Motor_Reset(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x0E;
#ifdef STEPPER_MOTOR_0_ZERO_SW
//#ifdef STEPPER_MOTOR_0_ZERO_SW
if (STEPPER_MOTOR_0_ZERO_SW == 0)
{
if (StepperMotor0.ZeroSw == 0)
......@@ -532,7 +534,7 @@ void Stepper_Motor_Reset(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
#if STEPPER_MOTOR_1_ENABLE
......@@ -540,7 +542,7 @@ void Stepper_Motor_Reset(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x0D;
#ifdef STEPPER_MOTOR_1_ZERO_SW
//#ifdef STEPPER_MOTOR_1_ZERO_SW
if (STEPPER_MOTOR_1_ZERO_SW == 0)
{
if (StepperMotor1.ZeroSw == 0)
......@@ -555,7 +557,7 @@ void Stepper_Motor_Reset(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
#if STEPPER_MOTOR_2_ENABLE
......@@ -563,7 +565,7 @@ void Stepper_Motor_Reset(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x0B;
#ifdef STEPPER_MOTOR_2_ZERO_SW
//#ifdef STEPPER_MOTOR_2_ZERO_SW
if (STEPPER_MOTOR_2_ZERO_SW == 0)
{
if (StepperMotor2.ZeroSw == 0)
......@@ -578,7 +580,7 @@ void Stepper_Motor_Reset(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
#if STEPPER_MOTOR_3_ENABLE
......@@ -586,7 +588,7 @@ void Stepper_Motor_Reset(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x07;
#ifdef STEPPER_MOTOR_3_ZERO_SW
//#ifdef STEPPER_MOTOR_3_ZERO_SW
if (STEPPER_MOTOR_3_ZERO_SW == 0)
{
if (StepperMotor3.ZeroSw == 0)
......@@ -601,7 +603,7 @@ void Stepper_Motor_Reset(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
}
......@@ -651,7 +653,7 @@ void Stepper_Motor_Speed_Control_Service(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x0E;
#ifdef STEPPER_MOTOR_0_ZERO_SW
//#ifdef STEPPER_MOTOR_0_ZERO_SW
if (STEPPER_MOTOR_0_ZERO_SW == 0)
{
if (StepperMotor0.ZeroSw == 0)
......@@ -664,7 +666,7 @@ void Stepper_Motor_Speed_Control_Service(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
#if STEPPER_MOTOR_1_ENABLE
......@@ -672,7 +674,7 @@ void Stepper_Motor_Speed_Control_Service(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x0D;
#ifdef STEPPER_MOTOR_1_ZERO_SW
//#ifdef STEPPER_MOTOR_1_ZERO_SW
if (STEPPER_MOTOR_1_ZERO_SW == 0)
{
if (StepperMotor1.ZeroSw == 0)
......@@ -685,7 +687,7 @@ void Stepper_Motor_Speed_Control_Service(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
#if STEPPER_MOTOR_2_ENABLE
......@@ -693,7 +695,7 @@ void Stepper_Motor_Speed_Control_Service(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x0B;
#ifdef STEPPER_MOTOR_2_ZERO_SW
//#ifdef STEPPER_MOTOR_2_ZERO_SW
if (STEPPER_MOTOR_2_ZERO_SW == 0)
{
if (StepperMotor2.ZeroSw == 0)
......@@ -706,7 +708,7 @@ void Stepper_Motor_Speed_Control_Service(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
#if STEPPER_MOTOR_3_ENABLE
......@@ -714,7 +716,7 @@ void Stepper_Motor_Speed_Control_Service(void)
if (CurStep == 0)
StepperMotorGlobalCtrl.Flag &= 0x07;
#ifdef STEPPER_MOTOR_3_ZERO_SW
//#ifdef STEPPER_MOTOR_3_ZERO_SW
if (STEPPER_MOTOR_3_ZERO_SW == 0)
{
if (StepperMotor3.ZeroSw == 0)
......@@ -727,7 +729,7 @@ void Stepper_Motor_Speed_Control_Service(void)
EnableInterrupts;
}
}
#endif
//#endif
#endif
if (StepperMotorGlobalCtrl.Flag == 0)
......
1、完整版:WZ-EF01_BootApp_S00.16_FV0.09_251112.s19
2、升级版:WZ-EF01_UpdateApp_S00.16_F0.09_251112.s19
1、完整版:WZ-EF01_BootApp_S00.16_FV0.09_260209.s19
2、升级版:WZ-EF01_UpdateApp_S00.16_F0.09_260209.s19
3、FLASH: WZ_EF01_Flash_F0.09_FullBin_251111.bin
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment