Skip to content

J
jiancetai
Commit db3ef148 authored by 李鑫3's avatar 李鑫3
Browse files
Options

✨ feat:添加清大计

parent 55fa609d
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 16 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ db3ef148
......@@ -331,7 +331,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg3, 0x104, 8, 1, data3);
data6[0]=0x00;
init_CAN_Frame(&m_msg6, 0x12F, 8, 1, data6);
data2[6]=0x06;
data2[6]=0x3C;
init_CAN_Frame(&m_msg2, 0x103, 8, 1, data2);
data5[5]=0x01;
data5[6]=0x0A;
......@@ -352,8 +352,8 @@ void can_submit(void)
data1[1]=0xFF;
data1[2]=0x34;
init_CAN_Frame(&m_msg1, 0x112, 8, 1, data1);
data2[6]=0xF5;
data2[7]=0xFF;
data2[6]=0;
data2[7]=0;
init_CAN_Frame(&m_msg2, 0x103, 8, 1, data2);
data3[0]=0xD0;
data3[1]=0x07;
......@@ -384,7 +384,8 @@ void can_submit(void)
data1[1]=0xFF;
data1[2]=0x34;
init_CAN_Frame(&m_msg1, 0x112, 8, 1, data1);
data2[7]=0;
data2[7]=0xFF;
data2[6]=0x91;
init_CAN_Frame(&m_msg2, 0x103, 8, 1, data2);
data3[0]=0x88;
data3[1]=0x13;
......@@ -599,7 +600,7 @@ void can_submit(void)
data1[1]=0xFF;
data1[2]=0x34;
init_CAN_Frame(&m_msg1, 0x112, 8, 1, data1);
data2[6]=0xE8;
data2[6]=0x22;
data2[7]=0xFF;
init_CAN_Frame(&m_msg2, 0x103, 8, 1, data2);
data4[0]=0x01;
......@@ -635,10 +636,49 @@ void can_submit(void)
data11[3]=0x01;
init_CAN_Frame(&m_msg11, 0x317, 8, 1, data11);
break;
case 5:
data1[0]=0x00;
init_CAN_Frame(&m_msg1, 0x112, 8, 1, data1);
data2[6]=0x00;
data2[7]=0x00;
init_CAN_Frame(&m_msg2, 0x103, 8, 1, data2);
data4[0]=0x00;
init_CAN_Frame(&m_msg4, 0x116, 8, 1, data4);
data5[6]=0xFE;
data5[5]=0x05;
init_CAN_Frame(&m_msg5, 0x113, 8, 1, data5);
data3[0]=0xFE;
data3[1]=0xFF;
init_CAN_Frame(&m_msg3, 0x104, 8, 1, data3);
data6[0]=0x00;
data6[1]=0x00;
init_CAN_Frame(&m_msg6, 0x12F, 8, 1, data6);
data7[0]=0x00;
init_CAN_Frame(&m_msg7, 0x331, 8, 1, data7);
data8[0]=0xEE;
data8[1]=0xEE;
data8[2]=0xEE;
data8[3]=0xEE;
data8[4]=0xFF;
data8[5]=0xFF;
data8[6]=0xFF;
data8[7]=0xFF;
init_CAN_Frame(&m_msg8, 0x012, 8, 1, data8);
data9[1]=0x10;
init_CAN_Frame(&m_msg9, 0x115, 8, 1, data9);
data10[2]=0x00;
init_CAN_Frame(&m_msg10, 0x117, 8, 1, data10);
data11[3]=0x00;
init_CAN_Frame(&m_msg11, 0x317, 8, 1, data11);
break;
default:
break;
}
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<=4)
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<=5)
{
can_mid(m_msg1);
can_mid(m_msg2);
......@@ -678,7 +718,7 @@ uint8_t zhenduanstep = 0;
void Get_SW_msg(void);
void Get_HW_msg(void);
void Get_PN_msg(void);
uint8_t begin714 = 0;;
uint8_t begin714 = 0;
uint8_t UIDdelay;
uint8_t SWINtestresult;
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ db3ef148
......@@ -70,7 +70,7 @@ void Function_Check_Ctrl(uint32_t cmd);
extern uint8_t PNFlag;
void MENU_CHECK_STEP_ADD(void)
{
if(MENU_CHECK_STEP > 4)
if(MENU_CHECK_STEP > 6)
{
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
......@@ -563,6 +563,7 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数
}
uint8_t LED_Waring = 0;
extern uint8_t resetflag;
uint8_t SETTT=0;
void Function_Check_Ctrl(uint32_t cmd)
{
uint8_t p [ 20 ];
......@@ -591,8 +592,7 @@ void Function_Check_Ctrl(uint32_t cmd)
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;
......@@ -607,6 +607,8 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
set=0;
SETTT=0;
break;
}
case 1:
......@@ -634,7 +636,7 @@ void Function_Check_Ctrl(uint32_t cmd)
{
LINE_OUT_NEG_01=1;
Gen_TimeDelay (100 *1000,50U);
LINE_OUT_POS_03=0;
LINE_OUT_POS_03=1;
break;
}
// case 4:
......@@ -674,6 +676,20 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_02=1;
LINE_OUT_POS_03=1;
break;
}
case 5:
{
// LINE_OUT_NEG_01=1;
// LINE_OUT_POS_01=1;
// LINE_OUT_POS_02=1;
// LINE_OUT_POS_03=1;
if(SETTT==0)
{
set=1;
SETTT=1;
}
break;
}
default:
break;
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.h
View file @ db3ef148
......@@ -45,6 +45,7 @@ extern unsigned char KEYBUFFER [ 4 ];
extern unsigned int CAN_Msg_Tx_Enable;
extern uint8_t loc_Type_back;
extern uint8_t LED_Waring ;
extern uint8_t set;
void SET_IPK_NONE(void);
void Clear_IPK_NONE(void);
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ db3ef148
......@@ -1179,7 +1179,20 @@ const unsigned char gImage_gImage_highBeanX6_Y165[]={/*Byte Size110*/
0X00U,0X00U,0X00U,0X00U,0X81U,0XffU,0XffU,0X00U,0X63U,0X63U,0X63U,0X63U,0X63U,0X63U,0X63U,0X63U,
0X63U,0X63U,0X63U,0X60U,0X00U,0X03U,0X1fU,0X7fU,0X70U,0Xe0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xe0U,
0Xe0U,0X60U,0X60U,0X70U,0X30U,0X38U,0X1cU,0X0eU,0X07U,0X03U,0X00U,0X00U,};
//清大计
const unsigned char gImage_icon_01X0_Y6[]={/*Byte Size166*/
82U,16U,
0X00U,0X00U,0X20U,0X42U,0X84U,0X00U,0X44U,0X54U,0X54U,0X54U,0X7eU,0X54U,0X54U,0X54U,0X54U,0X54U,
0X00U,0X00U,0X20U,0X20U,0X20U,0X20U,0X20U,0X20U,0Xf0U,0X2fU,0Xe0U,0X20U,0X20U,0X20U,0X20U,0X20U,
0X20U,0X40U,0X40U,0X42U,0Xc4U,0X0cU,0X00U,0X40U,0X40U,0X40U,0X40U,0XffU,0X40U,0X40U,0X40U,0X40U,
0X00U,0X10U,0X10U,0X10U,0XffU,0X10U,0X10U,0X04U,0X84U,0X84U,0X84U,0X84U,0X84U,0X84U,0XfcU,0X00U,
0X00U,0X00U,0X84U,0X94U,0X94U,0X94U,0X94U,0X94U,0XffU,0X94U,0X94U,0X94U,0X94U,0X94U,0X84U,0X80U,
0X00U,0X00U,0X00U,0X00U,0X40U,0X30U,0X0cU,0X00U,0X00U,0X7fU,0X15U,0X15U,0X15U,0X15U,0X55U,0X55U,
0X3fU,0X00U,0X00U,0X00U,0X40U,0X40U,0X20U,0X10U,0X08U,0X06U,0X01U,0X00U,0X01U,0X06U,0X08U,0X10U,
0X20U,0X40U,0X40U,0X00U,0X00U,0X40U,0X7fU,0X20U,0X20U,0X10U,0X00U,0X00U,0X00U,0X7fU,0X00U,0X00U,
0X00U,0X00U,0X00U,0X02U,0X42U,0X42U,0X3fU,0X01U,0X01U,0X20U,0X20U,0X20U,0X20U,0X20U,0X20U,0X20U,
0X7fU,0X00U,0X00U,0X08U,0X08U,0X08U,0X04U,0X7cU,0X42U,0X41U,0X40U,0X23U,0X04U,0X08U,0X14U,0X24U,
0X22U,0X40U,0X00U,0X00U,};
const unsigned char gImage_gImage_HVX6_Y165[]={/*Byte Size326*/
108U,24U,
0X00U,0X04U,0X84U,0XfcU,0X7cU,0X04U,0X04U,0X04U,0X00U,0Xe2U,0Xe2U,0X22U,0X22U,0X22U,0XfeU,0XfeU,
......@@ -4062,7 +4075,7 @@ void Get_static_Current(void)
static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 5)
if(MENU_CHECK_STEP == 6)
{
POWER_CTRL_KL30 = 0u; //B+
......@@ -4119,7 +4132,7 @@ void Get_static_Current(void)
}
else
{
MENU_CHECK_STEP = 5;
MENU_CHECK_STEP = 6;
// CurrentWrong = 1;
}
}
......@@ -4974,6 +4987,9 @@ void Display_Send_Vspead(uint8_t menu)
// case 16
// HW_Static_Current_Check(1);
//GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60);
TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y6);
case 6:
break;
break;
default:
// MENU_CHECK_STEP = 0;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ db3ef148
......@@ -98,9 +98,9 @@
//灯光信号隔离地
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06
//机油压力//L挡
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
// #define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
//H挡//发动机故障
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
// #define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
//P挡//驻车指示灯
#define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03
//开关后桥状态//制动失效
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ db3ef148
......@@ -68,6 +68,8 @@ extern uint8_t fuelreset1;
extern uint8_t fuelreset2;
extern uint8_t fuelreset3;
extern uint8_t fuelreset4;
uint8_t setflag = 0;
uint8_t set=0;
void Sys_Run_Mode_10ms_Tasks_Group(void)
{
if((resettime < 250) && (writeflag == 0))
......@@ -151,6 +153,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
UIDWrite();
}
// if(getmsgfinish == 0)
// {
......@@ -246,6 +249,47 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Buzzer_Start();
Total_Check( );
//u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
if(MENU_CHECK_STEP == 5)
{
if(set==1)
{
NEG_2_Ctrl=1;
setflag ++;
if(setflag==20)
{
NEG_2_Ctrl=0;
setflag=0;
set=2;
}
}
else if(set==2)
{
setflag ++;
if(setflag==5)
{
NEG_2_Ctrl=1;
}
else if(setflag==8)
{
NEG_2_Ctrl=0;
set=3;
setflag=0;
}
}
else if (set==3)
{
setflag ++;
NEG_3_Ctrl=1;
if(setflag==30)
{
NEG_3_Ctrl=0;
setflag=0;
set=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