Commit afe9affd authored by 何锐's avatar 何锐

feat:初步完成报文指示灯,硬线指示灯,燃油表水温表

parent 307d6b49
...@@ -277,553 +277,513 @@ void can_submit(void) ...@@ -277,553 +277,513 @@ void can_submit(void)
CAN_Frame_st_t m_msg8; CAN_Frame_st_t m_msg8;
uint8_t data8[8] = {0, 0, 0, 0, 0, 0, 0, 0};//0x0C50FFD2 uint8_t data8[8] = {0, 0, 0, 0, 0, 0, 0, 0};//0x0C50FFD2
// CAN_Frame_st_t m_msg7; if(MENU_CHECK_STEP == 0)
// uint8_t data7[8] = {0, 0, 0, 0, 0, 0, 0, 0};
// //故障灯
// CAN_Frame_st_t m_msg7;
// uint8_t data7[8] = {0, 0, 0, 0, 0, 0, 0, 0};//0x0C50FFD2
// // CAN_Frame_st_t m_msg7;
// // uint8_t data7[8] = {0, 0, 0, 0, 0, 0, 0, 0};
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
if((MENU_CHECK_STEP != 6) && (MENU_CHECK_STEP != 10) && (MENU_CHECK_STEP != 11))
{ {
/* ABS故障指示灯 */ /* N档 */
data1[5] = 0x00; data6[4] = 0x00;
init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
// data1[7] = CRC8_CheckSum(data1,7);
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1);
can_mid(m_msg1);
} }
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 1: case 1:
/* 车速 */ //22 /* 车速 */
data1[0] = 0x01; data1[0] = 0x05;
data1[1] = 0x87; data1[1] = 0x00;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
// data1[7] = CRC8_CheckSum(data1,7);
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); /* 转速 */
data2[0] = 0x0F;
/* 转速 */ //1000 data2[1] = 0xA0;
data2[2] = 0x0F;
data2[3] = 0xA0; /* 水温开路 */
/* 水温 */ data2[4] = 0x09;
data2[5] = 0X00; data2[5] = 0x1A;
data2[7] = 0x00; //转速水温有效信号 init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
/* TCS */
/* 时间 */ data3[4] = 0x00;
data3[3] = 0x12; //时 init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
data3[4] = 0; //分
data3[5] = 0; //秒 /* 变速箱指示灯 */
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3); data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 左后方盲区侦测指示灯 */
data4[2] = 0x01; /* 故障码TCU指示灯 */
/* 左后方盲区侦测指示灯 */ data5[1] = 0x00;
data4[0] = 0x00; //SW_Resp init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
data4[1] = 0x00; //BSD_STATUS_L
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); /* D档 */
data6[1] = 0x10;
/* 边撑指示灯 */ /* S档 */
data5[1] = 0x00; //BCM_FootBrackeSwSts data6[4] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
/* 发动机故障指示灯 */
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 2: case 2:
/* 车速 */ /* 车速 */
data1[0] = 0x02; data1[0] = 0x0C;
data1[1] = 0xF0; data1[1] = 0xC8;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
// data1[7] = CRC8_CheckSum(data1,7);
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); /* 转速 */
data2[0] = 0x2E;
/* 转速 */ data2[1] = 0xE0;
data2[2] = 0x1F;
data2[3] = 0x40; /* 水温1格 */
/* 水温 */ data2[4] = 0x0B;
data2[5] = 0X01; data2[5] = 0x0E;
data2[7] = 0x00; //转速水温有效信号 init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
/* TCS */
/* 时间 */ data3[4] = 0x00;
data3[3] = 0x14; //时 init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
data3[4] = 0; //分
data3[5] = 0; //秒 /* 变速箱指示灯 */
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3); data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x02; //SW_Resp /* 故障码TCU指示灯 */
data4[1] = 0x01; //BSD_STATUS_L data5[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 边撑指示灯 */ /* D档 */
data5[1] = 0x00; //BCM_FootBrackeSwSts data6[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); /* S档 */
data6[4] = 0x00;
/* 发动机故障指示灯 */ init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 3: case 3:
/* 车速 */ /* 车速 */
data1[0] = 0x04; data1[0] = 0x14;
data1[1] = 0x60; data1[1] = 0x90;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
// data1[7] = CRC8_CheckSum(data1,7);
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); /* 转速 */
data2[0] = 0x4E;
/* 转速 */ data2[1] = 0x20;
data2[2] = 0x2E;
data2[3] = 0xE0; /* 水温2格 */
/* 水温 */ data2[4] = 0x0D;
data2[4] = 0X60; data2[5] = 0x02;
data2[7] = 0x00; //转速水温有效信号 init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
/* TCS */
/* 时间 */ data3[4] = 0x00;
data3[3] = 0x16; //时 init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
data3[4] = 0; //分
data3[5] = 0; //秒 /* 变速箱指示灯 */
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3); data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x00; //SW_Resp /* 故障码TCU指示灯 */
data4[1] = 0x00; //BSD_STATUS_L data5[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 边撑指示灯 */ /* D档 */
data5[1] = 0x00; //BCM_FootBrackeSwSts data6[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); /* S档 */
data6[4] = 0x00;
/* 发动机故障指示灯 */ init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 4: case 4:
/* 车速 */ /* 车速 */
data1[0] = 0x05; data1[0] = 0x24;
data1[1] = 0xE0; data1[1] = 0x20;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
// data1[7] = CRC8_CheckSum(data1,7);
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); /* 转速 */
data2[0] = 0x6D;
/* 转速 */ data2[1] = 0x60;
data2[2] = 0x3E;
data2[3] = 0x80; /* 水温3格 */
/* 水温 */ data2[4] = 0x0D;
data2[4] = 0XC4; data2[5] = 0xCA;
data2[7] = 0x00; //转速水温有效信号 init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
/* TCS */
/* 时间 */ data3[4] = 0x00;
data3[3] = 0x00; //时 init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
data3[4] = 0; //分
data3[5] = 0; //秒 /* 变速箱指示灯 */
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3); data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x00; //SW_Resp /* 故障码TCU指示灯 */
data4[1] = 0x00; //BSD_STATUS_L data5[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 边撑指示灯 */ /* D档 */
data5[1] = 0x80; //BCM_FootBrackeSwSts data6[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); /* S档 */
data6[4] = 0x00;
/* 发动机故障指示灯 */ init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 5: case 5:
/* 车速 */ /* 车速 */
data1[0] = 0x06; data1[0] = 0x33;
data1[1] = 0xA1; data1[1] = 0xA8;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
// data1[7] = CRC8_CheckSum(data1,7);
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); /* 转速 */
data2[0] = 0x8C;
/* 转速 */ data2[1] = 0xA0;
data2[2] = 0x4E;
data2[3] = 0x20; /* 水温4格 */
/* 水温 */ data2[4] = 0x0E;
data2[4] = 0XE0; data2[5] = 0x60;
data2[7] = 0x00; //转速水温有效信号 init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
/* TCS */
/* 时间 */ data3[4] = 0x00;
data3[3] = 0x02; //时 init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
data3[4] = 0; //分
data3[5] = 0; //秒 /* 变速箱指示灯 */
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3); data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x00; //SW_Resp /* 故障码TCU指示灯 */
data4[1] = 0x00; //BSD_STATUS_L data5[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 边撑指示灯 */ /* D档 */
data5[1] = 0x00; //BCM_FootBrackeSwSts data6[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); /* S档 */
data6[4] = 0x00;
/* 发动机故障指示灯 */ init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
data6[0] = 0x08; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 6: case 6:
/* 车速 */ /* 车速 */
data1[0] = 0x09; data1[0] = 0x3D;
data1[1] = 0x40; data1[1] = 0xA8;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* ABS故障指示灯 */
data1[5] = 0x01; /* 转速 */
// data1[7] = CRC8_CheckSum(data1,7); data2[0] = 0xAB;
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); data2[1] = 0xE0;
/* 转速 */ /* 水温5格 */
data2[2] = 0x6D; data2[4] = 0x0E;
data2[3] = 0x60; data2[5] = 0xC4;
/* 水温 */ init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
data2[4] = 0XE0;
data2[7] = 0x00; //转速水温有效信号 /* TCS */
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2); data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 时间 */
data3[3] = 0x04; //时 /* 变速箱指示灯 */
data3[4] = 0; //分 data4[1] = 0x00;
data3[5] = 0; //秒 init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3);
/* 故障码TCU指示灯 */
/* 左后方盲区侦测指示灯 */ data5[1] = 0x00;
data4[0] = 0x00; //SW_Resp init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
data4[1] = 0x00; //BSD_STATUS_L
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); /* D档 */
data6[1] = 0x00;
/* 边撑指示灯 */ /* S档 */
data5[1] = 0x00; //BCM_FootBrackeSwSts data6[4] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
/* 发动机故障指示灯 */
data6[0] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x20; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 7: case 7:
/* 车速 */ /* 车速 */
data1[0] = 0x0B; data1[0] = 0x52;
data1[1] = 0xE0; data1[1] = 0x38;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* ABS故障指示灯 */
data1[5] = 0x00; /* 转速 */
// data1[7] = CRC8_CheckSum(data1,7); data2[0] = 0xBB;
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); data2[1] = 0x80;
/* 转速 */ /* 水温6格 */
data2[2] = 0x7D; data2[4] = 0x0F;
data2[3] = 0x00; data2[5] = 0x28;
/* 水温 */ init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
data2[4] = 0XE0;
data2[7] = 0x00; //转速水温有效信号 /* TCS */
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2); data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 时间 */
data3[3] = 0x06; //时 /* 变速箱指示灯 */
data3[4] = 0; //分 data4[1] = 0x00;
data3[5] = 0; //秒 init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3);
/* 故障码TCU指示灯 */
/* 左后方盲区侦测指示灯 */ data5[1] = 0x00;
data4[0] = 0x00; //SW_Resp init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
data4[1] = 0x00; //BSD_STATUS_L
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); /* D档 */
data6[1] = 0x00;
/* 边撑指示灯 */ /* S档 */
data5[1] = 0x00; //BCM_FootBrackeSwSts data6[4] = 0x00;
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5); init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
/* 发动机故障指示灯 */
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x04; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 8: case 8:
/* 车速 */ /* 车速 */
data1[0] = 0x0D; data1[0] = 0x6E;
data1[1] = 0xE4; data1[1] = 0x90;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* ABS故障指示灯 */
data1[5] = 0x00; /* 转速 */
// data1[7] = CRC8_CheckSum(data1,7); data2[0] = 0xBB;
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); data2[1] = 0x80;
/* 转速 */ /* 水温6格 */
data2[2] = 0x9C; data2[4] = 0x0F;
data2[3] = 0x40; data2[5] = 0x28;
/* 水温 */ init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
data2[4] = 0XE0;
data2[7] = 0x00; //转速水温有效信号 /* TCS */
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2); data3[4] = 0x04;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 时间 */
data3[3] = 0x0A; //时 /* 变速箱指示灯 */
data3[4] = 0; //分 data4[1] = 0x00;
data3[5] = 0; //秒 init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3);
/* 故障码TCU指示灯 */
/* 左后方盲区侦测指示灯 */ data5[1] = 0x00;
data4[2] = 0x01; init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x02; //SW_Resp /* D档 */
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); data6[1] = 0x00;
/* S档 */
/* 边撑指示灯 */ data6[4] = 0x00;
data5[1] = 0x00; //BCM_FootBrackeSwSts init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5);
/* 发动机故障指示灯 */
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 9: case 9:
/* 车速 */ /* 车速 */
data1[0] = 0x0D; data1[0] = 0x6E;
data1[1] = 0xE4; data1[1] = 0x90;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* ABS故障指示灯 */
data1[5] = 0x00; /* 转速 */
// data1[7] = CRC8_CheckSum(data1,7); data2[0] = 0xBB;
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); data2[1] = 0x80;
/* 转速 */ /* 水温6格 */
data2[2] = 0xBB; data2[4] = 0x0F;
data2[3] = 0x80; data2[5] = 0x28;
/* 水温 */ init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
data2[4] = 0XE0;
data2[7] = 0x00; //转速水温有效信号 /* TCS */
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2); data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 时间 */
data3[3] = 0x0F; //时 /* 变速箱指示灯 */
data3[4] = 0; //分 data4[1] = 0x02;
data3[5] = 0; //秒 init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3);
/* 故障码TCU指示灯 */
/* 左后方盲区侦测指示灯 */ data5[1] = 0x00;
data4[2] = 0x01; init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x00; //SW_Resp /* D档 */
data4[1] = 0x00; //BSD_STATUS_L data6[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); /* S档 */
data6[4] = 0x00;
/* 边撑指示灯 */ init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
data5[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5);
/* 发动机故障指示灯 */
data6[1] = 0x00; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[3] = 0x00; //
data8[2] = 0x00; //TCS
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 10: case 10:
/* 车速 */ /* 车速 */
data1[0] = 0x0D; data1[0] = 0x6E;
data1[1] = 0xE4; data1[1] = 0x90;
data1[4] = 0x00; //车速有效信号 init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* ABS故障指示灯 */
data1[5] = 0x01; /* 转速 */
// data1[7] = CRC8_CheckSum(data1,7); data2[0] = 0xBB;
init_CAN_Frame(&m_msg1, 0x12B, 8, 1, data1); data2[1] = 0x80;
/* 转速 */ /* 水温6格 */
data2[2] = 0xBB; data2[4] = 0x0F;
data2[3] = 0x80; data2[5] = 0x28;
/* 水温 */ init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
data2[4] = 0XE0;
data2[7] = 0x00; //转速水温有效信号 /* TCS */
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2); data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 时间 */
data3[3] = 0x10; //时 /* 变速箱指示灯 */
data3[4] = 0; //分 data4[1] = 0x04;
data3[5] = 0; //秒 init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3);
/* 故障码TCU指示灯 */
/* 左后方盲区侦测指示灯 */ data5[1] = 0x00;
data4[2] = 0x01; init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* 左后方盲区侦测指示灯 */
data4[0] = 0x02; //SW_Resp /* D档 */
data4[1] = 0x01; //BSD_STATUS_L data6[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x50A, 8, 1, data4); /* S档 */
data6[4] = 0x00;
/* 边撑指示灯 */ init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
data5[1] = 0x80; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg5, 0x200, 8, 1, data5);
/* 发动机故障指示灯 */
data6[0] = 0x08; //BCM_FootBrackeSwSts
init_CAN_Frame(&m_msg6, 0x111, 8, 1, data6);
data8[1] = 0x20; //
// data8[2] = 0x04; //禁止TCS,与TCSD只能显示一个
data8[3] = 0x20; //
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break; break;
case 11: case 11:
POWER_CTRL_KL30 = 0u; //B+ /* 车速 */
POWER_CTRL_KL15 = 0u; //KL15 data1[0] = 0x6E;
data1[1] = 0x90;
init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* 转速 */
data2[0] = 0xBB;
data2[1] = 0x80;
/* 水温6格 */
data2[4] = 0x0F;
data2[5] = 0x28;
init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
/* TCS */
data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 变速箱指示灯 */
data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 故障码TCU指示灯 */
data5[1] = 0x01;
init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* D档 */
data6[1] = 0x00;
/* S档 */
data6[4] = 0x00;
init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
break;
case 12:
/* 车速 */
data1[0] = 0x6E;
data1[1] = 0x90;
init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* 转速 */
data2[0] = 0xBB;
data2[1] = 0x80;
/* 水温6格 */
data2[4] = 0x0F;
data2[5] = 0x28;
init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
/* TCS */
data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 变速箱指示灯 */
data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 故障码TCU指示灯 */
data5[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* D档 */
data6[1] = 0x00;
/* S档 */
data6[4] = 0x02;
init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
break;
case 13:
/* 车速 */
data1[0] = 0x6E;
data1[1] = 0x90;
init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* 转速 */
data2[0] = 0xBB;
data2[1] = 0x80;
/* 水温6格 */
data2[4] = 0x0F;
data2[5] = 0x28;
init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
/* TCS */
data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 变速箱指示灯 */
data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 故障码TCU指示灯 */
data5[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* D档 */
data6[1] = 0x00;
/* S档 */
data6[4] = 0x00;
init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
break;
case 14:
/* 车速 */
data1[0] = 0x6E;
data1[1] = 0x90;
init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* 转速 */
data2[0] = 0xBB;
data2[1] = 0x80;
/* 水温6格 */
data2[4] = 0x0F;
data2[5] = 0x28;
init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
/* TCS */
data3[4] = 0x00;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 变速箱指示灯 */
data4[1] = 0x00;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 故障码TCU指示灯 */
data5[1] = 0x00;
init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* D档 */
data6[1] = 0x00;
/* S档 */
data6[4] = 0x00;
init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
break;
case 15:
/* 车速 */
data1[0] = 0x6E;
data1[1] = 0x90;
init_CAN_Frame(&m_msg1, 0x141, 8, 1, data1);
/* 转速 */
data2[0] = 0xBB;
data2[1] = 0x80;
/* 水温6格 */
data2[4] = 0x0F;
data2[5] = 0x28;
init_CAN_Frame(&m_msg2, 0x101, 8, 1, data2);
/* TCS */
data3[4] = 0x04;
init_CAN_Frame(&m_msg3, 0x402, 8, 1, data3);
/* 变速箱指示灯/变速箱故障指示灯 */
data4[1] = 0x06;
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 故障码TCU指示灯 */
data5[1] = 0x01;
init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* D档 */
data6[1] = 0x10;
/* S档 */
data6[4] = 0x02;
init_CAN_Frame(&m_msg6, 0x321, 8, 1, data6);
break; break;
// data1[2] = 0x60;
// data1[3] = 0x19;
// data1[4] = 0x98;
// data1[5] = 0;
// data1[6] = (rolaconter<<4);;
// data1[7] = CRC8_CheckSum(data1,7);
// init_CAN_Frame(&m_msg1, 0x111, 8, 1, data1);
// data2[2] = 0x9C;
// data2[3] = 0x40;
// data2[4] = 0xEC;//水温
// init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
// data3[1] = 0;
// init_CAN_Frame(&m_msg3, 0x113, 8, 1, data3);
// data4[0] = 0;
// data4[1] = 1;
// data4[2] = 1;
// data4[3] = 0;
// data4[4] = 0;
// data4[5] = 0;
// data4[6] = 0;
// data4[7] = 0;
// init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
// data5[1] = 0 ;
// init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
// data6[4] = 2;
// init_CAN_Frame(&m_msg6, 0x091, 8, 1, data6);
// break;
// case 12://进不去
// data1[2] = 0x20;
// data1[3] = 0x19;
// data1[4] = 0x98;
// data1[5] = 0;
// data1[6] = (rolaconter<<4);;
// data1[7] = CRC8_CheckSum(data1,7);
// init_CAN_Frame(&m_msg1, 0x111, 8, 1, data1);
// data2[2] = 0x9C;
// data2[3] = 0x40;
// data2[4] = 0xEC;//水温
// init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
// data3[1] = 0;
// init_CAN_Frame(&m_msg3, 0x113, 8, 1, data3);
// data4[0] = 0;
// data4[1] = 1;
// data4[2] = 1;
// data4[3] = 0;
// data4[4] = 0;
// data4[5] = 0;
// data4[6] = 0;
// data4[7] = 0;
// init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
// data5[1] = 0 ;
// init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
// data6[4] = 2;
// init_CAN_Frame(&m_msg6, 0x091, 8, 1, data6);
// break;
// case 13:
// data1[2] = 0;
// data1[3] = 0x19;
// data1[4] = 0x98;
// data1[5] = 0;
// data1[6] = (rolaconter<<4);;
// data1[7] = CRC8_CheckSum(data1,7);
// init_CAN_Frame(&m_msg1, 0x111, 8, 1, data1);
// data2[2] = 0x9C;
// data2[3] = 0x40;
// init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
// data3[1] = 0;
// init_CAN_Frame(&m_msg3, 0x113, 8, 1, data3);
// data4[0] = 0;
// data4[1] = 1;
// data4[2] = 1;
// data4[3] = 0;
// data4[4] = 0;
// data4[5] = 0;
// data4[6] = 0;
// data4[7] = 0;
// init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
// data5[1] = 1 ;
// init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
// data6[4] = 2;
// init_CAN_Frame(&m_msg6, 0x091, 8, 1, data6);
// break;
// // case 14:
// // // while(1)
// // // {
// // // ;//这里让芯片复位要不然的话重新走仪表配置流程有点麻烦,复位的话可以直接省去修改很多条件
// // // }
// // break;
default: default:
break; break;
} }
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<11) if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP <= 15)
{ {
can_mid(m_msg1); can_mid(m_msg1);
can_mid(m_msg2); can_mid(m_msg2);
...@@ -831,8 +791,10 @@ void can_submit(void) ...@@ -831,8 +791,10 @@ void can_submit(void)
can_mid(m_msg4); can_mid(m_msg4);
can_mid(m_msg5); can_mid(m_msg5);
can_mid(m_msg6); can_mid(m_msg6);
can_mid(m_msg8); }
// can_mid(m_msg7); else if(MENU_CHECK_STEP == 0)
{
can_mid(m_msg6);
} }
} }
uint8_t u8get714msg[8]; uint8_t u8get714msg[8];
...@@ -1548,91 +1510,6 @@ uint8_t resetflag = 0; ...@@ -1548,91 +1510,6 @@ uint8_t resetflag = 0;
extern uint32_t fakedelay; extern uint32_t fakedelay;
uint32_t resetpowtime = 0; uint32_t resetpowtime = 0;
uint32_t FUresetpowtime = 0; uint32_t FUresetpowtime = 0;
uint8_t fuelreset1 = 0;
uint8_t fuelreset2 = 0;
uint8_t fuelreset3 = 0;
uint8_t fuelreset4 = 0;
void resetpowerfuel(void)
{
// if(FUresetpowtime < 100)
// {
// FUresetpowtime++;
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
// }
// else
// {
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
// FUresetpowtime = 0;
// if(fuelreset1 == 1)
// {
// fuelreset1 = 2;
// }
// else if(fuelreset2 == 1)
// {
// fuelreset2 = 2;
// }
// else if(fuelreset3 == 1)
// {
// fuelreset3 = 2;
// }
// else if(fuelreset4 == 1)
// {
// fuelreset4 = 2;
// }
// else
// {
// ;
// }
// }
}
void resetpower(void)
{
// if(resetpowtime < 100)
// {
// resetpowtime++;
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
// }
// else
// {
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
// chaengUDSstep = 0;
// resettime = 1;
// }
// resetflag = 1;
}
void resetchangeUDSfuc(void)
{
// if((MENU_CHECK_STEP == 0 || MENU_CHECK_STEP == 10) && resettime == 0)
// {
// fakedelay = 0;
// UDS_time = 0;
// getseedresult = 0;
// fakedelay = 0;
// if(MENU_CHECK_STEP == 10)
// {
// resetpower();
// }
// else
// {
// resettime = 1;
// chaengUDSstep = 0;
// }
// }
// if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP != 10)
// {
// resettime = 0;
// }
}
uint8_t vspeedpeizhi = 0; uint8_t vspeedpeizhi = 0;
uint8_t trackmode = 0; uint8_t trackmode = 0;
void change_UDS_DID(void) void change_UDS_DID(void)
......
...@@ -52,8 +52,6 @@ extern uint8_t ruanjianbanbenhao[8]; ...@@ -52,8 +52,6 @@ extern uint8_t ruanjianbanbenhao[8];
void Get_PN_msg(void); void Get_PN_msg(void);
extern void Get_UID_msg(void); extern void Get_UID_msg(void);
void change_UDS_DID(void); void change_UDS_DID(void);
void resetchangeUDSfuc(void);
void resetpowerfuel(void);
void UIDWrite(void); void UIDWrite(void);
extern uint8_t UIDcode1[33]; extern uint8_t UIDcode1[33];
extern uint8_t UIDcode2[33]; extern uint8_t UIDcode2[33];
......
...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
if(MENU_CHECK_STEP > 10) if(MENU_CHECK_STEP >= 15)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -574,39 +574,18 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -574,39 +574,18 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
else if(cmd == 1) else if(cmd == 1)
{ {
Display_Send_Vspead(MENU_CHECK_STEP); Display_Send_Vspead(MENU_CHECK_STEP);
// Display_Send_Vspead(0);
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
{ {
if(resetflag == 0)
{
// POWER_CTRL_KL30 = 1u; //B+
// POWER_CTRL_KL15 = 1u; //KL15
}
/*负控*/
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_05 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
/*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0; LINE_OUT_POS_02 = 0;
LINE_OUT_NEG_01 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
...@@ -616,52 +595,33 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -616,52 +595,33 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
case 1: case 1:
{ {
/*负控*/ LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_02 = 1;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_04 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_05 = 1;
// LINE_OUT_NEG_06 = 1;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
/*正控*/
// LINE_OUT_POS_01 = 1; //右转
LINE_OUT_POS_04 = 1; //左转
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //5格 FUEL_RES_1 = 1;
FUEL_RES_2 = 1; FUEL_RES_2 = 0;
FUEL_RES_3 = 1; FUEL_RES_3 = 0;
FUEL_RES_4 = 1; FUEL_RES_4 = 0;
break; break;
} }
case 2: case 2:
{ {
/*负控*/ LINE_OUT_POS_01 = 1;
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_04 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_05 = 1;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
/*正控*/
// LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 0; //左转
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; //4格 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 = 1;
...@@ -669,80 +629,49 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -669,80 +629,49 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
case 3: case 3:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 1;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 1;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 1; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 1;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
/*正控*/
LINE_OUT_POS_02 = 1; //远光
// LINE_OUT_POS_03 = 0; //机油压力
// /*燃油*/ // /*燃油*/
FUEL_RES_1 = 0; //3格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 1;
FUEL_RES_3 = 1; FUEL_RES_3 = 1;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
case 4: case 4:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 1;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 1; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
// /*正控*/
// LINE_OUT_POS_01 = 0;
// LINE_OUT_POS_02 = 0;
// LINE_OUT_POS_03 = 1;
// LINE_OUT_POS_04 = 0;
// LINE_OUT_POS_04 = 1; //左转
LINE_OUT_POS_02 = 0; //远光
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; //2格 FUEL_RES_1 = 0;
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;
} }
case 5: case 5:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 1; LINE_OUT_POS_03 = 1;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 1; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 1;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 1;
// /*正控*/
// LINE_OUT_POS_01 = 0;
// LINE_OUT_POS_02 = 0;
// LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //1格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 2;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
...@@ -750,136 +679,165 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -750,136 +679,165 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
case 6: case 6:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 1; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 1;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 1; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 1;
// /*正控*/
// LINE_OUT_POS_01 = 0;
// LINE_OUT_POS_02 = 0;
// LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //1格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 2;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
case 7: case 7:
{ {
// LINE_OUT_NEG_01 = 1; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 0;
// LINE_OUT_NEG_05 = 0; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 1;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
// /*正控*/
// LINE_OUT_POS_01 = 0;
// LINE_OUT_POS_02 = 0;
// LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0;
LINE_OUT_NEG_01 = 1;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //1格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 2;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
case 8: case 8:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 1; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 0; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
// /*正控*/
// LINE_OUT_POS_01 = 0;
// LINE_OUT_POS_02 = 0;
// LINE_OUT_POS_03 = 0;
// LINE_OUT_POS_04 = 0;
LINE_OUT_NEG_01 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //1格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 2;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
case 9: case 9:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 0; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 1;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 0;
// LINE_OUT_NEG_10 = 0;
/*正控*/
LINE_OUT_POS_01 = 1; //右转
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //1格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 2;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
case 10: case 10:
{ {
// LINE_OUT_NEG_01 = 0; LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0; LINE_OUT_POS_02 = 0;
// LINE_OUT_NEG_03 = 0; LINE_OUT_POS_03 = 0;
// LINE_OUT_NEG_04 = 0; LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
// LINE_OUT_NEG_05 = 0; LINE_OUT_POS_07 = 0;
// LINE_OUT_NEG_06 = 0; /*燃油*/
// LINE_OUT_NEG_07 = 0; FUEL_RES_1 = 0;
// LINE_OUT_NEG_08 = 0; FUEL_RES_2 = 2;
// LINE_OUT_NEG_09 = 0; FUEL_RES_3 = 0;
// LINE_OUT_NEG_10 = 0; FUEL_RES_4 = 0;
/*正控*/ break;
}
case 11:
{
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0;
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 2;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 12:
{
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0;
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 2;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 13:
{
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 0;
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 2;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 14:
{
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
LINE_OUT_POS_05 = 0;
LINE_OUT_POS_06 = 1;
LINE_OUT_POS_07 = 1;
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 2;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
break;
}
case 15:
{
LINE_OUT_POS_01 = 1; LINE_OUT_POS_01 = 1;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 1;
LINE_OUT_POS_04 = 1; LINE_OUT_POS_03 = 1;
LINE_OUT_NEG_01 = 1; LINE_OUT_POS_04 = 1;
LINE_OUT_POS_05 = 1;
LINE_OUT_POS_06 = 0;
LINE_OUT_POS_07 = 1;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; //1格 FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 2;
FUEL_RES_3 = 0; FUEL_RES_3 = 0;
FUEL_RES_4 = 0; FUEL_RES_4 = 0;
break; break;
} }
} }
} }
} }
......
...@@ -72,7 +72,6 @@ extern Key_Real_Status_en_t enKeyLeftRealStatus; ...@@ -72,7 +72,6 @@ extern Key_Real_Status_en_t enKeyLeftRealStatus;
extern Key_Real_Status_en_t enKeyRightRealStatus; extern Key_Real_Status_en_t enKeyRightRealStatus;
/*------------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------------*/
extern uint8_t IG_OFF_Flag;
extern void Key_Init(void); extern void Key_Init(void);
extern void Key_Service(void); /*10ms*/ extern void Key_Service(void); /*10ms*/
......
...@@ -93,14 +93,6 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent) ...@@ -93,14 +93,6 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(POWER_CTRL_KL15)
{
POWER_CTRL_KL15 = 0;
}
else
{
POWER_CTRL_KL15 = 1;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -129,17 +121,12 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -129,17 +121,12 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{ {
} }
} }
uint8_t IG_OFF_Flag;
void Key_Operation_SW2(Key_Event_en_t enKeyEvent) void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{ {
/*清零ODO*/ /*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
if((MENU_CHECK_STEP < 6) && (MENU_CHECK_STEP > 0))
{
IG_OFF_Flag = 1;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -179,7 +166,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) ...@@ -179,7 +166,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
} }
else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 10)) else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 10))
{ {
LINE_OUT_NEG_02 = 1;
} }
} }
......
...@@ -80,46 +80,62 @@ ...@@ -80,46 +80,62 @@
// #define LINE_SafeBelt_5_press NEG_9_Ctrl // #define LINE_SafeBelt_5_press NEG_9_Ctrl
//左转 // //左转
#define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05 // #define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
//右转 // //右转
// #define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06
// //远光
// #define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00
// //位置灯
// #define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04
// #define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06
// #define LINE_OUT_POS_06 GPIO_OUT_APORT00_PIN13
// #define LINE_OUT_POS_07 GPIO_OUT_APORT00_PIN14
// #define LINE_OUT_POS_08 GPIO_OUT_PORT08_PIN09
// #define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08
// #define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07
// //安全带//R挡
// #define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06
// //机油压力//L挡
// #define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
// //H挡//发动机故障
// #define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
// //P挡//驻车指示灯
// #define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03
// //开关后桥状态//制动失效
// #define LINE_OUT_NEG_05 GPIO_OUT_PORT09_PIN02
// //马达2驱信号
// #define LINE_OUT_NEG_06 GPIO_OUT_PORT09_PIN01
// //马达4驱信号//空挡
// #define LINE_OUT_NEG_07 GPIO_OUT_PORT10_PIN07
// //马达4驱锁死信号
// #define LINE_OUT_NEG_08 GPIO_OUT_PORT10_PIN03
// //开关2驱信号
// #define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04
// //B-5开关4驱信号
// #define LINE_OUT_NEG_10 GPIO_OUT_PORT00_PIN08
// #define LINE_FUEL_RES01 GPIO_OUT_PORT00_PIN13
// #define LINE_FUEL_RES02 GPIO_OUT_PORT08_PIN12
// #define LINE_FUEL_RES03 GPIO_OUT_PORT08_PIN10
// #define LINE_FUEL_RES04 GPIO_OUT_PORT08_PIN11
//正控1
#define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06 #define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06
//远光 //正控2
#define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00 #define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00
//位置灯 //正控3
#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 //正控4
#define LINE_OUT_POS_06 GPIO_OUT_APORT00_PIN13 #define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
#define LINE_OUT_POS_07 GPIO_OUT_APORT00_PIN14
#define LINE_OUT_POS_08 GPIO_OUT_PORT08_PIN09 //负控3
#define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08 #define LINE_OUT_POS_05 GPIO_OUT_PORT09_PIN04
#define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07 //负控4
#define LINE_OUT_POS_06 GPIO_OUT_PORT09_PIN03
//安全带//R挡 //负控10
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 #define LINE_OUT_POS_07 GPIO_OUT_PORT00_PIN08
//机油压力//L挡
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
//H挡//发动机故障
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
//P挡//驻车指示灯
#define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03
//开关后桥状态//制动失效
#define LINE_OUT_NEG_05 GPIO_OUT_PORT09_PIN02
//马达2驱信号
#define LINE_OUT_NEG_06 GPIO_OUT_PORT09_PIN01
//马达4驱信号//空挡
#define LINE_OUT_NEG_07 GPIO_OUT_PORT10_PIN07
//马达4驱锁死信号
#define LINE_OUT_NEG_08 GPIO_OUT_PORT10_PIN03
//开关2驱信号
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04
//B-5开关4驱信号
#define LINE_OUT_NEG_10 GPIO_OUT_PORT00_PIN08
#define LINE_FUEL_RES01 GPIO_OUT_PORT00_PIN13
#define LINE_FUEL_RES02 GPIO_OUT_PORT08_PIN12
#define LINE_FUEL_RES03 GPIO_OUT_PORT08_PIN10
#define LINE_FUEL_RES04 GPIO_OUT_PORT08_PIN11
//zh: //zh:
......
...@@ -65,43 +65,11 @@ extern uint8_t SWtestresult; ...@@ -65,43 +65,11 @@ extern uint8_t SWtestresult;
extern uint8_t HWtestresult; extern uint8_t HWtestresult;
extern uint8_t PNtestresult; extern uint8_t PNtestresult;
extern uint8_t resetflag; extern uint8_t resetflag;
extern uint8_t fuelreset1;
extern uint8_t fuelreset2;
extern uint8_t fuelreset3;
extern uint8_t fuelreset4;
void Sys_Run_Mode_10ms_Tasks_Group(void) void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
if(MENU_CHECK_STEP == 1 && fuelreset1 == 0)
{
fuelreset1 = 1;
}
else if(MENU_CHECK_STEP == 2 && fuelreset2 == 0)
{
fuelreset2 = 1;
}
else if(MENU_CHECK_STEP == 3 && fuelreset3 == 0)
{
fuelreset3 = 1;
}
else if(MENU_CHECK_STEP == 4 && fuelreset4 == 0)
{
fuelreset4 = 1;
}
if(MENU_CHECK_STEP == 0)
{
fuelreset1 = 0;
fuelreset2 = 0;
fuelreset3 = 0;
fuelreset4 = 0;
}
if(fuelreset1 == 1 || fuelreset2 == 1 || fuelreset3 == 1 || fuelreset4 == 1)
{
resetpowerfuel();
}
BusOff_Service( ); BusOff_Service( );
Key_Service( ); Key_Service( );
resetchangeUDSfuc();
if(fakedelay < 100) if(fakedelay < 100)
{ {
fakedelay++; fakedelay++;
...@@ -237,21 +205,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -237,21 +205,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Buzzer_Start(); Buzzer_Start();
Total_Check( ); Total_Check( );
//u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH; //u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
if(IG_OFF_Flag)
{
if(delay_time < 5)
{
POWER_CTRL_KL15 = 0u; //KL15
delay_time++;
}
else
{
delay_time = 0;
IG_OFF_Flag = 0;
POWER_CTRL_KL15 = 1u; //KL15
}
}
} }
/*=================================================================*/ /*=================================================================*/
......
...@@ -85,7 +85,6 @@ void Sys_Startup_Init(void) ...@@ -85,7 +85,6 @@ void Sys_Startup_Init(void)
UIDdelay = 0; UIDdelay = 0;
POWER_CTRL_KL30 = 1u; //B+ POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15 POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_NEG_02 = 0;
for (int i = 0; i < 33; i++) for (int i = 0; i < 33; i++)
{ {
UIDcode1[i] = 0; UIDcode1[i] = 0;
......
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