Skip to content

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

调整K-LINE设置，数据同步功能

parent 34523dd1
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 11 deletions
source/Application/K_BUS/kwp2000_service.c
View file @ 38aa18bc
......@@ -500,7 +500,8 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x45: /* 发动机转速 */
K_Line_Set.K_Line_LID45 = RequestData[2];
User_App.User_Speed = K_Line_Set.K_Line_LID45;
User_App.User_Speed = K_Line_Set.K_Line_LID45;
User_set_Num.User_Speed = K_Line_Set.K_Line_LID45;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x45;
Tx_Len = 2;
......@@ -508,7 +509,8 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x46: /* 急加速 */
K_Line_Set.K_Line_LID46 = RequestData[2];
User_App.User_JADD = K_Line_Set.K_Line_LID46;
User_App.User_JADD = K_Line_Set.K_Line_LID46;
User_set_Num.User_JADD = K_Line_Set.K_Line_LID46;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x46;
Tx_Len = 2;
......@@ -516,23 +518,26 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
break;
case 0x47: /* 急减速 */
K_Line_Set.K_Line_LID47 = RequestData[2];
User_App.User_JSUB = K_Line_Set.K_Line_LID47;
User_App.User_JSUB = K_Line_Set.K_Line_LID47;
User_set_Num.User_JSUB = K_Line_Set.K_Line_LID47;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x47;
Tx_Len = 2;
DTCstatusCHGFFK_Line = 1;
break;
case 0x48: /* 长时间怠速 */
K_Line_Set.K_Line_LID48 = RequestData[2];
User_App.User_IDLING = K_Line_Set.K_Line_LID48;
K_Line_Set.K_Line_LID48 = RequestData[2];
User_App.User_IDLING = K_Line_Set.K_Line_LID48;
User_set_Num.User_IDLING = K_Line_Set.K_Line_LID48;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x48;
Tx_Len = 2;
DTCstatusCHGFFK_Line = 1;
break;
case 0x49: /* 辅助驻车 */
K_Line_Set.K_Line_LID49 = RequestData[2];
User_App.User_Parking = K_Line_Set.K_Line_LID49;
K_Line_Set.K_Line_LID49 = RequestData[2];
User_App.User_Parking = K_Line_Set.K_Line_LID49;
User_set_Num.User_Parking = K_Line_Set.K_Line_LID49;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x49;
Tx_Len = 2;
......@@ -541,6 +546,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
case 0x4A: /* 变速箱油 */
K_Line_Set.K_Line_LID4A = RequestData[2];
User_App.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u ;
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4A;
Tx_Len = 2;
......@@ -549,6 +555,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
case 0x4B: /* 差速器油 */
K_Line_Set.K_Line_LID4B = RequestData[2];
User_App.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u ;
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4B;
Tx_Len = 2;
......@@ -564,6 +571,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
case 0x4D: /* 动力转向油 */
K_Line_Set.K_Line_LID4D = RequestData[2];
User_App.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u ;
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4D;
Tx_Len = 2;
......@@ -572,14 +580,16 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
case 0x4E: /* 轮胎 */
K_Line_Set.K_Line_LID4E = RequestData[2];
User_App.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u ;
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4E;
Tx_Len = 2;
DTCstatusCHGFFK_Line = 1;
break;
case 0x4F: /* 机油&滤清器 */
K_Line_Set.K_Line_LID4F = RequestData[2];
User_App.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ;
K_Line_Set.K_Line_LID4F = RequestData[2];
User_App.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ;
User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ;
(*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
(*TxData++) = 0x4F;
Tx_Len = 2;
......
source/Driver/Graphic/images.c
View file @ 38aa18bc
......@@ -1697,8 +1697,8 @@ static const t_PicStruct Pic_Attribute[] =
{ /*EN_Alarm_01_wenzi5 X380_Y179.png*/ 380u, 179u, 420u, 184u, ARGB8888, 0x1528BE80u },
{ /*EN_Alarm_72_wenzi X434_Y194.png*/ 434u, 194u, 312u, 40u, ARGB8888, 0x152D7600u },
{ /*EN_Alarm_73_wenzi X434_Y194.png*/ 434u, 194u, 312u, 40u, ARGB8888, 0x152E3900u },
{ /*EN_Alarm_74_wenzi X434_Y170.png*/ 434u, 170u, 312u, 80u, ARGB8888, 0x152EFC00u },
{ /*EN_Alarm_75_wenzi X434_Y170.png*/ 434u, 170u, 312u, 80u, ARGB8888, 0x15308200u },
{ /*EN_Alarm_74_wenzi X434_Y170.png*/ 434u, 180u, 312u, 80u, ARGB8888, 0x152EFC00u },
{ /*EN_Alarm_75_wenzi X434_Y170.png*/ 434u, 180u, 312u, 80u, ARGB8888, 0x15308200u },
{ /*EN_Alarm_76_wenzi1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x15320800u },
{ /*EN_Alarm_76_wenzi2 X486_Y225.png*/ 486u, 225u, 280u, 132u, ARGB8888, 0x15327D40u },
{ /*EN_Alarm_drive_56_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1534BEC0u },
......
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