Skip to content

W
WZ-EF01
Commit c7b843b4 authored by 崔立宝's avatar 崔立宝
Browse files
Options

修改QAC高危问题

parent 445e1e21
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 15483 deletions
code/Sources/Device/src/Radar_R3.c deleted 100644 → 0
View file @ 445e1e21
#include "Radar_R3.h"
RadarR3DataBufferUnion RadarR3Data;
RadarR3ReceivingCtrlStruct RadarR3ReceivingCtrl;
void Radar_R3_Init(void)
{
RadarR3ReceivingCtrl.Enable = 0;
RadarR3ReceivingCtrl.SelfTest = 0;
RadarR3ReceivingCtrl.Ptr = 0;
RadarR3ReceivingCtrl.Len = 0;
RadarR3ReceivingCtrl.Complete = 0;
RadarR3ReceivingCtrl.Counter = 0;
RADAR_VALID = 0;
RADAR_SELF_TEST_PASSED = 0;
RADAR_SYS_FAULT = 0;
RADAR_SOUND = RADAR_SND_MUTE;
RADAR_SENSOR_FL = 0;
RADAR_SENSOR_FLM = 0;
RADAR_SENSOR_FRM = 0;
RADAR_SENSOR_FR = 0;
RADAR_SENSOR_RL = 0;
RADAR_SENSOR_RLM = 0;
RADAR_SENSOR_RRM = 0;
RADAR_SENSOR_RR = 0;
}
//10ms
void Radar_R3_Receiving_Service(void)
{
#if 0
uint16_t Counter;
uint8_t SelfTestResult;
if (RadarR3ReceivingCtrl.Enable)
{
if (LINE_IN_GEAR_R_SIGNAL)
{
RADAR_VALID = (RADAR_REAR_VALID_FLAG | RADAR_FRONT_VALID_FLAG) ;
if (RadarR3ReceivingCtrl.Timer < 0xFFFF)
RadarR3ReceivingCtrl.Timer++;
if (RadarR3ReceivingCtrl.Timer >= (RADAR_R3_MSG_LOST_THRESHOLD * 100))
RADAR_SYS_FAULT |= RADAR_MSG_LOST_BIT;
else
RADAR_SYS_FAULT &= ~RADAR_MSG_LOST_BIT;
if (RadarR3ReceivingCtrl.Complete)
{
RadarR3ReceivingCtrl.Complete = 0;
RadarR3ReceivingCtrl.Timer = 0;
if (RadarR3Data.Frame.Type == RADAR_R3_MESSAGE_FRAME)
{
if (RadarR3ReceivingCtrl.SelfTest == 1) //雷达结束首次自检
{
RadarR3ReceivingCtrl.SelfTest = 2;
SelfTestResult = 0;
SelfTestResult |= RADAR_SENSOR_FL;
SelfTestResult |= RADAR_SENSOR_FLM;
SelfTestResult |= RADAR_SENSOR_FRM;
SelfTestResult |= RADAR_SENSOR_FR;
SelfTestResult |= RADAR_SENSOR_RL;
SelfTestResult |= RADAR_SENSOR_RLM;
SelfTestResult |= RADAR_SENSOR_RRM;
SelfTestResult |= RADAR_SENSOR_RR;
if (SelfTestResult == 0)
RADAR_SELF_TEST_PASSED = 1;
}
RADAR_SOUND = RadarR3Data.Msg.Snd;
RADAR_SENSOR_FL = RadarR3Data.Msg.FL;
RADAR_SENSOR_FLM = RadarR3Data.Msg.FLM;
RADAR_SENSOR_FRM = RadarR3Data.Msg.FRM;
RADAR_SENSOR_FR = RadarR3Data.Msg.FR;
RADAR_SENSOR_RL = RadarR3Data.Msg.RL;
RADAR_SENSOR_RLM = RadarR3Data.Msg.RLM;
RADAR_SENSOR_RRM = RadarR3Data.Msg.RRM;
RADAR_SENSOR_RR = RadarR3Data.Msg.RR;
}
else if (RadarR3Data.Frame.Type == RADAR_R3_SELF_TEST_FRAME)
{
if (RadarR3ReceivingCtrl.SelfTest == 0) //雷达刚启动,未进行自检
RadarR3ReceivingCtrl.SelfTest = 1;
if (RadarR3Data.SelfTest.FLFault)
RADAR_SENSOR_FL = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_FL = 0;
if (RadarR3Data.SelfTest.FLMFault)
RADAR_SENSOR_FLM = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_FLM = 0;
if (RadarR3Data.SelfTest.FRMFault)
RADAR_SENSOR_FRM = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_FRM = 0;
if (RadarR3Data.SelfTest.FRFault)
RADAR_SENSOR_FR = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_FR = 0;
if (RadarR3Data.SelfTest.RLFault)
RADAR_SENSOR_RL = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_RL = 0;
if (RadarR3Data.SelfTest.RLMFault)
RADAR_SENSOR_RLM = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_RLM = 0;
if (RadarR3Data.SelfTest.RRMFault)
RADAR_SENSOR_RRM = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_RRM = 0;
if (RadarR3Data.SelfTest.RRFault)
RADAR_SENSOR_RR = RADAR_SENSOR_FAULT;
else
RADAR_SENSOR_RR = 0;
}
}
else
{
Counter = API_ROLLING_COUNTER;
if (Counter - RadarR3ReceivingCtrl.Counter >= (10000 / API_INT_CYCLE))
RadarR3ReceivingCtrl.Ptr = 0;
}
}
else
{
if (RADAR_VALID)
{
RadarR3ReceivingCtrl.SelfTest = 0;
RadarR3ReceivingCtrl.Ptr = 0;
RadarR3ReceivingCtrl.Complete = 0;
RadarR3ReceivingCtrl.Timer = 0;
RADAR_VALID = 0;
RADAR_SELF_TEST_PASSED = 0;
RADAR_SYS_FAULT = 0;
RADAR_SOUND = RADAR_SND_MUTE;
RADAR_SENSOR_FL = 0;
RADAR_SENSOR_FLM = 0;
RADAR_SENSOR_FRM = 0;
RADAR_SENSOR_FR = 0;
RADAR_SENSOR_RL = 0;
RADAR_SENSOR_RLM = 0;
RADAR_SENSOR_RRM = 0;
RADAR_SENSOR_RR = 0;
}
}
}
#endif
}
void Radar_R3_Receive_Enable(uint8_t En)
{
if (En)
En = 1;
if (RadarR3ReceivingCtrl.Enable != En)
{
RadarR3ReceivingCtrl.SelfTest = 0;
RadarR3ReceivingCtrl.Enable = En;
RadarR3ReceivingCtrl.Timer = 0;
RADAR_SELF_TEST_PASSED = 0;
RADAR_SYS_FAULT = 0;
RADAR_SOUND = RADAR_SND_MUTE;
RADAR_SENSOR_FL = 0;
RADAR_SENSOR_FLM = 0;
RADAR_SENSOR_FRM = 0;
RADAR_SENSOR_FR = 0;
RADAR_SENSOR_RL = 0;
RADAR_SENSOR_RLM = 0;
RADAR_SENSOR_RRM = 0;
RADAR_SENSOR_RR = 0;
if (RadarR3ReceivingCtrl.Enable == 0)
RADAR_VALID = 0;
}
}
void Radar_R3_Receive_Data(uint8_t Data, uint8_t Parity)
{
uint16_t Counter;
if ((RadarR3ReceivingCtrl.Enable) && (RADAR_VALID))
{
if (RadarR3ReceivingCtrl.Complete)
return;
Counter = API_ROLLING_COUNTER;
RadarR3Data.Byte[RadarR3ReceivingCtrl.Ptr] = Data;
if (RadarR3ReceivingCtrl.Ptr == 0)
{
if (RadarR3Data.Frame.Type == RADAR_R3_MESSAGE_FRAME)
{
RadarR3ReceivingCtrl.Ptr = 1;
RadarR3ReceivingCtrl.Len = 5;
RadarR3ReceivingCtrl.Counter = Counter;
}
else if (RadarR3Data.Frame.Type == RADAR_R3_SELF_TEST_FRAME)
{
RadarR3ReceivingCtrl.Ptr = 1;
RadarR3ReceivingCtrl.Len = 3;
RadarR3ReceivingCtrl.Counter = Counter;
}
}
else
{
//如果 1、超时10ms(10,000 us) 2、校验错误 则重新接收
if ((Counter - RadarR3ReceivingCtrl.Counter >= (10000 / API_INT_CYCLE)) || \
(Parity != 0))
{
RadarR3ReceivingCtrl.Ptr = 0;
return;
}
RadarR3ReceivingCtrl.Counter = Counter;
RadarR3ReceivingCtrl.Ptr++;
if (RadarR3ReceivingCtrl.Ptr >= RadarR3ReceivingCtrl.Len)
{
if (((RadarR3Data.Frame.Type == RADAR_R3_MESSAGE_FRAME) && \
(RadarR3Data.Msg.EOF == RADAR_R3_EOF_MESSAGE)) || \
((RadarR3Data.Frame.Type == RADAR_R3_SELF_TEST_FRAME) && \
(RadarR3Data.SelfTest.EOF == RADAR_R3_EOF_SELF_TEST)))
{
RadarR3ReceivingCtrl.Complete = 1;
}
RadarR3ReceivingCtrl.Ptr = 0;
}
}
}
}
code/Sources/Driver/inc/Motor_Controller.h
View file @ c7b843b4
......@@ -40,7 +40,7 @@ MOTOR_3: ͨ
/******************************************************************************
参数预处理
******************************************************************************/
#if (MOTOR_CONTROLLER_PERIOD == 0) || (MOTOR_CONTROLLER_PERIOD > BUSCLK))
#if ((MOTOR_CONTROLLER_PERIOD == 0) || (MOTOR_CONTROLLER_PERIOD > BUSCLK))
#error Invalid motor controller period setting
#endif
......
code/Sources/Implementation/src/Sound_Scheduler.c
View file @ c7b843b4
......@@ -178,9 +178,9 @@ void Sound_Scheduling_Service(void)
{
if (Sound_Stop(SoundList[SoundScheduling.Current].Src) == 0)
{
SoundScheduling.Current = SND_NONE;
SoundScheduling.StopReq = 0;
SoundEnableCode[SoundScheduling.Current] = 0;
SoundScheduling.Current = SND_NONE;
}
}
}
......
code/Sources/System/src/main.c
View file @ c7b843b4
......@@ -28,6 +28,7 @@
//V00.11
//20240446 修改车厂问题：0x18FE8E17外发不对（新报文矩阵无平均油耗输出）
//20240430 修改软件版本号
//20240515 修改禅道QAC高危问题：42983、42982、42979
#include "main.h"
#include "fuelconfig.h"
......
code/bin/WuZhengProject7.0.abs.glo deleted 100644 → 0
View file @ 445e1e21
This source diff could not be displayed because it is too large. You can view the blob instead.
code/bin/WuZhengProject7.0.abs.s19 deleted 100644 → 0
View file @ 445e1e21
This source diff could not be displayed because it is too large. You can view the blob instead.
code/bin/WuZhengProject7.0.map deleted 100644 → 0
View file @ 445e1e21
This diff is collapsed.
code/bin/WuZhengProject7.0.xpr deleted 100644 → 0
View file @ 445e1e21
Data:1 < ADDXPR ONLY_ADD_IF_NEW "FuelResistanceV"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "hyqhyq"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "AnalogFuelSensorRes"
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S10 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S1 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S26 "
Data:1 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300.Sig.S25 "
Data:2 < ADDXPR ONLY_ADD_IF_NEW "Network_Status"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "DataVSpeedDisp"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "DataESpeedDisp"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "DataESpeedActual"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "DataESPeedDamping.Speed"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "NVMConfig3300"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "FuelResistanceV"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "CANNetTxOFF"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "CoCANCycleMsg"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "CoCANCtrl.Timer"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "CoCANTxMsgTable"
Data:2 < ADDXPR ONLY_ADD_IF_NEW "CANMsg18FEF717Status"
s19/WZ_EF01_UpdateApp_S0.11_F0.08_240430.s19 → s19/WZ_EF01_UpdateApp_S0.11_F0.08_240516.s19
View file @ c7b843b4
......@@ -496,7 +496,7 @@ S224F4876033F637A4E1882736C6FE4A88F0F46B83E6888759B745E6E2CDB46E804A88F0F497
S224F487806B84E1832402200C2614EE80E6E2CDB5C102260AE6887B37A5E6827B37A61B8531
S224F487A00A37C1202428CE3784A6E52721F637A4E1802607C6017B37A72013F637A5E18011
S224F487C02605C6FF7B37A5E680CE378469E51B810AF637A72726F637A4C120241F8759B7C9
S224F487E045E6E2CDB44A88A1F4046110C6FF7B37A47937A7B637A4CE378469E4F637A4C1AB
S224F487E045E6E2CDB44A88A1F40461107937A7F637A4CE378469E5C6FF7B37A4F637A4C16A
S224F4880020240EC6FE4A88F0F404A105C6FF7B37A4F637A5C120243BF637A4C120240C8753
S224F4882059B745E6E2CDB44A88A1F4F637A58759B745E6E2CDB44A8867F4046116F637A5C9
S224F48840B637A6CE37846AE5F637A57B37A4C6FF7B37A50A187937B0C6FF877C37AE507C75
......@@ -2605,5 +2605,5 @@ S224F9A640A00000002E4F1096B84B4040FFFFFFFFA00000002E4F1096BF3D4040FFFFFFFF7F
S224F9A660A00000002E4F1096C6844040FFFFFFFFA00000002E4F1096CE004040FFFFFFFF46
S224F9A680A00000002E4F1096D5F64040FFFFFFFFA00000002E4F1096DE884040FFFFFFFF0D
S224F9A6A0A00000002E4F0096E7554040FFFFFFFFA000000024463096F0854040FFFFFFFF70
S20CFE80007C677C677C677C67E9
S20CFE80004AB94AB94AB94AB969
S9030000FC
s19/释放软件说明.txt
View file @ c7b843b4
1、WZ_EF01_BootApp_S0.11_FV0.08_240430.s19，完整版，适用于新生产的无程序仪表
2、WZ_EF01_UpdateApp_S0.11_F0.08_240430.s19，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
1、WZ_EF01_BootApp_S0.11_FV0.08_240516.s19，完整版，适用于新生产的无程序仪表
2、WZ_EF01_UpdateApp_S0.11_F0.08_240516.s19，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
utility/诊断工具1.10.11 x64/Option/Option.properties
View file @ c7b843b4
#new Option
#Tue Apr 30 13:19:46 CST 2024
#Thu May 16 17:45:22 CST 2024
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
......@@ -7,7 +7,7 @@ MergeCanXLSPath=
RH850_D1M1AGPIOJSONpath=
DBFFilePath=
MergeCrcTtpe=1
MergeBootFilePath=I\:\\GIT\\DEV\\WZ-EF01\\utility\\Boot_Release\\WuZheng_EF01_3820010-EF01_Boot_BV1.04_20240315.s19
MergeBootFilePath=I\:\\GIT\\DEV\\WZ-EF01\\utility\\Boot_Release\\WuZheng_EF01_3820010-EF01_Boot_BV1.05_20240321.s19
IsMergeChangeAddress=false
MergeFlashOutPutFilePath=
GPIOOutPutPath=
......
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