Commit 6fdcc122 authored by 高士达's avatar 高士达

Merge branch 'shihao' into 'dev'

Shihao

See merge request !18
parents 0aea6093 5e58bb7b
......@@ -192,8 +192,8 @@ uint16_t Get_Over_Speed_Config(uint8_t Para0)
void Gauge_Power_Display(void)
{
uint8_t powerSegNum = 0;
uint16_t powerDisplayValue = 0;
uint8_t powerSegNum;
uint16_t powerDisplayValue;
uint8_t powerDisplaySign;
uint32_t powerCurrentValue;
......
......@@ -933,7 +933,7 @@ void Ser2EToDFlashInfoInit(void)
EOL_F101 = EOL_GetF101();
EOL_F110 = EOL_GetF110();
EOL_F102 = EOL_GetF102();
for (i = 0u; i < 8u; ++i)
for (i = 0u; i < 16u; ++i)
{
Ser2EToDFlashInfo.DID_F101[i] = EOL_F101.F101_Byte[i];
}
......
......@@ -452,7 +452,7 @@ void UDS_2EService_DID_7103(void)
void Clear7103_Cbk(void)
{
Ser2EToDFlashInfo.DID_7103[0]=0;
memcpy(Ser2EToDFlashInfo.DID_7103, 0, 1);
( void )write2EData(Write2EData);
}
uint32_t Get_7101_Value(void)
......
禅道那个问题,
没改之前是倒车雷达优先级低,触发雷达报警,被高优先级的转向打断了,取消高优先级后,还能继续雷达报警
改之后,低优先级的被高优先级打断后,不再报警
目前改的就是这样,改的是雷达报警,和规范一致
雷达和超速报警都是变更项,只有热失控改动了
以下这两条和王可欣说过,有聊天记录
le19的热失控声音报警改了一下,之前低优先级的声音报警,
被热失控打断后,取消了热失控,低优先级的会继续报警,
现在改成低优先级的被热失控打断后,不再报警
要不新加的超速报警,和雷达报警,就和规范要求的对不上了,
规范要求的的是,被高优先级打断,就不能报警了,
原因出在热失控报警,所以要改一下
修改声音报警优先级,雷达,热失控,超速报警的保持时间填11,原来都是0xffff
更改后,符合规范逻辑
1.先触发高优先级报警,在触发低优先级报警,当高优先级取消,低优先级也不播放,
2.当低优先级播放,高优先级打断,等高优先级取消,低优先级也不播放
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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