Skip to content

V
VC66_7C
Commit feb563ae authored by hu's avatar hu
Browse files
Options

调整变速箱

parent 945b2ac4
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 61 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ feb563ae
...@@ -1659,11 +1659,11 @@ void GetAllDtcEngineFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* ...@@ -1659,11 +1659,11 @@ void GetAllDtcEngineFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t*
pCurFault[DtcCurFaultCn] = DtcFaultTmp; pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++; DtcCurFaultCn++;
} }
if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/ //if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
{ //{
pHisFault[DtcHisFaultCn] = DtcFaultTmp; // pHisFault[DtcHisFaultCn] = DtcFaultTmp;
DtcHisFaultCn++; // DtcHisFaultCn++;
} //}
} }
*pCurFaultNum = DtcCurFaultCn; *pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn; *pHisFaultNum = DtcHisFaultCn;
...@@ -1725,11 +1725,11 @@ void GetAllDtcBrakeFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* p ...@@ -1725,11 +1725,11 @@ void GetAllDtcBrakeFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* p
pCurFault[DtcCurFaultCn] = DtcFaultTmp; pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++; DtcCurFaultCn++;
} }
if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/ //if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
{ //{
pHisFault[DtcHisFaultCn] = DtcFaultTmp; // pHisFault[DtcHisFaultCn] = DtcFaultTmp;
DtcHisFaultCn++; // DtcHisFaultCn++;
} //}
} }
*pCurFaultNum = DtcCurFaultCn; *pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn; *pHisFaultNum = DtcHisFaultCn;
...@@ -1790,11 +1790,11 @@ void GetAllDtcAMTFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHi ...@@ -1790,11 +1790,11 @@ void GetAllDtcAMTFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHi
pCurFault[DtcCurFaultCn] = DtcFaultTmp; pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++; DtcCurFaultCn++;
} }
if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/ //if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
{ //{
pHisFault[DtcHisFaultCn] = DtcFaultTmp; // pHisFault[DtcHisFaultCn] = DtcFaultTmp;
DtcHisFaultCn++; // DtcHisFaultCn++;
} //}
} }
*pCurFaultNum = DtcCurFaultCn; *pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn; *pHisFaultNum = DtcHisFaultCn;
...@@ -1856,11 +1856,11 @@ void GetAllDtcRadarFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* p ...@@ -1856,11 +1856,11 @@ void GetAllDtcRadarFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* p
pCurFault[DtcCurFaultCn] = DtcFaultTmp; pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++; DtcCurFaultCn++;
} }
if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/ //if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
{ //{
pHisFault[DtcHisFaultCn] = DtcFaultTmp; // pHisFault[DtcHisFaultCn] = DtcFaultTmp;
DtcHisFaultCn++; // DtcHisFaultCn++;
} //}
} }
*pCurFaultNum = DtcCurFaultCn; *pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn; *pHisFaultNum = DtcHisFaultCn;
...@@ -1898,6 +1898,40 @@ void Common_DTCCamera_Server(void) ...@@ -1898,6 +1898,40 @@ void Common_DTCCamera_Server(void)
DisDTCNumCamera = CurFaultNum + HisFaultNum; DisDTCNumCamera = CurFaultNum + HisFaultNum;
} }
/*-------------------------------------------------------------------------
* Function Name : GetAllDtcFault
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void GetAllDtcCameraFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum)
{
uint8_t i = 0;
uint8_t DtcCurFaultCn = 0;
uint8_t DtcHisFaultCn = 0;
uint32_t DtcFaultTmp = 0;
for (i = 0; i < 25; i++)
{
DtcFaultTmp = DiagReciveDTCCamera.SubDTC.StructDTC[i];
swap32(&DtcFaultTmp);
if ((DtcFaultTmp & 0x01) == 0x01) /*当前故障*/
{
pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++;
}
//if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
//{
// pHisFault[DtcHisFaultCn] = DtcFaultTmp;
// DtcHisFaultCn++;
//}
}
*pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn;
}
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Common_DTC_Server * Function Name : Common_DTC_Server
* Description : * Description :
...@@ -1954,49 +1988,16 @@ void GetAllDtcRetarderFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t ...@@ -1954,49 +1988,16 @@ void GetAllDtcRetarderFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t
pCurFault[DtcCurFaultCn] = DtcFaultTmp; pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++; DtcCurFaultCn++;
} }
if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/ //if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
{ //{
pHisFault[DtcHisFaultCn] = DtcFaultTmp; // pHisFault[DtcHisFaultCn] = DtcFaultTmp;
DtcHisFaultCn++; // DtcHisFaultCn++;
} //}
} }
*pCurFaultNum = DtcCurFaultCn; *pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn; *pHisFaultNum = DtcHisFaultCn;
} }
/*-------------------------------------------------------------------------
* Function Name : GetAllDtcFault
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void GetAllDtcCameraFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum)
{
uint8_t i = 0;
uint8_t DtcCurFaultCn = 0;
uint8_t DtcHisFaultCn = 0;
uint32_t DtcFaultTmp = 0;
for (i = 0; i < 25; i++)
{
DtcFaultTmp = DiagReciveDTCCamera.SubDTC.StructDTC[i];
swap32(&DtcFaultTmp);
if ((DtcFaultTmp & 0x01) == 0x01) /*当前故障*/
{
pCurFault[DtcCurFaultCn] = DtcFaultTmp;
DtcCurFaultCn++;
}
if ((DtcFaultTmp & 0x21) == 0x20) /*历史故障*/
{
pHisFault[DtcHisFaultCn] = DtcFaultTmp;
DtcHisFaultCn++;
}
}
*pCurFaultNum = DtcCurFaultCn;
*pHisFaultNum = DtcHisFaultCn;
}
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GetAllDtcFault * Function Name : GetAllDtcFault
* Description : * Description :
......
source/Application/Graphic/GUI/GUI.c
View file @ feb563ae
...@@ -7626,6 +7626,7 @@ void GUI_BG_DTCBrake_Display(uint8_t Mode) ...@@ -7626,6 +7626,7 @@ void GUI_BG_DTCBrake_Display(uint8_t Mode)
uint32_t Data_Value = 0u; uint32_t Data_Value = 0u;
//DTNum = DisDTCNumber[DTCDispNum]; //DTNum = DisDTCNumber[DTCDispNum];
Data_Value = DTCNumberBrake[DTCDispNum]; Data_Value = DTCNumberBrake[DTCDispNum];
swap32(&Data_Value); swap32(&Data_Value);
Data_Value = (uint32_t)(Data_Value & 0xFFFFu); Data_Value = (uint32_t)(Data_Value & 0xFFFFu);
...@@ -7745,7 +7746,7 @@ void GUI_BG_MenuDTCBrake_Display(uint8_t Mode) ...@@ -7745,7 +7746,7 @@ void GUI_BG_MenuDTCBrake_Display(uint8_t Mode)
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_DTCAMT_Display * Function Name : GUI_BG_DTCAMT_Display
* Description : * Description : 故障码特殊，报文已经调整过，与其他故障码位置不同
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
...@@ -7759,8 +7760,7 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode) ...@@ -7759,8 +7760,7 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode)
//DTNum = DisDTCNumber[DTCDispNum]; //DTNum = DisDTCNumber[DTCDispNum];
Data_Value = DTCNumberAMT[DTCDispNum]; Data_Value = DTCNumberAMT[DTCDispNum];
swap32(&Data_Value); Data_Value = (uint32_t)((Data_Value >> 16u) & 0xFFFFu);
Data_Value = (uint32_t)(Data_Value & 0xFFFFu);
if (DTCNumTime < 50) if (DTCNumTime < 50)
{ {
......
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