Commit e53f6b3e authored by hu's avatar hu

调整BUG

parent b3aa1672
...@@ -1355,6 +1355,7 @@ void GUI_AVG_FuelSpeed_Display(uint8_t Mode) ...@@ -1355,6 +1355,7 @@ void GUI_AVG_FuelSpeed_Display(uint8_t Mode)
} }
else if (Mode == GUI_DISP_MODE_BLANK) else if (Mode == GUI_DISP_MODE_BLANK)
{ {
;/*Do Nothing !*/
} }
else else
{ {
......
This diff is collapsed.
#include "Rscan.h"
#include "GPIO.h" #include "GPIO.h"
#include "dr7f701441.dvf.h" #include "dr7f701441.dvf.h"
......
...@@ -98,4 +98,5 @@ uint8_t Val_EOL_60D0_DriveForm(void); ...@@ -98,4 +98,5 @@ uint8_t Val_EOL_60D0_DriveForm(void);
uint8_t Val_EOL_60D1_BatteryCapacity(void); uint8_t Val_EOL_60D1_BatteryCapacity(void);
/*电池管理系统*/ /*电池管理系统*/
uint8_t Val_EOL_60D2_BatteryManagement(void); uint8_t Val_EOL_60D2_BatteryManagement(void);
#endif #endif
\ No newline at end of file
...@@ -28,8 +28,8 @@ const uint8_t Ser22_DID_F18C[20] = {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x ...@@ -28,8 +28,8 @@ const uint8_t Ser22_DID_F18C[20] = {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x
/*IC 系列号*/ /*IC 系列号*/
const uint8_t Ser22_DID_F190[17] = {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20}; const uint8_t Ser22_DID_F190[17] = {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
/*车辆标识号 VIN*/ /*车辆标识号 VIN*/
const uint8_t Ser22_DID_F193[6] = {'V', '3', '.', '1', '.', '0'}; /*IC 硬件版本号 SystemSupplierECUHardwareVersionNumberApp*/ const uint8_t Ser22_DID_F193[6] = {'V', '1', '.', '2', '.', '0'}; /*IC 硬件版本号 SystemSupplierECUHardwareVersionNumberApp*/
const uint8_t Ser22_DID_F195[6] = {'V', '3', '.', '1', '.', '0'}; /*IC 逻辑程序软件版本号 SystemSupplierECUSoftwareInformationApp*/ const uint8_t Ser22_DID_F195[6] = {'V', '1', '.', '1', '.', '0'}; /*IC 逻辑程序软件版本号 SystemSupplierECUSoftwareInformationApp*/
DiagMSGUnion DiagMSG; DiagMSGUnion DiagMSG;
DiagFlagUnion DiagFlag; DiagFlagUnion DiagFlag;
......
...@@ -18,7 +18,7 @@ void UDS_Service_19_Indication(uint32_t A_TA_type, uint16_t A_Length, uint8_t A_ ...@@ -18,7 +18,7 @@ void UDS_Service_19_Indication(uint32_t A_TA_type, uint16_t A_Length, uint8_t A_
{ {
NRC = UDS_19Service_NRC7F(); /*19服务会话是否支持验证*/ NRC = UDS_19Service_NRC7F(); /*19服务会话是否支持验证*/
} }
if(NRC == positiveResponse) if (NRC == positiveResponse)
{ {
UDS_19Service_NRC13_MinLengthCheck(); /*19服务最小长度验证*/ UDS_19Service_NRC13_MinLengthCheck(); /*19服务最小长度验证*/
} }
...@@ -119,7 +119,7 @@ void UDS_19Service_Sub01(void) ...@@ -119,7 +119,7 @@ void UDS_19Service_Sub01(void)
uint16_t DTCCount = 0u; uint16_t DTCCount = 0u;
for (i = 0u; i < sizeof(DTCToDFlashInfo.DTC) / sizeof(DTCUnion); ++i) for (i = 0u; i < sizeof(DTCToDFlashInfo.DTC) / sizeof(DTCUnion); ++i)
{ {
if(DTCList[i][1u]) if (DTCList[i][1u])
{ {
DTCStatus = DTCToDFlashInfo.DTC[i].DTCStatus & DTCMask; DTCStatus = DTCToDFlashInfo.DTC[i].DTCStatus & DTCMask;
if (DTCStatus & DiagMSG.msgData.SidDetail.Data[0]) if (DTCStatus & DiagMSG.msgData.SidDetail.Data[0])
...@@ -146,7 +146,7 @@ void UDS_19Service_Sub02(void) ...@@ -146,7 +146,7 @@ void UDS_19Service_Sub02(void)
uint32_t DTC = 0u; uint32_t DTC = 0u;
for (i = 0u; i < sizeof(DTCToDFlashInfo.DTC) / sizeof(DTCUnion); ++i) for (i = 0u; i < sizeof(DTCToDFlashInfo.DTC) / sizeof(DTCUnion); ++i)
{ {
if(DTCList[i][1u]) if (DTCList[i][1u])
{ {
DTCStatus = DTCToDFlashInfo.DTC[i].DTCStatus & DTCMask; DTCStatus = DTCToDFlashInfo.DTC[i].DTCStatus & DTCMask;
if (DTCStatus & DiagMSG.msgData.SidDetail.Data[0]) if (DTCStatus & DiagMSG.msgData.SidDetail.Data[0])
...@@ -222,7 +222,7 @@ void UDS_19Service_Sub0A(void) ...@@ -222,7 +222,7 @@ void UDS_19Service_Sub0A(void)
DiagMSG.msgData.SidDetail.Data[count++] = DTCMask; DiagMSG.msgData.SidDetail.Data[count++] = DTCMask;
for (i = 0u; i < sizeof(DTCToDFlashInfo.DTC) / sizeof(DTCUnion); ++i) for (i = 0u; i < sizeof(DTCToDFlashInfo.DTC) / sizeof(DTCUnion); ++i)
{ {
if(DTCList[i][1u]) if (DTCList[i][1u])
{ {
DTC = getDTCNumber(i); DTC = getDTCNumber(i);
DTCStatus = DTCToDFlashInfo.DTC[i].DTCStatus & DTCMask; DTCStatus = DTCToDFlashInfo.DTC[i].DTCStatus & DTCMask;
......
...@@ -265,6 +265,8 @@ void DoCAN_L_Data_Request ( uint32_t Identifier, uint8_t dlc, uint8_t Data[] ) ...@@ -265,6 +265,8 @@ void DoCAN_L_Data_Request ( uint32_t Identifier, uint8_t dlc, uint8_t Data[] )
Can_Write(&canMag); Can_Write(&canMag);
//RSCAN0_SendCH0_TxBuf0(LinkTxCtrl.Identifier, 8U, 1U, LinkTxCtrl.Data); //RSCAN0_SendCH0_TxBuf0(LinkTxCtrl.Identifier, 8U, 1U, LinkTxCtrl.Data);
#else #else
canMag.u8CANLEN = dlc;
Can_Write(&canMag); Can_Write(&canMag);
//RSCAN0_SendCH0_TxBuf0(LinkTxCtrl.Identifier, 8U, 1U, LinkTxCtrl.Data); //RSCAN0_SendCH0_TxBuf0(LinkTxCtrl.Identifier, 8U, 1U, LinkTxCtrl.Data);
#endif #endif
......
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