|
@@ -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))
|
|
|
{
|