Commit 199dbc5f authored by lixin's avatar lixin

feat:BYQ_GTX400_检测台

parent 48c28b97
...@@ -831,263 +831,281 @@ void can_submit(void) ...@@ -831,263 +831,281 @@ void can_submit(void)
{ {
case 1: case 1:
/* 车速 */ /* 车速 */
data1[0] = 0x20; data1[2] = 0x20;
data1[1] = 0x08; data1[3] = 0x01;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x17; data2[3] = 0x17;
data2[4] = 0x01; data2[4] = 0x0B;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x00; //手机电量,GSM功率
data3[1] = 0x04; //时间使能 data3[2]=0x00;
data3[3] = 0x16; //加热手柄指示灯 init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[0] = 0x00; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x05;
data5[2]=0xDC;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯 data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x04; //侧支架指示灯,发动机故障 data7[5] = 0x84; //侧支架指示灯,发动机故障
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 2: case 2:
/* 车速 */ /* 车速 */
data1[0] = 0x28; data1[2] = 0x28;
data1[1] = 0xA0; data1[3] = 0x51;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x2D; data2[3] = 0x2D;//22.44
data2[4] = 0x16; data2[4] = 0x16;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x09; //手机电量 data3[0] = 0x09; //手机电量
data3[1] = 0x04; data3[1] = 0x04;
data3[3] = 0x02; //加热手柄指示灯 data3[3] = 0x04; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x03; //ABS data4[2] = 0x64; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x180, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x0D;
data5[2]=0xAC;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯 data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 3: case 3:
/* 车速 */ /* 车速 */
data1[0] = 0x2C; data1[2] = 0x2C;
data1[1] = 0x88; data1[3] = 0x5C;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x43; data2[3] = 0x43;//23.42
data2[4] = 0x17; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x12; //手机电量 data3[0] = 0x12; //手机电量
data3[1] = 0x14; //来电指示灯,APP连接指示灯 data3[1] = 0x14; //来电指示灯,APP连接指示灯
data3[3] = 0x04; //加热手柄指示灯 data3[3] = 0x08; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[0] = 0x0C; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x11;
data5[2]=0x6C;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯 data6[2] = 0x6C; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x180, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 4: case 4:
/* 车速 */ /* 车速 */
data1[0] = 0x30; data1[2] = 0x30;
data1[1] = 0xD4; data1[3] = 0xAC;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x59; data2[3] = 0x59;
data2[4] = 0x0E; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x1B; //手机电量 data3[0] = 0x1B; //手机电量
data3[1] = 0x26; //智能手机连接指示灯,手机消息指示灯 data3[1] = 0x26; //智能手机连接指示灯,手机消息指示灯
data3[3] = 0x06; //加热手柄指示灯 data3[3] = 0x0C; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[2] = 0x7D; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x180, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x15;
data5[2]=0x74;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯 data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 5: case 5:
/* 车速 */ /* 车速 */
data1[0] = 0x34; data1[2] = 0x34;
data1[1] = 0xBC; data1[3] = 0xA0;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x6F; data2[3] = 0x6F;
data2[4] = 0x0F; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x24; //手机电量 data3[0] = 0x24; //手机电量
data3[1] = 0x04; //未接指示灯 data3[1] = 0x04; //未接指示灯
data3[3] = 0x08; //加热手柄指示灯 data3[3] = 0x0C; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[2] = 0x95; //水温
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x180, 8, 1, data4);
data5[4] = 0x00; //发动机无法启动指示灯 data5[4] = 0x00; //发动机无法启动指示灯
data5[1]=0x19;
data5[2]=0x68;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯 data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 6: case 6:
/* 车速 */ /* 车速 */
data1[0] = 0x38; data1[2] = 0x38;
data1[1] = 0xA4; data1[3] = 0xCC;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x71; data2[3] = 0x71;
data2[4] = 0x10; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x2D; //手机电量 data3[0] = 0x2D; //手机电量
data3[1] = 0xC4; //未接指示灯,音乐 data3[1] = 0xC4; //未接指示灯,音乐
data3[3] = 0x0A; //加热手柄指示灯 data3[3] = 0x0C; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[0] = 0x20; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x1D;
data5[2]=0x4C;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xCC;
data6[4] = 0x00; //ASR指示灯 init_CAN_Frame(&m_msg6, 0x180, 8, 1, data6);
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 7: case 7:
/* 车速 */ /* 车速 */
data1[0] = 0x3C; data1[2] = 0x3C;
data1[1] = 0xF0; data1[3] = 0xD8;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x73; data2[3] = 0x73;
data2[4] = 0x11; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x2E; //手机电量 data3[0] = 0x2E; //手机电量
data3[1] = 0x04; data3[1] = 0x04;
data3[3] = 0x0C; //加热手柄指示灯 data3[3] = 0x0C; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[2] = 0x6C; //水温
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x180, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x21;
data5[2]=0x34;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0xC0; //ASR指示灯 data6[4] = 0xD0; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x00; //侧支架指示灯 data7[5] = 0x80; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 8: case 8:
/* 车速 */ /* 车速 */
data1[0] = 0x40; data1[2] = 0x41;
data1[1] = 0xD8; data1[3] = 0x51;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x75; data2[3] = 0x75;
data2[4] = 0x12; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x2E; //手机电量 data3[0] = 0x2E; //手机电量
data3[1] = 0x04; data3[1] = 0x04;
data3[3] = 0x0E; //加热手柄指示灯 data3[3] = 0x0C; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3); init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x00; //ABS data4[2] = 0x6C; //水温
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x180, 8, 1, data4);
data5[4] = 0x40; //发动机无法启动指示灯 data5[4] = 0x40; //发动机无法启动指示灯
data5[1]=0x25;
data5[2]=0x0C;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0x00; //ASR指示灯 data6[4] = 0x00; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x80; //侧支架指示灯 data7[5] = 0x08; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
break; break;
case 9: case 9:
/* 车速 */ /* 车速 */
data1[0] = 0x4E; data1[2] = 0x4D;
data1[1] = 0x20; data1[3] = 0xB4;
init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1); init_CAN_Frame(&m_msg1, 0x260, 8, 1, data1);
/* 时间 */ /* 时间 */
data2[3] = 0x77; data2[3] = 0x77;
data2[4] = 0x13; data2[4] = 0x17;
init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2); init_CAN_Frame(&m_msg2, 0x600, 8, 1, data2);
data3[0] = 0x2E; //手机电量 data3[2]=0x6C;
data3[1] = 0xF6; //未接指示灯,音乐 init_CAN_Frame(&m_msg3, 0x180, 8, 1, data3);
data3[3] = 0x12; //加热手柄指示灯
init_CAN_Frame(&m_msg3, 0x687, 8, 1, data3);
data4[0] = 0x03; //ABS data4[0] = 0x23; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x261, 8, 1, data4);
data5[4] = 0x00; //发动机无法启动指示灯 data5[4] = 0x00; //发动机无法启动指示灯
data5[1]=0x2E;
data5[2]=0xE0;
init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x120, 8, 1, data5);
data6[2] = 0xAB; //配置为AB data6[2] = 0xAB; //配置为AB
data6[4] = 0xC0; //ASR指示灯 data6[4] = 0xC0; //ASR指示灯
init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x200, 8, 1, data6);
data7[5] = 0x84; //侧支架指示灯 data7[5] = 0x08; //侧支架指示灯
init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7); init_CAN_Frame(&m_msg7, 0x100, 8, 1, data7);
data9[5] = 0x88; //侧支架指示灯
init_CAN_Frame(&m_msg9, 0x100, 8, 1, data9);
can_mid(m_msg9);
break; break;
case 10: case 10:
POWER_CTRL_KL30 = 0u; //B+ POWER_CTRL_KL30 = 0u; //B+
...@@ -1096,7 +1114,17 @@ void can_submit(void) ...@@ -1096,7 +1114,17 @@ void can_submit(void)
default: default:
break; break;
} }
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<=9) if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<9)
{
can_mid(m_msg1);
can_mid(m_msg2);
can_mid(m_msg3);
can_mid(m_msg4);
can_mid(m_msg5);
can_mid(m_msg6);
can_mid(m_msg7);
}
else if(MENU_CHECK_STEP == 9)
{ {
can_mid(m_msg1); can_mid(m_msg1);
can_mid(m_msg2); can_mid(m_msg2);
...@@ -1105,6 +1133,7 @@ void can_submit(void) ...@@ -1105,6 +1133,7 @@ void can_submit(void)
can_mid(m_msg5); can_mid(m_msg5);
can_mid(m_msg6); can_mid(m_msg6);
can_mid(m_msg7); can_mid(m_msg7);
can_mid(m_msg9);
} }
} }
uint8_t u8get714msg[8]; uint8_t u8get714msg[8];
...@@ -1533,7 +1562,7 @@ void Get_SWOUT_msg(void) ...@@ -1533,7 +1562,7 @@ void Get_SWOUT_msg(void)
ruanjianoutsidebanbenhao[22] = u8getSWmsg[6]; ruanjianoutsidebanbenhao[22] = u8getSWmsg[6];
ruanjianoutsidebanbenhao[23] = u8getSWmsg[7]; ruanjianoutsidebanbenhao[23] = u8getSWmsg[7];
ruanjianoutsidebanbenhao[24] = 0xFF; ruanjianoutsidebanbenhao[24] = 0xFF;
General_Number_Disp(ruanjianoutsidebanbenhao, 03, 100); // General_Number_Disp(ruanjianoutsidebanbenhao, 03, 100);
UDSStep = 2; UDSStep = 2;
} }
} }
...@@ -1560,7 +1589,7 @@ void Get_HWIN_msg(void) ...@@ -1560,7 +1589,7 @@ void Get_HWIN_msg(void)
yingjianinbanbenhao[4] = u8getSWmsg[2]; yingjianinbanbenhao[4] = u8getSWmsg[2];
yingjianinbanbenhao[5] = u8getSWmsg[3]; yingjianinbanbenhao[5] = u8getSWmsg[3];
yingjianinbanbenhao[6] = 0xFF; yingjianinbanbenhao[6] = 0xFF;
General_Number_Disp(yingjianinbanbenhao, 03, 175); // General_Number_Disp(yingjianinbanbenhao, 03, 175);
UDSStep = 3; UDSStep = 3;
} }
} }
...@@ -1590,7 +1619,7 @@ void Get_HWOUT_msg(void) ...@@ -1590,7 +1619,7 @@ void Get_HWOUT_msg(void)
yingjianoutbanbenhao[6] = u8getSWmsg[4]; yingjianoutbanbenhao[6] = u8getSWmsg[4];
yingjianoutbanbenhao[7] = u8getSWmsg[5]; yingjianoutbanbenhao[7] = u8getSWmsg[5];
yingjianoutbanbenhao[8] = 0xFF; yingjianoutbanbenhao[8] = 0xFF;
General_Number_Disp(yingjianoutbanbenhao, 03, 225); // General_Number_Disp(yingjianoutbanbenhao, 03, 225);
UDSStep = 4; UDSStep = 4;
} }
} }
...@@ -1624,7 +1653,7 @@ void Get_PN_msg(void) ...@@ -1624,7 +1653,7 @@ void Get_PN_msg(void)
lingjianhaodisplay[6] = lingjianhao[3] / 16; lingjianhaodisplay[6] = lingjianhao[3] / 16;
lingjianhaodisplay[7] = lingjianhao[3] % 16; lingjianhaodisplay[7] = lingjianhao[3] % 16;
lingjianhaodisplay[8] = 0xff; lingjianhaodisplay[8] = 0xff;
General_Number_Disp_No_Conver(lingjianhaodisplay, 03, 275); // General_Number_Disp_No_Conver(lingjianhaodisplay, 03, 275);
UDSStep = 5; UDSStep = 5;
} }
} }
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
#include "CAN_Communication_Matrix.h" #include "CAN_Communication_Matrix.h"
#include "COM_CAN.h" #include "COM_CAN.h"
#include "GenDelay.h" #include "GenDelay.h"
LIN_Flag_T LIN_Flag={.LIN_LEFT_Flag=0,
.LIN_RIGHT_Flag=0,
.LIN_F_Right_Flag=0};
uint32_t NO_IPK_EXIST_Status; uint32_t NO_IPK_EXIST_Status;
uint32_t NO_IPK_EXIST; uint32_t NO_IPK_EXIST;
//uint32_t NO_IPK_EXIST_Back; //uint32_t NO_IPK_EXIST_Back;
...@@ -599,15 +602,17 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -599,15 +602,17 @@ void Function_Check_Ctrl(uint32_t cmd)
POWER_CTRL_KL15 = 1u; //KL15 POWER_CTRL_KL15 = 1u; //KL15
/*正控*/ /*正控*/
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0; //左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0; //右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 1;
FUEL_RES_3 = 0; FUEL_RES_3= 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
LIN_Flag.LIN_LEFT_Flag=0;
LIN_Flag.LIN_RIGHT_Flag=0;
break; break;
} }
case 1: case 1:
...@@ -627,15 +632,22 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -627,15 +632,22 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_10 = 0; // LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 if(LIN_Flag.LIN_RIGHT_Flag==0)
LINE_OUT_POS_01 = 1; //右转 {
LINE_FUEL_RES04222 = 1;//右转
Gen_TimeDelay (100 *1000,50U);
LINE_FUEL_RES04222=0;
LIN_Flag.LIN_RIGHT_Flag++;
}
LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_11 = 1; //防盗 LINE_OUT_POS_11 = 1; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油5200,93,55,10*/
FUEL_RES_1 = 0; //开路0格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 1;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 1; FUEL_RES_4 = 0;
break; break;
} }
...@@ -655,15 +667,24 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -655,15 +667,24 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_09 = 1; // LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0; // LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_RESET=1;
LINE_OUT_POS_02 = 1; //远光 LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_01 = 0; //右转 if(LIN_Flag.LIN_LEFT_Flag==0)
{
LINE_FUEL_RES04111 = 1;
Gen_TimeDelay ( 100 *1000,50U);
LINE_FUEL_RES04111=0;
LIN_Flag.LIN_LEFT_Flag++;
}
LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 1; //机油压力 LINE_OUT_POS_12 = 1; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; //1格 FUEL_RES_1 = 1;
FUEL_RES_2 = 0; FUEL_RES_2 = 1;
FUEL_RES_3 = 1; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
...@@ -684,15 +705,20 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -684,15 +705,20 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_10 = 0; // LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
if(LIN_Flag.LIN_LEFT_Flag==1 || LIN_Flag.LIN_RIGHT_Flag==1)
{
LINE_RESET=1; //复位
Gen_TimeDelay ( 50 *1000,50U);
LINE_RESET=0;
}
// /*燃油*/ // /*燃油*/
FUEL_RES_1 = 0; //2格 FUEL_RES_1 = 0; //2格
FUEL_RES_2 = 1; FUEL_RES_2 = 0;
FUEL_RES_3 = 0; FUEL_RES_3 = 1;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
...@@ -717,8 +743,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -717,8 +743,8 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_04 = 0; // LINE_OUT_POS_04 = 0;
// LINE_OUT_POS_04 = 1; //左转 // LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油*/
...@@ -749,15 +775,15 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -749,15 +775,15 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_03 = 0; // LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0; // LINE_OUT_POS_04 = 0;
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //4格 FUEL_RES_1 = 0; //4格
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 1;
break; break;
} }
...@@ -781,14 +807,14 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -781,14 +807,14 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_03 = 0; // LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0; // LINE_OUT_POS_04 = 0;
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //5格 FUEL_RES_1 = 0; //5格
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
FUEL_RES_3 = 0; FUEL_RES_3 = 1;
FUEL_RES_4 = 1; FUEL_RES_4 = 1;
break; break;
} }
...@@ -812,14 +838,14 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -812,14 +838,14 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_03 = 0; // LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0; // LINE_OUT_POS_04 = 0;
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //5格 FUEL_RES_1 = 0; //5格
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
FUEL_RES_3 = 0; FUEL_RES_3 = 1;
FUEL_RES_4 = 1; FUEL_RES_4 = 1;
break; break;
} }
...@@ -843,14 +869,14 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -843,14 +869,14 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_POS_03 = 0; // LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0; // LINE_OUT_POS_04 = 0;
LINE_OUT_POS_02 = 0; //远光 LINE_OUT_POS_02 = 0; //远光
LINE_OUT_POS_04 = 0; //左转 LINE_FUEL_RES04111 = 0;//左转
LINE_OUT_POS_01 = 0; //右转 LINE_FUEL_RES04222 = 0;//右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //5格 FUEL_RES_1 = 0; //5格
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
FUEL_RES_3 = 0; FUEL_RES_3 = 1;
FUEL_RES_4 = 1; FUEL_RES_4 = 1;
break; break;
} }
...@@ -870,14 +896,14 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -870,14 +896,14 @@ void Function_Check_Ctrl(uint32_t cmd)
// LINE_OUT_NEG_10 = 0; // LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_02 = 1; //远光 LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 1; //左转 LINE_FUEL_RES04111 = 0; //左转
LINE_OUT_POS_01 = 1; //右转 LINE_FUEL_RES04222 = 0; //右转
LINE_OUT_POS_11 = 1; //防盗 LINE_OUT_POS_11 = 1; //防盗
LINE_OUT_POS_12 = 1; //机油压力 LINE_OUT_POS_12 = 1; //机油压力
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //5格 FUEL_RES_1 = 0; //5格
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
FUEL_RES_3 = 0; FUEL_RES_3 = 1;
FUEL_RES_4 = 1; FUEL_RES_4 = 1;
break; break;
} }
...@@ -888,8 +914,9 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -888,8 +914,9 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_01 = 0; //右转 LINE_OUT_POS_01 = 0; //右转
LINE_OUT_POS_11 = 0; //防盗 LINE_OUT_POS_11 = 0; //防盗
LINE_OUT_POS_12 = 0; //机油压力 LINE_OUT_POS_12 = 0; //机油压力
POWER_CTRL_KL30 = 0u; //B+ POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15 POWER_CTRL_KL15 = 0u; //KL15
break; break;
} }
} }
...@@ -898,6 +925,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -898,6 +925,7 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
} }
void Get_ODO_Call(void) void Get_ODO_Call(void)
{ {
} }
...@@ -15,7 +15,12 @@ ...@@ -15,7 +15,12 @@
uint8_t Get_DID_High_Byte(uint16_t Input_DID); uint8_t Get_DID_High_Byte(uint16_t Input_DID);
uint8_t Get_DID_Low_Byte(uint16_t Input_DID); uint8_t Get_DID_Low_Byte(uint16_t Input_DID);
typedef struct
{
uint8_t LIN_LEFT_Flag;
uint8_t LIN_RIGHT_Flag;
uint8_t LIN_F_Right_Flag;
}LIN_Flag_T;
extern unsigned char InterNal_Version [ 128 ]; extern unsigned char InterNal_Version [ 128 ];
......
...@@ -95,7 +95,35 @@ void RTE_GPIO_Init(void) ...@@ -95,7 +95,35 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_OUT; gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
//水温
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_3;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_4;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_15;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_11;
gpio_temp.enGPIOPIN = GPIO_PIN_0;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
/*******************LiJianshuang 增加10个正控,10个负控的IO口初始化配置************************************/ /*******************LiJianshuang 增加10个正控,10个负控的IO口初始化配置************************************/
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_10;
gpio_temp.enGPIOPIN = GPIO_PIN_6; gpio_temp.enGPIOPIN = GPIO_PIN_6;
...@@ -284,6 +312,14 @@ void RTE_GPIO_Init(void) ...@@ -284,6 +312,14 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//--右转输出 GPIO_Config(&gpio_temp);//--右转输出
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_14;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//--右转输出
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;
gpio_temp.enGPIOPIN = GPIO_PIN_12; gpio_temp.enGPIOPIN = GPIO_PIN_12;
gpio_temp.enGPIOMode = GPIO_MODE_PORT; gpio_temp.enGPIOMode = GPIO_MODE_PORT;
...@@ -326,10 +362,38 @@ void RTE_GPIO_Init(void) ...@@ -326,10 +362,38 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//右键输出 GPIO_Config(&gpio_temp);//右键输出
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;
gpio_temp.enGPIOPIN = GPIO_PIN_11;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//右键输出
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_6; gpio_temp.enGPIOPIN = GPIO_PIN_6;
gpio_temp.enGPIOMode = GPIO_MODE_PORT; gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT; gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//钥匙确认
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_3;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//钥匙确认
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_5;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//钥匙确认
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_1;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//钥匙确认 GPIO_Config(&gpio_temp);//钥匙确认
} }
...@@ -93,7 +93,9 @@ ...@@ -93,7 +93,9 @@
//防盗 //防盗
#define LINE_OUT_POS_11 GPIO_OUT_APORT00_PIN12 #define LINE_OUT_POS_11 GPIO_OUT_APORT00_PIN12
//远光 //远光
#define LINE_OUT_POS_02 GPIO_OUT_PORT10_PIN13 #define LINE_OUT_POS_02 GPIO_OUT_PORT00_PIN14
//复位
#define LINE_RESET GPIO_OUT_APORT00_PIN14
//位置灯 //位置灯
#define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04 #define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04
#define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06 #define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06
...@@ -129,7 +131,8 @@ ...@@ -129,7 +131,8 @@
#define LINE_FUEL_RES03 GPIO_OUT_PORT08_PIN10 #define LINE_FUEL_RES03 GPIO_OUT_PORT08_PIN10
#define LINE_FUEL_RES04 GPIO_OUT_PORT08_PIN11 #define LINE_FUEL_RES04 GPIO_OUT_PORT08_PIN11
#define LINE_FUEL_RES04111 GPIO_OUT_PORT00_PIN03
#define LINE_FUEL_RES04222 GPIO_OUT_PORT00_PIN05
//zh: //zh:
/****************************************************************************** /******************************************************************************
......
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