Commit 55a6c075 authored by hu's avatar hu

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

parent 8372dd31
...@@ -65,7 +65,7 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -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)) || 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)) if ((CanStatus1 == CAN_SIG_LOST) && (bCurMenuIDX == _MN_DSP_LEVEL2MENU_2))
...@@ -367,7 +367,7 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -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)) || 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); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
} }
...@@ -660,7 +660,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -660,7 +660,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) || 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); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
} }
...@@ -1007,7 +1007,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Up(void) ...@@ -1007,7 +1007,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Up(void)
} }
else else
{ {
if ((Key_R >= (1200 - 400)) && (Key_R <= (1200 + 400))) if ((Key_R >= (1200 - 300)) && (Key_R <= (1200 + 300)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
...@@ -1034,7 +1034,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Down(void) ...@@ -1034,7 +1034,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Down(void)
} }
else else
{ {
if ((Key_R >= (2700 - 400)) && (Key_R <= (2700 + 400))) if ((Key_R >= (2500 - 300)) && (Key_R <= (2500 + 300)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
...@@ -1061,7 +1061,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void) ...@@ -1061,7 +1061,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void)
} }
else else
{ {
if ((Key_R >= (4800 - 400)) && (Key_R <= (5000 + 400))) if ((Key_R >= (4300 - 400)) && (Key_R <= (4300 + 400)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
...@@ -1087,7 +1087,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void) ...@@ -1087,7 +1087,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Return(void)
} }
else else
{ {
if ((Key_R >= (8000 - 400)) && (Key_R <= (8000 + 400))) if ((Key_R >= (7000 - 400)) && (Key_R <= (7000 + 400)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
...@@ -1114,7 +1114,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void) ...@@ -1114,7 +1114,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
} }
else else
{ {
if ((Key_R >= (550 - 300)) && (Key_R <= (550 + 300))) if ((Key_R >= (400 - 300)) && (Key_R <= (400 + 300)))
{ {
enKeyRealStatus = KEY_LINE_PRESS; enKeyRealStatus = KEY_LINE_PRESS;
} }
...@@ -1129,12 +1129,12 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void) ...@@ -1129,12 +1129,12 @@ Key_Real_Status_en_t Key_Real_Status_Read_Menu(void)
/*---------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------*/
const Key_Attribute_st_t stKeyAttribute[KEY_NUM_MAX] = 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_Up, Key_Operation_Up},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down, Key_Operation_Down}, {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_Enter, Key_Operation_Enter},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return, Key_Operation_Return}, {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_Menu, Key_Operation_Menu},
}; };
Key_IGN_en_t Key_Get_IGN_Status(void) Key_IGN_en_t Key_Get_IGN_Status(void)
......
This diff is collapsed.
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