Skip to content

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

调整按键AD采集数值，调整胎温显示图片

parent 8372dd31
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
source/Application/APP/Key/Key_user.c
View file @ 55a6c075
......@@ -65,7 +65,7 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
/*主界面 一级菜单 二级菜单那*/
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
/*故障码*/
if ((CanStatus1 == CAN_SIG_LOST) && (bCurMenuIDX == _MN_DSP_LEVEL2MENU_2))
......@@ -367,7 +367,7 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
/*主界面 一级菜单 二级菜单*/
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
......@@ -660,7 +660,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
......@@ -1007,7 +1007,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Up(void)
}
else
{
if ((Key_R >= (1200 - 400)) && (Key_R <= (1200 + 400)))
if ((Key_R >= (1200 - 300)) && (Key_R <= (1200 + 300)))
{
enKeyRealStatus = KEY_LINE_PRESS;
}
......@@ -1034,7 +1034,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Down(void)
}
else
{
if ((Key_R >= (2700 - 400)) && (Key_R <= (2700 + 400)))
if ((Key_R >= (2500 - 300)) && (Key_R <= (2500 + 300)))
{
enKeyRealStatus = KEY_LINE_PRESS;
}
......@@ -1061,7 +1061,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void)
}
else
{
if ((Key_R >= (4800 - 400)) && (Key_R <= (5000 + 400)))
if ((Key_R >= (4300 - 400)) && (Key_R <= (4300 + 400)))
{
enKeyRealStatus = KEY_LINE_PRESS;
}
......@@ -1087,7 +1087,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void)
}
else
{
if ((Key_R >= (8000 - 400)) && (Key_R <= (8000 + 400)))
if ((Key_R >= (7000 - 400)) && (Key_R <= (7000 + 400)))
{
enKeyRealStatus = KEY_LINE_PRESS;
}
......@@ -1114,7 +1114,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
}
else
{
if ((Key_R >= (550 - 300)) && (Key_R <= (550 + 300)))
if ((Key_R >= (400 - 300)) && (Key_R <= (400 + 300)))
{
enKeyRealStatus = KEY_LINE_PRESS;
}
......@@ -1129,12 +1129,12 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
/*---------------------------------------------------------------------------------------*/
const Key_Attribute_st_t stKeyAttribute[KEY_NUM_MAX] =
{
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Up, Key_Operation_Up},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down, Key_Operation_Down},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Enter, Key_Operation_Enter},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return, Key_Operation_Return},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Menu, Key_Operation_Menu},
{
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Up, Key_Operation_Up},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down, Key_Operation_Down},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Enter, Key_Operation_Enter},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return, Key_Operation_Return},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Menu, Key_Operation_Menu},
};
Key_IGN_en_t Key_Get_IGN_Status(void)
......
source/Application/Graphic/GUI/GUI.c
View file @ 55a6c075
......@@ -3513,133 +3513,133 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
/*0x12*/
if (Temp_Sta_0x12 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x12, Nb_12_0, 2u, 1u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x12, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[0] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x12 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x12, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x12, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
/*0x13*/
if (Temp_Sta_0x13 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, Nb_12_0, 2u, 1u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[0] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x13 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
/*0x22*/
if (Temp_Sta_0x22 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[1] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x22 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
/*0x23*/
if (Temp_Sta_0x23 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[1] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x23 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
/*0x31*/
if (Temp_Sta_0x31 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x31 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
/*0x32*/
if (Temp_Sta_0x32 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[2u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x32 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
/*0x33*/
if (Temp_Sta_0x33 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[1u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x33 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
/*0x34*/
if (Temp_Sta_0x34 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x34 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
/*0x41*/
if (Temp_Sta_0x41 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x41 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
/*0x42*/
if (Temp_Sta_0x42 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[2u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x42 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
/*0x43*/
if (Temp_Sta_0x43 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[1u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x43 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
/*0x44*/
if (Temp_Sta_0x44 == STATUS_NEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, CN_RC_Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
}
else // if (Temp_Sta_0x44 == STATUS_NONNEGATIVE)
{
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
}
else
......
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