双柱双电机S型传感器独立分支所有基本功能完成

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

@@ -5,7 +5,7 @@
 
 
 #define 	USE_FILE_SYSTEM									1
-#define	SDCARD_BLOCK_MAX								(10000)
+#define		SDCARD_BLOCK_MAX								(10000)
 
 #define 	OSC_CNT    			40
 #define 	SLOPE_CNT			  30
@@ -13,15 +13,18 @@
 #define 	SLOPE_VPT				1000
 #define		FOLLOW_VPT			20
 #define		SHIELD_VPT			2500
+#define		EME_STOP_VPT		10000
 
-#define 	STOP_TIME_MS		0
+#define 	STOP_TIME_MS		500
 #define 	RUN_TIME_MS			0
+#define		EME_START_MS		500
+#define		EME_STOP_MS			3000
 
 #define		TRAVEL_TIME_MS	30000
 
 
 #define	BDC_STOP()			(SET_TWIN_BIT0(),SET_TWIN_BIT1())
-#define BDC_UP()			(SET_TWIN_BIT0(),CLR_TWIN_BIT1())
+#define BDC_UP()				(SET_TWIN_BIT0(),CLR_TWIN_BIT1())
 #define	BDC_DOWN()			(SET_TWIN_BIT1(),CLR_TWIN_BIT0())
 	
 /*控制等级*/
@@ -99,13 +102,13 @@ typedef struct {
 	uint32_t Uart1Delay1mSCnt;
 	uint32_t StopCollDelay1mSCnt;
 	uint32_t RunCollDelay1mSCnt;
-	uint32_t EvenRunDelay1mSCnt;
+	uint32_t EmergencyDelay1mSCnt;
 	uint8_t FeedDogDlyCnt;
 	
 	bool UpFlag;//上升标志位
 	bool DownFlag;//下降标志位
 	bool StopFlag;//停止标志位
-	bool EvenRunning;//平稳运行标志位
+	bool EmeFlag;//应急标志位
 	bool LeftRunFalg;
 	bool RightRunFalg;
 	bool CentreRunFalg;