Commit 452dfb7d authored by hu's avatar hu

调整bug

parent 146845a7
...@@ -1133,12 +1133,16 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -1133,12 +1133,16 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
/*工厂模式*/ /*工厂模式*/
else if (MenuFlag.Menu_StaFlag == 0x00u) else if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u);
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u; MenuFlag.Menu_StaFlag = 0x01u;
} }
/*经销商模式*/ /*经销商模式*/
else if (MenuFlag.Menu_StaFlag == 0x02u) else if (MenuFlag.Menu_StaFlag == 0x02u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u);
K_Line_Set.K_Line_LID51 = 0x02u; K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u; MenuFlag.Menu_StaFlag = 0x01u;
} }
...@@ -1173,12 +1177,16 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -1173,12 +1177,16 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
/*工厂模式*/ /*工厂模式*/
else if (MenuFlag.Menu_StaFlag == 0x00u) else if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u);
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u; MenuFlag.Menu_StaFlag = 0x01u;
} }
/*经销商模式*/ /*经销商模式*/
else if (MenuFlag.Menu_StaFlag == 0x02u) else if (MenuFlag.Menu_StaFlag == 0x02u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u);
K_Line_Set.K_Line_LID51 = 0x02u; K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u; MenuFlag.Menu_StaFlag = 0x01u;
} }
......
...@@ -262,6 +262,7 @@ void Level1Menu_1Do(void) ...@@ -262,6 +262,7 @@ void Level1Menu_1Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
...@@ -293,6 +294,7 @@ void Level1Menu_2Do(void) ...@@ -293,6 +294,7 @@ void Level1Menu_2Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
...@@ -324,6 +326,7 @@ void Level1Menu_3Do(void) ...@@ -324,6 +326,7 @@ void Level1Menu_3Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
...@@ -355,6 +358,7 @@ void Level1Menu_4Do(void) ...@@ -355,6 +358,7 @@ void Level1Menu_4Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
...@@ -386,6 +390,7 @@ void Level1Menu_5Do(void) ...@@ -386,6 +390,7 @@ void Level1Menu_5Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
...@@ -417,6 +422,7 @@ void Level1Menu_6Do(void) ...@@ -417,6 +422,7 @@ void Level1Menu_6Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
...@@ -446,6 +452,7 @@ void LevelPopup_Do(void) ...@@ -446,6 +452,7 @@ void LevelPopup_Do(void)
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u) if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{ {
Common_Set_Menu_FacDea_Time_Sta(0x00u); Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u) if (MenuFlag.Menu_StaFlag == 0x00u)
{ {
K_Line_Set.K_Line_LID51 = 0x00u; K_Line_Set.K_Line_LID51 = 0x00u;
......
...@@ -550,6 +550,8 @@ void Common_Input_Para(void) ...@@ -550,6 +550,8 @@ void Common_Input_Para(void)
HIGH_VOLTAGE_TIME2 = 0x00u; HIGH_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE = 0x0u; HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u; LOW_VOLTAGE = 0x0u;
Menu_FacDea_Time = 0u;
} }
} }
......
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