Skip to content

J
jiancetai
Commit 00fd6ffb authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:不带UID读写静态电流检测台

parent 3b8cfa20
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 66 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 00fd6ffb
......@@ -285,7 +285,9 @@ void can_submit(void)
// 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};
if((MENU_CHECK_STEP != 6) && (MENU_CHECK_STEP != 10))
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
if((MENU_CHECK_STEP != 6) && (MENU_CHECK_STEP != 10) && (MENU_CHECK_STEP != 11))
{
/* ABS故障指示灯 */
data1[5] = 0x00;
......@@ -706,8 +708,8 @@ void can_submit(void)
data8[3] = 0x20; //
init_CAN_Frame(&m_msg8, 0x51B, 8, 1, data8);
break;
case 11:
begin714 = 0;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
break;
......@@ -821,7 +823,7 @@ void can_submit(void)
default:
break;
}
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<=13)
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<11)
{
can_mid(m_msg1);
can_mid(m_msg2);
......@@ -968,53 +970,32 @@ void send_0x714_fuc()
Get_PN_msg();
zhenduanstep++;
break;
case 9: //读取UID
if(writeflag == 0)
{
data7[0] = 0x03;
data7[1] = 0x22;
data7[2] = 0x50;
data7[3] = 0x01;
data7[4] = 0xAA;
data7[5] = 0xAA;
data7[6] = 0xAA;
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
}
else
{
readstopflag = 1;
}
break;
case 10:
if(writeflag == 0)
{
Get_UID_msg();
data7[0] = 0x30;
data7[1] = 0x00;
data7[2] = 0x00;
data7[3] = 0xAA;
data7[4] = 0xAA;
data7[5] = 0xAA;
data7[6] = 0xAA;
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
can_mid(m_msg7);
Get_UID_msg();
}
else
{
readstopflag = 1;
}
zhenduanstep++;
break;
// case 11:
// if(UIDresult == 5)
// case 9: //读取UID
// if(writeflag == 0)
// {
// data7[0] = 0x03;
// data7[1] = 0x22;
// data7[2] = 0x50;
// data7[3] = 0x01;
// data7[4] = 0xAA;
// data7[5] = 0xAA;
// data7[6] = 0xAA;
// data7[7] = 0xAA;
// init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
// can_mid(m_msg7);
// zhenduanstep++;
// }
// else
// {
// readstopflag = 1;
// }
// break;
// case 10:
// if(writeflag == 0)
// {
// data7[0] = 0x02;
// data7[1] = 0x3E;
// Get_UID_msg();
// data7[0] = 0x30;
// data7[1] = 0x00;
// data7[2] = 0x00;
// data7[3] = 0xAA;
// data7[4] = 0xAA;
......@@ -1023,9 +1004,30 @@ void send_0x714_fuc()
// data7[7] = 0xAA;
// init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
// can_mid(m_msg7);
// UIDresult = 6;
// Get_UID_msg();
// }
// else
// {
// readstopflag = 1;
// }
// zhenduanstep++;
// break;
// // case 11:
// // if(UIDresult == 5)
// // {
// // data7[0] = 0x02;
// // data7[1] = 0x3E;
// // data7[2] = 0x00;
// // data7[3] = 0xAA;
// // data7[4] = 0xAA;
// // data7[5] = 0xAA;
// // data7[6] = 0xAA;
// // data7[7] = 0xAA;
// // init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
// // can_mid(m_msg7);
// // UIDresult = 6;
// // Get_UID_msg();
// // }
default:
// zhenduanstep = 0;
// cycleflag = 0;
......@@ -1345,6 +1347,7 @@ void Get_PN_msg(void)
lingjianhao[15] = u8get714msg[6];
lingjianhao[16] = u8get714msg[7];
// lingjianhao[16] = u8get714msg[7];
General_Number_Disp(lingjianhao, 15, 125);
PNtestresult = 1;
}
}
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 00fd6ffb
......@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void)
{
if(MENU_CHECK_STEP > 13)
if(MENU_CHECK_STEP > 10)
{
MENU_CHECK_STEP = 0;
}
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 00fd6ffb
......@@ -2242,6 +2242,28 @@ const unsigned char gImage_Number_13_white_LineX0_Y0X0_Y0[]={/*Byte Size22*/
10U,16U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X06U,0X06U,0X06U,0X06U,
0X06U,0X06U,0X00U,0X00U,};
//零件号
const unsigned char gImage_JCT_06X0_Y0[]={/*Byte Size98*/
48U,16U,
0X00U,0X38U,0X08U,0XaaU,0XaaU,0XaaU,0X0aU,0XfeU,0X0aU,0XaaU,0XaaU,0XaaU,0X08U,0X38U,0X00U,0X00U,
0X40U,0X20U,0Xf8U,0X06U,0X20U,0X1cU,0X10U,0X10U,0XfeU,0X10U,0X10U,0X10U,0X00U,0X00U,0X80U,0X80U,
0X9eU,0X92U,0X92U,0X92U,0X92U,0X92U,0X92U,0X92U,0X9eU,0X80U,0X80U,0X00U,0X00U,0X00U,0X80U,0X80U,
0X00U,0X04U,0X04U,0X02U,0X2aU,0X29U,0X29U,0X4cU,0X69U,0X19U,0X0aU,0X02U,0X04U,0X04U,0X00U,0X00U,
0X00U,0X00U,0X7fU,0X00U,0X02U,0X02U,0X02U,0X02U,0X7fU,0X02U,0X02U,0X02U,0X02U,0X00U,0X00U,0X00U,
0X04U,0X06U,0X05U,0X04U,0X04U,0X04U,0X44U,0X44U,0X3cU,0X00U,0X00U,0X00U,0X00U,0X00U,0X31U,0X31U,
};
//仪表名称
const unsigned char gImage_JCT_02X0_Y0[]={/*Byte Size126*/
62U,16U,
0X00U,0X80U,0X40U,0Xf0U,0X0eU,0X00U,0X30U,0Xc0U,0X02U,0X0cU,0X00U,0Xc0U,0X38U,0X00U,0X00U,0X00U,
0X80U,0X88U,0Xa8U,0Xa8U,0Xa8U,0Xa8U,0XfeU,0Xa8U,0Xa8U,0Xa8U,0Xa8U,0X88U,0X80U,0X00U,0X00U,0X20U,
0X20U,0X10U,0X28U,0X4eU,0X88U,0X88U,0X48U,0X28U,0X18U,0X08U,0X00U,0X00U,0X48U,0X48U,0Xf8U,0X44U,
0X44U,0X40U,0X20U,0X1eU,0X10U,0X90U,0X10U,0X50U,0X30U,0X00U,0X00U,0X00U,0X80U,0X80U,0X00U,0X00U,
0X00U,0X7fU,0X00U,0X40U,0X20U,0X10U,0X0bU,0X04U,0X0bU,0X10U,0X20U,0X40U,0X00U,0X00U,0X10U,0X10U,
0X08U,0X04U,0X7eU,0X21U,0X10U,0X03U,0X04U,0X08U,0X14U,0X22U,0X20U,0X00U,0X04U,0X04U,0X02U,0X7eU,
0X23U,0X23U,0X22U,0X22U,0X22U,0X22U,0X22U,0X7eU,0X00U,0X00U,0X08U,0X06U,0X7fU,0X01U,0X02U,0X08U,
0X06U,0X40U,0X40U,0X7fU,0X00U,0X02U,0X0cU,0X00U,0X00U,0X00U,0X31U,0X31U,};
......@@ -4136,8 +4158,7 @@ void Get_static_Current(void)
{
static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0;
CurrentWrongfks = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);
if(MENU_CHECK_STEP == 14)
if(MENU_CHECK_STEP == 11)
{
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0;
......@@ -4170,7 +4191,7 @@ void Get_static_Current(void)
}
else
{
MENU_CHECK_STEP = 14;
MENU_CHECK_STEP = 11;
// CurrentWrong = 1;
}
}
......@@ -4239,9 +4260,10 @@ void Display_Version_Info(uint32_t ON_OFF)
}
TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_Dyy_words_2X6_Y46 ); //硬件版本号
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_JCT_01X0_Y0 ); //检测台版本号
TFT_LCD_Draw_Bmp(3, 120, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //写入UID
TFT_LCD_Draw_Bmp(3, 225, ( uint8_t * )gImage_JCT_08X0_Y0 ); //读取UID
// TFT_LCD_Draw_Bmp(3, 70, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //零件号
// TFT_LCD_Draw_Bmp(3, 120, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //写入UID
// TFT_LCD_Draw_Bmp(3, 225, ( uint8_t * )gImage_JCT_08X0_Y0 ); //读取UID
TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_JCT_06X0_Y0 ); //零件号
TFT_LCD_Draw_Bmp(3, 150, ( uint8_t * )gImage_JCT_02X0_Y0 ); //仪表名称
// TFT_LCD_Draw_Bmp(3, 90+30+30, ( uint8_t * )gImage_gImage_dianyuanwaifX6_Y165 ); //仪表电电源检测外发对比检验
// TFT_LCD_Draw_Bmp(3, 90+25+25+35+30, ( uint8_t * )gImage_gImage_yibiaowaif1X6_Y16 ); //仪表外发对比检验
......@@ -4266,11 +4288,13 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [10] = {2,0,2,5,97,0,5,2,8,0xff};
General_Number_Disp(mbuff, 115, 25); //检测台版本号
General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
uint8_t UUIDS[2] = {45,0xFF};
General_Number_Disp(UUIDS, UUIDX, 160); //UID下——
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
// uint8_t UUIDS[2] = {45,0xFF};
// General_Number_Disp(UUIDS, UUIDX, 160); //UID下——
// General_Number_Disp(UIDcode1, 95, 225);
uint8_t mbuffff [4] = {82,84,2,0xff};
General_Number_Disp(mbuffff, 115, 150); //RT2
}
......@@ -4718,7 +4742,7 @@ void Display_Send_Vspead(uint8_t menu)
}
if(menu > 0)
{
if(menu < 14 )
if(menu < 11 )
{
GUI_General_Digit_Display(menu, Num_15, 2, 0, pagenum, 3);
// TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);//车速
......@@ -4967,14 +4991,14 @@ void Display_Send_Vspead(uint8_t menu)
// // }
// Display_TFT_Clear();
// break;
// case 16
// HW_Static_Current_Check(1);
// break;
case 11:
HW_Static_Current_Check(1);
break;
default:
// MENU_CHECK_STEP = 0;
break;
}
if(menu < 14 && menu != 0)
if(menu < 11 && menu != 0)
{
GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(ESpeed_val, Num_15, 5, 3, ODODigitNum09PosX,40+25);
......
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