全功能无误版提交

Project/HC32F460/source/User/Inc/main.h

@@ -13,13 +13,13 @@
 #define 	SLOPE_VPT				1000
 #define		PRESS_VPT				3
 #define		FOLLOW_VPT			10
-#define		SHIELD_VPT			2
+#define		SHIELD_VPT			1.5
 #define		EME_STOP_VPT		4000
 
 #define		CENTRE_FRONT_CNT			0
 #define		CENTRE_FRONT_SUM			0
 #define		CENTRE_FRONT_VPT			0
-#define		CENTRE_VPT			0
+#define		CENTRE_VPT			2000
 
 #define 	STOP_TIME_MS		500
 #define 	CENT_TIME_MS		200
@@ -60,6 +60,11 @@ typedef struct{
 	int32_t RightUpVPT;//右上设备阈值
 	int32_t RightLowVPT;//右下设备阈值
 	
+	int32_t LeftUpShieldVPT;	//左上屏蔽阈值
+	int32_t LeftLowShieldVPT;	//左下屏蔽阈值
+	int32_t RightUpShieldVPT;	//右上屏蔽阈值
+	int32_t RightLowShieldVPT;	//右下屏蔽阈值
+	
 	int32_t LeftUp_Org_AdZero;//左上设备原始AD零点
 	int32_t LeftLow_Org_AdZero;//左下设备原始AD零点
 	int32_t RightUp_Org_AdZero;//右上设备原始AD零点
@@ -97,12 +102,14 @@ typedef enum {
 	APP_STATUS_IDLE,
 	APP_STATUS_ON,
 	APP_STATUS_OFF,
+	APP_STATUS_START_BEEP,
 	APP_STATUS_MOTOR_INIT,
+	APP_STATUS_ZERO_MARKING,
 	APP_STATUS_WAIT_MOTOR_INIT,
 	APP_STATUS_WAIT_MOTOR_CALI_UP,
 	APP_STATUS_WAIT_MOTOR_CALI_DOWN,
 	APP_STATUS_WAIT_STEADY,
-	APP_STATUS_ZERO_MARKING,
+	APP_STATUS_END_BEEP,
 	APP_STATUS_HEIGHT_CONTROL,
 }AppStatus_m;
 
@@ -167,11 +174,6 @@ typedef struct {
 	int32_t RightUpCS1237_SlopeArray[SLOPE_CNT];
 	int32_t RightLowCS1237_SlopeArray[SLOPE_CNT];
 	
-	int32_t aaa;
-	int32_t bbb;
-	int32_t ccc;
-	int32_t ddd;
-	
 	bool WaitFlag;
 }AppDetect_t;
 extern AppDetect_t App;