Commit f31a98bf authored by 张金硕's avatar 张金硕

feat:新增上电远光灯闪烁

parent e331fac6
...@@ -58,6 +58,10 @@ void TimeProcessing(void) ...@@ -58,6 +58,10 @@ void TimeProcessing(void)
{ {
GetInfoDelayTime--; GetInfoDelayTime--;
} }
if (GetHighBeamDelayTime > 0)
{
GetHighBeamDelayTime--;
}
if(time1>0) if(time1>0)
{ {
time1--; time1--;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#define RLT_RELOAD_100MS_VALUE 0x64AF #define RLT_RELOAD_100MS_VALUE 0x64AF
extern uint32_t GetInfoDelayTime; extern uint32_t GetInfoDelayTime;
extern uint32_t GetHighBeamDelayTime;
extern uint8_t CANSendEnable; extern uint8_t CANSendEnable;
extern uint8_t HJ_SWitchDownSetTimeFalg; extern uint8_t HJ_SWitchDownSetTimeFalg;
extern volatile uint32_t Timer1msCnts; extern volatile uint32_t Timer1msCnts;
......
...@@ -2077,8 +2077,10 @@ void UUID(void) ...@@ -2077,8 +2077,10 @@ void UUID(void)
} }
} }
const uint8_t jiancetaibanben[5] = {"V1.00"};
void UUID2(void) void UUID2(void)
{ {
DspOneLineStaticStr(jiancetaibanben,2,75);//�ڲ��汾��3
SetDisplayStaticItemW2(UUID_duqu,3,190, DRAW_LUMIN_ICOM_WINDOW); SetDisplayStaticItemW2(UUID_duqu,3,190, DRAW_LUMIN_ICOM_WINDOW);
for(uint8_t i = 0; i < 13; i++) { for(uint8_t i = 0; i < 13; i++) {
......
...@@ -253,10 +253,10 @@ void HJ_FuelFun(HJ_FuelScale OilNum) ...@@ -253,10 +253,10 @@ void HJ_FuelFun(HJ_FuelScale OilNum)
LampState_L.Lamps.RELAY_F7 = 1; LampState_L.Lamps.RELAY_F7 = 1;
break; break;
case HJ_FuelTwo_a: case HJ_FuelTwo_a:
LampState_L.Lamps.RELAY_F7 = 1; LampState_L.Lamps.RELAY_F8 = 1;
break; break;
case HJ_FuelOne_a: case HJ_FuelOne_a:
LampState_L.Lamps.RELAY_F7 = 1; LampState_L.Lamps.RELAY_F8 = 1;
break; break;
case HJ_FuelNull_a: case HJ_FuelNull_a:
//LampState_L.Lamps.RELAY_F4 = 1; //LampState_L.Lamps.RELAY_F4 = 1;
......
...@@ -1397,6 +1397,7 @@ uint32_t CalculateKey(uint8_t seed_array[]) ...@@ -1397,6 +1397,7 @@ uint32_t CalculateKey(uint8_t seed_array[])
} }
uint32_t GetInfoDelayTime =0; uint32_t GetInfoDelayTime =0;
uint32_t GetHighBeamDelayTime =0;
uint8_t UUIDFilter = 0; uint8_t UUIDFilter = 0;
uint8_t UUIDDataFilter[32]; uint8_t UUIDDataFilter[32];
extern void WriteUUID(uint8_t* data); extern void WriteUUID(uint8_t* data);
...@@ -1602,6 +1603,21 @@ void GetInfo(void) ...@@ -1602,6 +1603,21 @@ void GetInfo(void)
break; break;
} }
} }
uint8_t High_Beam_Levl = 0;
void HJ_High_BeamFlash(void)
{
if(GetHighBeamDelayTime == 0)
{
GetHighBeamDelayTime = 100;
High_Beam_Levl = !High_Beam_Levl;
}
if(GetHighBeamDelayTime != 0)
{
Port_SetPortPinLevel(2, 1, High_Beam_Levl);//远光
}
}
void ProjectDynamicConfig(void) void ProjectDynamicConfig(void)
{ {
Default_flag = 1; Default_flag = 1;
...@@ -3383,6 +3399,7 @@ void Stage_Manage() ...@@ -3383,6 +3399,7 @@ void Stage_Manage()
{ {
case 0: case 0:
ProjectDynamicConfig();//��Ŀ��̬��������ȼ�͡�BVM��DMS�� ProjectDynamicConfig();//��Ŀ��̬��������ȼ�͡�BVM��DMS��
HJ_High_BeamFlash();
#if (PRO_JAPE2) #if (PRO_JAPE2)
if ((g_uiCuntDownFlag == 1)&&(TftTimer == 0)){ if ((g_uiCuntDownFlag == 1)&&(TftTimer == 0)){
can(); can();
......
This diff is collapsed.
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