Преглед на файлове

2.3.0.15 蜂鸣器修改

CHENJIE-PC\QiXiang_CHENJIE преди 3 години
родител
ревизия
ffbd011356
променени са 2 файла, в които са добавени 9 реда и са изтрити 10 реда
  1. 1 1
      inc/app.h
  2. 8 9
      src/UartTask.c

+ 1 - 1
inc/app.h

@@ -51,7 +51,7 @@ extern "C" {
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01050000     //驱动层版本号V1.4.0.0  驱动层1.5.0.0,增加了三轴
 //#define	APPSWVERSION		0x01020209     
-#define	APPSWVERSION		0x0203000E
+#define	APPSWVERSION		0x0203000F
 //#define	APPSWVERSION		0x0201000E
 //--------------------------------------------------------------------------------
 

+ 8 - 9
src/UartTask.c

@@ -71,7 +71,7 @@ void battSOCDisplay(void);
 void battErrorStateDisplay(void);
 void battWarningStateDisplay(void);
 void battLockStateDisplay(UINT8 lockState);
-void relayControlFunc(float DutyRatio);
+void relayControlFunc(float DutyRatio,UINT8  BuzzerPeriod);
 void SP_BMS_Update_Service(void);
 BOOL BattHeaterSwitch(UINT8* heaterSwitch);
 UINT16  encryptionAlgorithm (UINT16 plainText);
@@ -194,9 +194,9 @@ static void UartTask(void* arg)
 					}
 					if(AppNVMData.isBattLocked==FALSE && ret==0x01)
 					{
-						relayControlFunc(0.6);
+						relayControlFunc(0.8,5);//表示1s响2次,占比80%
 						Ringtimes++;
-						if(Ringtimes>=30)
+						if(Ringtimes>=15)
 						{
 							relayControl(FALSE);
 							ret = 0;
@@ -205,9 +205,9 @@ static void UartTask(void* arg)
 					}
 					else if (AppNVMData.isBattLocked==TRUE && ret==0x01)
 					{
-						relayControlFunc(0.6);
+						relayControlFunc(0.8,5);//表示1s响2次,占比80%
 						Ringtimes++;
-						if(Ringtimes>=20)
+						if(Ringtimes>=10)
 						{
 							relayControl(FALSE);
 							ret = 0;
@@ -216,12 +216,12 @@ static void UartTask(void* arg)
 					}
 					else if(UDSSwitch==1 && Ringtimes<=50)
 					{
-						relayControlFunc(0.6);
+						relayControlFunc(0.8,5);//表示1s响2次,占比80%
 						Ringtimes++;
 					}
 					else if(BuzzerControl==TRUE)
 					{
-						relayControlFunc(0.6);
+						relayControlFunc(0.8,5);//表示1s响2次,占比80%
 					}
 					if(Ringtimes>=50)
 					{
@@ -1108,10 +1108,9 @@ void battLockStateDisplay(UINT8 lockState)
 	}	
 	errorLightTimer++;
 }
-void relayControlFunc(float DutyRatio)
+void relayControlFunc(float DutyRatio,UINT8  BuzzerPeriod)
 {
 	static UINT8  BuzzerTimer = 0;
-	UINT8  BuzzerPeriod = 5;//1000ms
 	BuzzerTimer++;
 	if(BuzzerTimer<(UINT8)(BuzzerPeriod*DutyRatio))
 	{