Skip to content

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

修改禅道836气压采集接口，与外发气压值问题

parent 93b65620
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 36 deletions
source/Application/APP/Data_AirPressure/Data_AirPressure.c
View file @ 11087aec
...@@ -97,14 +97,16 @@ void Data_Gas1_Processing_Service(void) ...@@ -97,14 +97,16 @@ void Data_Gas1_Processing_Service(void)
uint32_t Gas_Value = 0u; uint32_t Gas_Value = 0u;
uint32_t data = 0u; uint32_t data = 0u;
if ((K_Line_Set.K_Line_LID42 == 0x00) || (K_Line_Set.K_Line_LID42 == 0x02)) //if ((K_Line_Set.K_Line_LID42 == 0x00) || (K_Line_Set.K_Line_LID42 == 0x02))
{ //{
Gas_Value = RTE_Read_PRIMARY_AIR_Voltage(); // Gas_Value = RTE_Read_PRIMARY_AIR_Voltage();
} //}
else if ((K_Line_Set.K_Line_LID42 == 0x01) || (K_Line_Set.K_Line_LID42 == 0x03)) //else if ((K_Line_Set.K_Line_LID42 == 0x01) || (K_Line_Set.K_Line_LID42 == 0x03))
{ //{
Gas_Value = RTE_Read_SECONDARY_AIR_Voltage(); // Gas_Value = RTE_Read_SECONDARY_AIR_Voltage();
} //}
Gas_Value = RTE_Read_PRIMARY_AIR_Voltage();/*禅道836*/
if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON)) if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON))
{ {
...@@ -183,14 +185,16 @@ void Data_Gas2_Processing_Service(void) ...@@ -183,14 +185,16 @@ void Data_Gas2_Processing_Service(void)
uint32_t Gas_Value = 0u; uint32_t Gas_Value = 0u;
uint32_t data = 0u; uint32_t data = 0u;
if ((K_Line_Set.K_Line_LID42 == 0x00) || (K_Line_Set.K_Line_LID42 == 0x02)) //if ((K_Line_Set.K_Line_LID42 == 0x00) || (K_Line_Set.K_Line_LID42 == 0x02))
{ //{
Gas_Value = RTE_Read_SECONDARY_AIR_Voltage(); // Gas_Value = RTE_Read_SECONDARY_AIR_Voltage();
} //}
else if ((K_Line_Set.K_Line_LID42 == 0x01) || (K_Line_Set.K_Line_LID42 == 0x03)) //else if ((K_Line_Set.K_Line_LID42 == 0x01) || (K_Line_Set.K_Line_LID42 == 0x03))
{ //{
Gas_Value = RTE_Read_PRIMARY_AIR_Voltage(); // Gas_Value = RTE_Read_PRIMARY_AIR_Voltage();
} //}
Gas_Value = RTE_Read_SECONDARY_AIR_Voltage();/*禅道836*/
if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON)) if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON))
{ {
...@@ -269,14 +273,16 @@ void Data_WET_Processing_Service(void) ...@@ -269,14 +273,16 @@ void Data_WET_Processing_Service(void)
uint32_t Gas_Value = 0u; uint32_t Gas_Value = 0u;
uint32_t data = 0u; uint32_t data = 0u;
if ((K_Line_Set.K_Line_LID42 == 0x00) || (K_Line_Set.K_Line_LID42 == 0x02)) //if ((K_Line_Set.K_Line_LID42 == 0x00) || (K_Line_Set.K_Line_LID42 == 0x02))
{ //{
Gas_Value = RTE_Read_WET_AIR_Voltage(); // Gas_Value = RTE_Read_WET_AIR_Voltage();
} //}
else if ((K_Line_Set.K_Line_LID42 == 0x01) || (K_Line_Set.K_Line_LID42 == 0x03)) //else if ((K_Line_Set.K_Line_LID42 == 0x01) || (K_Line_Set.K_Line_LID42 == 0x03))
{ //{
Gas_Value = RTE_Read_WET_AIR_Voltage(); // Gas_Value = RTE_Read_WET_AIR_Voltage();
} //}
Gas_Value = RTE_Read_WET_AIR_Voltage();/*禅道836*/
if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON)) if ((Common_Get_IG_Sts_Valid() == 1u) && (Common_Get_IG_Sts() == COMMON_POWER_ON))
{ {
......
source/Application/APP/GaugesMode/GaugesInterface.c
View file @ 11087aec
...@@ -26,12 +26,12 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] = ...@@ -26,12 +26,12 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
}, },
/*PRI气压*/ /*PRI气压*/
{ {500, 720, 940, 1160, 1380, 1600, 1820, 1990, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0}, { {500, 720, 940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
{610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0}, {610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0} { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0}
}, },
/*SEC气压*/ /*SEC气压*/
{ {500, 720, 940, 1160, 1380, 1600, 1820, 1990, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0}, { {500, 720, 940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
{610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0}, {610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0} { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0}
}, },
......
source/Application/APP/Key/Key_user.c
View file @ 11087aec
...@@ -1737,7 +1737,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void) ...@@ -1737,7 +1737,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void)
} }
else else
{ {
if ((Key_R >= (4800 - 400)) && (Key_R <= (4800 + 400))) if ((Key_R >= (5300 - 400)) && (Key_R <= (5300 + 400)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
...@@ -1763,7 +1763,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void) ...@@ -1763,7 +1763,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void)
} }
else else
{ {
if ((Key_R >= (7800 - 400)) && (Key_R <= (7800 + 400))) if ((Key_R >= (8900 - 400)) && (Key_R <= (8900 + 400)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 11087aec
...@@ -90,7 +90,48 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[]) ...@@ -90,7 +90,48 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
/*WET*/ /*WET*/
Main_Air_Pressure = (uint8_t)((Common_Get_WET_Data() - 500u) / 20u); Main_Air_Pressure = (uint8_t)((Common_Get_WET_Data() - 500u) / 20u);
/*气压状态*/ /*气压状态*//*禅道836*/
if (K_Line_Set.K_Line_LID42 == 0x00u)
{
if (Common_Get_Air2_Data() != 0u)
{
Service_Brake_Circuit1_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u);
}
else
{
Service_Brake_Circuit1_AirPressure = 0u;
}
if (Common_Get_Air1_Data() != 0u)
{
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air1_Data() - 500u) / 20u);
}
else
{
Service_Brake_Circuit2_AirPressure = 0u;
}
}
else if ((K_Line_Set.K_Line_LID42 == 0x01u) || f (K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u))
{
if (Common_Get_Air1_Data() != 0u)
{
Service_Brake_Circuit1_AirPressure = (uint8_t)((Common_Get_Air1_Data() - 500u) / 20u);
}
else
{
Service_Brake_Circuit1_AirPressure = 0u;
}
if (Common_Get_Air2_Data() != 0u)
{
Service_Brake_Circuit2_AirPressure = (uint8_t)((Common_Get_Air2_Data() - 500u) / 20u);
}
else
{
Service_Brake_Circuit2_AirPressure = 0u;
}
}
/*
if ((K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u)) if ((K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u))
{ {
if (Common_Get_Air1_Data() != 0u) if (Common_Get_Air1_Data() != 0u)
...@@ -131,7 +172,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[]) ...@@ -131,7 +172,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Service_Brake_Circuit2_AirPressure = 0u; Service_Brake_Circuit2_AirPressure = 0u;
} }
} }
*/
/*电源电压*/ /*电源电压*/
Power_Supply_Voltage = 0u; Power_Supply_Voltage = 0u;
......
source/Application/Graphic/GUI/GUI.c
View file @ 11087aec
...@@ -6160,7 +6160,7 @@ void GUI_BG_UserSet_SYSD_GSL_Display(uint8_t Mode) ...@@ -6160,7 +6160,7 @@ void GUI_BG_UserSet_SYSD_GSL_Display(uint8_t Mode)
if (User_Value != 0xFF) if (User_Value != 0xFF)
{ {
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/ GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 250u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*km/h*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*km/h*/
} }
else else
...@@ -6195,7 +6195,7 @@ void GUI_BG_UserSet_SYSD_Ybl_Display(uint8_t Mode) ...@@ -6195,7 +6195,7 @@ void GUI_BG_UserSet_SYSD_Ybl_Display(uint8_t Mode)
if (User_Value != 0xFF) if (User_Value != 0xFF)
{ {
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/ GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 250u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*km/h*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*km/h*/
} }
else else
...@@ -6232,13 +6232,13 @@ void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode) ...@@ -6232,13 +6232,13 @@ void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode)
{ {
if (User_Value != 0u) if (User_Value != 0u)
{ {
GUI_Translate_Display(MENU_Sprite, Nb_15_0, 520u, 255u, GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, Nb_15_0, 520u, 250u, GUI_BLENDMODE_CUSTOM);
GUI_Translate_Display(MENU_Sprite, Nb_15_0, 503u, 255u, GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, Nb_15_0, 503u, 250u, GUI_BLENDMODE_CUSTOM);
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 2u, 1u, GUI_SYSSPEED, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/ GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 2u, 1u, GUI_SYSSPEED, 250u, GUI_BLENDMODE_SRC_OVER);/*数字*/
} }
else else
{ {
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/ GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 250u, GUI_BLENDMODE_SRC_OVER);/*数字*/
} }
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_rpm, GUI_BLENDMODE_SRC_OVER);/*rmp*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_rpm, GUI_BLENDMODE_SRC_OVER);/*rmp*/
......
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