Commit 772d0fe1 authored by 何锐's avatar 何锐

🐞 fix:修改指示灯异常闪烁与米字段偶发不亮问题

parent a5c6e9db
...@@ -320,7 +320,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -320,7 +320,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x31; data11[7] = 0x31;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 2) else if(Meter_field_step == 2)
...@@ -386,7 +386,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -386,7 +386,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x32; data11[7] = 0x32;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 3) else if(Meter_field_step == 3)
...@@ -452,7 +452,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -452,7 +452,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x33; data11[7] = 0x33;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 4) else if(Meter_field_step == 4)
...@@ -518,7 +518,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -518,7 +518,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x34; data11[7] = 0x34;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 5) else if(Meter_field_step == 5)
...@@ -584,7 +584,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -584,7 +584,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x35; data11[7] = 0x35;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 6) else if(Meter_field_step == 6)
...@@ -650,7 +650,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -650,7 +650,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x36; data11[7] = 0x36;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 7) else if(Meter_field_step == 7)
...@@ -716,7 +716,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -716,7 +716,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x37; data11[7] = 0x37;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
else if(Meter_field_step == 8) else if(Meter_field_step == 8)
...@@ -782,7 +782,7 @@ void Meter_field_display(uint8_t Meter_field_step) ...@@ -782,7 +782,7 @@ void Meter_field_display(uint8_t Meter_field_step)
data11[7] = 0x38; data11[7] = 0x38;
init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11); init_CAN_Frame(&m_msg11, 0x6A2, 8, 1, data11);
can_mid(m_msg11); can_mid(m_msg11);
Meterfieldstep ++; Meterfieldstep = 0;
} }
} }
} }
...@@ -825,9 +825,7 @@ void can_submit(void) ...@@ -825,9 +825,7 @@ void can_submit(void)
can_mid(m_msg4); can_mid(m_msg4);
} }
data9[0] = 0x00; Meter_field_display(MENU_CHECK_STEP);
init_CAN_Frame(&m_msg9, 0x687, 8, 1, data9);
can_mid(m_msg9); //米字段687报文在线
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
...@@ -859,7 +857,6 @@ void can_submit(void) ...@@ -859,7 +857,6 @@ void can_submit(void)
data7[5] = 0x04; //侧支架指示灯,发动机故障 data7[5] = 0x04; //侧支架指示灯,发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(1);
break; break;
case 2: case 2:
/* 车速 */ /* 车速 */
...@@ -889,7 +886,6 @@ void can_submit(void) ...@@ -889,7 +886,6 @@ void can_submit(void)
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x00; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(2);
break; break;
case 3: case 3:
/* 车速 */ /* 车速 */
...@@ -919,7 +915,6 @@ void can_submit(void) ...@@ -919,7 +915,6 @@ void can_submit(void)
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x00; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(3);
break; break;
case 4: case 4:
/* 车速 */ /* 车速 */
...@@ -949,7 +944,6 @@ void can_submit(void) ...@@ -949,7 +944,6 @@ void can_submit(void)
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x00; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(4);
break; break;
case 5: case 5:
/* 车速 */ /* 车速 */
...@@ -979,7 +973,6 @@ void can_submit(void) ...@@ -979,7 +973,6 @@ void can_submit(void)
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x00; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(5);
break; break;
case 6: case 6:
/* 车速 */ /* 车速 */
...@@ -1009,7 +1002,6 @@ void can_submit(void) ...@@ -1009,7 +1002,6 @@ void can_submit(void)
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x00; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(6);
break; break;
case 7: case 7:
/* 车速 */ /* 车速 */
...@@ -1039,7 +1031,6 @@ void can_submit(void) ...@@ -1039,7 +1031,6 @@ void can_submit(void)
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x00; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(7);
break; break;
case 8: case 8:
/* 车速 */ /* 车速 */
...@@ -1069,7 +1060,6 @@ void can_submit(void) ...@@ -1069,7 +1060,6 @@ void can_submit(void)
data7[5] = 0x80; //侧支架指示灯 data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
Meter_field_display(8);
break; break;
case 9: case 9:
/* 车速 */ /* 车速 */
......
...@@ -42,7 +42,7 @@ void Can_Set_Buff_75F(uint8_t CopyData []); ...@@ -42,7 +42,7 @@ void Can_Set_Buff_75F(uint8_t CopyData []);
void Meter_field_display(uint8_t Meter_field_step);
void Can_BusOffRecover(void); void Can_BusOffRecover(void);
uint8_t CrcCheckSum(uint8_t *data, uint8_t len); uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
void can_submit(void); void can_submit(void);
......
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