Skip to content

J
jiancetai
Commit 894c4295 authored by 梁百峰's avatar 梁百峰
Browse files
Options

✨ feat:检测台基本功能

parent 265d3c6e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 687 additions and 260 deletions
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
View file @ 894c4295
......@@ -2,6 +2,7 @@
#include "api_RS485.h"
#include "string.h"
#include "init.h"
#include "R485_Communication_Matrix.h"
#define UART_RX_MAX_DEPTH (1024) // 4K
typedef struct
......@@ -34,10 +35,15 @@ uint8_t RS485_data[64];
uint8_t checknumwrong;
uint8_t zhenduanflag = 0;
uint8_t clearOdoFlag = 0;
uint8_t Auto_ONOFF = 0;
uint32_t key_value;
uint8_t key_array[4];
uint8_t seed_value[4];
uint8_t zhenduansendStep = 0;
uint8_t line_stdio = 0;
uint8_t powerstdio = 0;
uint8_t get_num_buf[34];
uint8_t comparestart;
void get_key(void)
{
key_array[0] = seed_value[0] | seed_value[3];
......@@ -76,6 +82,7 @@ void datacheck(void)
switch (BarCode[2])
{
case 0x48:
memcpy(R485_ID48h.Msg,RS485_data,64);
checksum = Yadi_CAL_Data_Sum(&BarCode[2], 64 + 2);
if(checksum != BarCode[68])
{
......@@ -83,6 +90,7 @@ void datacheck(void)
}
break;
case 0x49:
memcpy(R485_ID49h.Msg,RS485_data,64);
checksum = Yadi_CAL_Data_Sum(&BarCode[2], 64 + 2);
if(checksum != BarCode[68])
{
......@@ -90,12 +98,69 @@ void datacheck(void)
}
break;
case 0x4A:
memcpy(R485_ID4Ah.Msg,RS485_data,64);
checksum = Yadi_CAL_Data_Sum(&BarCode[2], 64 + 2);
if(checksum != BarCode[68])
{
checknumwrong = 1;
}
break;
case 0x4F:
{
switch (BarCode[6])
{
case 0:
LineGetSta.power1 = (BarCode[7]<<8 |BarCode[8]);
if(LineGetSta.power1 < 24)
{
powerstdio = 1;
}
break;
case 1:
LineGetSta.ble1 = BarCode[7];
if(LineGetSta.ble1 == 0)
{
line_stdio = 1;
}
break;
case 2:
LineGetSta.turnleft1 = BarCode[7];
break;
case 3:
LineGetSta.turnright1 = BarCode[7];
break;
case 4:
LineGetSta.ABSlight1 = BarCode[7];
if(LineGetSta.ABSlight1 == 0)
{
line_stdio = 1;
}
break;
case 5:
LineGetSta.lowlight1 = BarCode[7];
if(LineGetSta.lowlight1 == 0)
{
line_stdio = 1;
}
break;
case 6:
LineGetSta.highlight1 = BarCode[7];
if(LineGetSta.highlight1 == 0)
{
line_stdio = 1;
}
break;
case 7:
LineGetSta.weizhilight1 = BarCode[7];
if(LineGetSta.weizhilight1 == 0)
{
line_stdio = 1;
}
break;
default:
break;
}
}
default:
break;
}
......@@ -196,6 +261,29 @@ void datacheck(void)
}
}
}
else
{
if(BarCode[0] == 0x59 && BarCode[1] == 0x44)
{
for(int i = 0;i<255;i++)
{
if(BarCode[i] == 0x4A && BarCode[i - 1] == 0x4B)
{
arraynum = i;
}
}
if(((BarCode[arraynum]) == 0x4A) && ((BarCode[arraynum-1]) == 0x4B))
{
if(BarCode[4] == 0x62 && BarCode[5] == 0x50 && BarCode[6] == 0)
{
memcpy(get_num_buf,BarCode+7,34 );
comparestart = 1;
zhenduanflag = 3;
}
}
}
}
}
void BarCodeDataGet(void)
{
......@@ -204,6 +292,24 @@ void BarCodeDataGet(void)
memcpy(barcode_Msg,&mDataBufPtr1[6],34);
}
}
uint8_t GetDataCompare(void)
{
uint8_t result = 0;
for(int i = 0;i<34;i++)
{
if(get_num_buf[i] == barcode_Msg[i] )
{
result = 0;
// u8compareresult = 0;
}
else
{
result = 1;
// u8compareresult = 1;
}
return result;
}
}
void UART_Put(uint32_t Value)
{
uint32_t nextPos = 0u;
......
YueJin_test_bench/source/Appliciation/Barcode_Scanner.h
View file @ 894c4295
......@@ -8,6 +8,7 @@ void UART_Put(uint32_t Value);
void UART_Put1(uint32_t Value);
void Recv_Byte(void);
void Recv_Byte1(void);
extern uint8_t GetDataCompare(void);
extern uint32_t readNum;
extern uint8_t BarCode[256];
extern uint32_t readNum1;
......@@ -23,4 +24,10 @@ extern uint8_t key_array[4];
extern uint8_t seed_value[4];
extern uint8_t zhenduansendStep;
extern uint8_t clearOdoFlag;
extern uint8_t line_stdio;
extern uint8_t checknumwrong;
extern uint8_t powerstdio;
extern uint8_t Auto_ONOFF;
extern uint8_t comparestart;
extern uint8_t get_num_buf[34];
#endif
\ No newline at end of file
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 894c4295
......@@ -212,7 +212,7 @@ void Total_Check(void)
Display_TFT_Clear();
}
POWER_CTRL_KL30_Current = 0u;//静态电流电阻的远仪表端，永远接通总电源。B+~
// POWER_CTRL_KL30_Current = 0u;//静态电流电阻的远仪表端，永远接通总电源。B+~
BCM_FLAG_2014 = BCM_2014[1] & 0X40 ;
// loc_Type = 2;
......@@ -259,8 +259,8 @@ void Total_Check(void)
Function_Check_Ctrl(1); //Excel表格发报文。硬线信号
Diag_Info_Init( );
Display_Init( );
Send_Init();
Send_ODO_Init();
// Send_Init();
// Send_ODO_Init();
// Display_Send_ODO(0);
//FUEL_UDS__Display(3);
Buzzer_Warning();
......@@ -530,92 +530,152 @@ void Function_Check_Ctrl(uint32_t cmd)
//Voltage_UDS__Display();
//FUEL_UDS__Display(1);
if ( MENU_CHECK_STEP >= Get_Total_CheckStep( ) )
{
// MENU_CHECK_STEP = 0;
}
// if ( MENU_CHECK_STEP >= Get_Total_CheckStep( ) )
// {
// // MENU_CHECK_STEP = 0;
// }
if ( MENU_BACK != MENU_CHECK_STEP )
{
MENU_BACK = MENU_CHECK_STEP;
// if ( MENU_BACK != MENU_CHECK_STEP )
// {
// MENU_BACK = MENU_CHECK_STEP;
Execute_Specify_Step(MENU_CHECK_STEP);//Excel表格发报文。
if (0)//数字需要3位还是2位
{
p [ 0 ] = (MENU_CHECK_STEP + 1) / 100; // 65535
p [ 1 ] = ((MENU_CHECK_STEP + 1) % 100) / 10;
p [ 2 ] = (MENU_CHECK_STEP + 1) % 10; // 65535
p [ 3 ] = 0xff;
}
else
{
p [ 0 ] = ((MENU_CHECK_STEP ) % 100) / 10;
p [ 1 ] = (MENU_CHECK_STEP ) % 10; // 65535
p [ 2 ] = 0xff;
}
General_Number_Disp(p, 190, 10);//刷图：报文检测步数
}
// Execute_Specify_Step(MENU_CHECK_STEP);//Excel表格发报文。
// if (0)//数字需要3位还是2位
// {
// p [ 0 ] = (MENU_CHECK_STEP + 1) / 100; // 65535
// p [ 1 ] = ((MENU_CHECK_STEP + 1) % 100) / 10;
// p [ 2 ] = (MENU_CHECK_STEP + 1) % 10; // 65535
// p [ 3 ] = 0xff;
// }
// else
// {
// p [ 0 ] = ((MENU_CHECK_STEP ) % 100) / 10;
// p [ 1 ] = (MENU_CHECK_STEP ) % 10; // 65535
// p [ 2 ] = 0xff;
// }
// General_Number_Disp(p, 190, 10);//刷图：报文检测步数
// }
Display_Send_Vspead(MENU_CHECK_STEP);
switch (MENU_CHECK_STEP)
{
case 0:
{
LED3 = 1;
LED4 = 1;
LED3 = 0;
LED4 = 0;
LINE_OUT_NEG_05 = 1;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1;
POWER_CTRL_KL30_Current = 1;
LINE_OUT_NEG_06 = 0;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
}
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
break;
}
case 1:
{
LED3 = 0;
LED4 = 0;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 0;
POWER_CTRL_KL30_Current = 0;
LINE_jinguang = 1;
break;
}
case 3:
{
case 2:
{
LED3 = 0;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 0;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
POWER_CTRL_KL30 = 1;
LED4 = 1;
break;
}
case 4:
{
case 3:
{
LED3 = 1;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 0;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
LED4 = 0;
break;
}
case 6:
case 4:
{
break;
}
case 7:
case 5:
{
break;
}
case 8:
case 6:
{
break;
}
case 9:
case 7:
{
break;
}
case 10:
case 8:
{
POWER_CTRL_KL30_Current = 1;
break;
}
case 11:
case 9:
{
break;
}
case 20:
{
LINE_OUT_POS_01 = 0;
// break;
// }
case 10:
{
LED3 = 1;
LED4 = 1;
LINE_OUT_NEG_05 = 1;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1;
POWER_CTRL_KL30_Current = 1;
break;
}
case 11:
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
}
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
LED3 = 1;
LED4 = 1;
LINE_OUT_NEG_05 = 1;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1;
POWER_CTRL_KL30_Current = 1;
break;
}
case 12:
{
POWER_CTRL_KL30_Current = 1;
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
}
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 0;
break;
}
// case 21:
// {
// LINE_OUT_POS_01 = 1;
......@@ -660,7 +720,7 @@ void Function_Check_Ctrl(uint32_t cmd)
// }
}
}
}
}
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 894c4295
......@@ -3487,7 +3487,7 @@ void HW_Voltage_Check(uint32_t cmd)
}
else if ( cmd == 1u )
{
Voltage = ADC_Read_Signal(ADC_CH_10_VOLTAGE); //mv
Voltage = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE); //mv
Voltage = Voltage / 100;
V_ret = V_ret + Voltage;
......@@ -3526,7 +3526,7 @@ void HW_Static_Current_Check(uint32_t cmd)
TFT_LCD_Draw_Bmp(3, 60, ( uint8_t * )gImage_Dyy_words_5X6_Y137);
TFT_LCD_Draw_Bmp(210, 60, ( uint8_t * )gImage_Dyy_words_18X210_Y139);
//电流 *0.25 *100 = 电压
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);//静态电流：电压/25
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);//静态电流：电压/25
......@@ -3555,6 +3555,8 @@ void Check_PWM(void)
uint32_t test = Duty_VEHICLE / 10;
GUI_General_Digit_Display(test, Num_15, 3, 1, testNum, 160);
}
uint32_t leftvoltage;
uint32_t rightvoltage;
void Display_Version_Info(uint32_t ON_OFF)
{
uint8_t pbuff [ 40 ];
......@@ -3586,23 +3588,79 @@ void Display_Version_Info(uint32_t ON_OFF)
}
TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dyy_words_1X6_Y16 ); //软件版本号
// uint8_t mbuffruanjian[2] = {R485_ID48h.Sig.MCUMainSoftwareVer,0xff};
uint8_t banbenhao = R485_ID48h.Sig.MCUMainSoftwareVer;
uint8_t mbuffruanjian[4] = {R485_ID48h.Sig.MCUMainSoftwareVer,0x2E,R485_ID48h.Sig.MCUSecSoftwareVer,0xff};
General_Number_Disp(mbuffruanjian, 160, 40);
// uint8_t mbuffyingjian[3] = {R485_ID48h.Sig.HardwareVer & 0xF0,R485_ID48h.Sig.HardwareVer & 0x0F ,0xff};
// uint8_t numtesy = 0x55;
// uint8_t mbuffyingjian[2] = {numtesy,0xff};
// General_Number_Disp___No_Wrap(mbuffyingjian, 160, 65);
const uint16_t Currenttest[] = {160,170,180};
GUI_General_Digit_Display(R485_ID48h.Sig.HardwareVer, Num_15, 3, 0, Currenttest, 65);
uint8_t wuliao[16];
// for(int i =0;i < 16; i++)
// {
// wuliao[i] = barcode_Msg[i];
// }
wuliao[0] = 0x33;
wuliao[1] = 0x37;
wuliao[2] = 0x31;
wuliao[3] = 0x30;
wuliao[4] = 0x30;
wuliao[5] = 0x2D;
wuliao[6] = 0x43;
wuliao[7] = 0x30;
wuliao[8] = 0x34;
wuliao[9] = 0x37;
wuliao[10] = 0x2D;
wuliao[11] = 0x30;
wuliao[12] = 0x32;
wuliao[13] = 0x30;
wuliao[14] = 0x30;
wuliao[15] = 0xFF;
General_Number_Disp(wuliao, 55, 90);
TFT_LCD_Draw_Bmp(3, 65, ( uint8_t * )gImage_Dyy_words_2X6_Y46 ); //硬件版本号
TFT_LCD_Draw_Bmp(3, 90, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //零件号
TFT_LCD_Draw_Bmp(0, 90, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //零件号
TFT_LCD_Draw_Bmp(3, 90+25, ( uint8_t * )gImage_gImage_dianyuanwaifX6_Y165 ); //仪表电电源检测外发对比检验
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui ); //仪表电电源检测外发对比检验 对
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo ); //仪表电电源检测外发对比检验 错
if(powerstdio == 1)
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo ); //仪表电电源检测外发对比检验 错
}
else
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui ); //仪表电电源检测外发对比检验 对
}
TFT_LCD_Draw_Bmp(3, 90+25+25+30, ( uint8_t * )gImage_gImage_yibiaowaif1X6_Y16 ); //仪表外发对比检验
TFT_LCD_Draw_Bmp(200, 90+25+25+30, ( uint8_t * )gImage_dui ); //仪表外发对比检验 对
// TFT_LCD_Draw_Bmp(200, 90+25+25+30, ( uint8_t * )gImage_cuo ); //仪表外发对比检验 错
if(checknumwrong == 1)
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30, ( uint8_t * )gImage_cuo ); //仪表外发对比检验 错
}
else
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30, ( uint8_t * )gImage_dui ); //仪表外发对比检验 对
}
if(line_stdio == 1)
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25, ( uint8_t * )gImage_cuo ); //硬线指示灯外发对比 错
}
else
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25, ( uint8_t * )gImage_dui ); //硬线指示灯外发对比 对
}
TFT_LCD_Draw_Bmp(3, 90+25+25+30+25, ( uint8_t * )gImage_gImage_LEDwaif1X6_Y16 ); //硬线指示灯外发对比
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25, ( uint8_t * )gImage_dui ); //硬线指示灯外发对比 对
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25, ( uint8_t * )gImage_cuo ); //硬线指示灯外发对比 错
TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+25, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+25, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+25, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// TFT_LCD_Draw_Bmp(3, 90+25+25+25+25+25, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //支持扫码功能个
// TFT_LCD_Draw_Bmp(3, 130, ( uint8_t * )gImage_Dyy_words_4X6_Y107); //供应商编码
TFT_LCD_Draw_Bmp(0, 90+25+25+30+25+25+25, ( uint8_t * )gImage_Dyy_words_6X6_Y165); //10V电压输出
// leftvoltage = ADC_Read_Signal(ADC_CH_left_VOLTAGE);
// rightvoltage = ADC_Read_Signal(ADC_CH_right_VOLTAGE);
// uint8_t mLRbuff [3] = {leftvoltage,rightvoltage,0xff};
// General_Number_Disp(mLRbuff, 100, 90+25+25+30+25+25+25);
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Dyy_words_19X224_Y166); //单位：V
// TFT_LCD_Draw_Bmp(3, 190, ( uint8_t * )gImage_Dyy_words_7X6_Y196); //高压/低压故障
//TFT_LCD_Draw_Bmp(3, 220, ( uint8_t * )gImage_Dyy_words_8X6_Y228); //气压1传感器
......@@ -3616,42 +3674,42 @@ void Display_Version_Info(uint32_t ON_OFF)
if ( display_Check01 != 7 )
{
if ( SW_Version [ 0 ] != 255 )
{
SW_Version__Display();
display_Check01++;
}
else
{
display_Check01 = 0U;
}
}
if ( display_Check02 != 7 )
{
if ( HW_Version [ 0 ] != 255 )
{
HW_Version__Display();
display_Check02++;
}
else
{
display_Check02 = 0U;
}
}
if ( display_Check03 != 7 )
{
if ( Part_Version [ 0 ] != 255 )
{
Part_Version__Display();
display_Check03++;
}
else
{
display_Check03 = 0U;
}
}
// if ( display_Check01 != 7 )
// {
// if ( SW_Version [ 0 ] != 255 )
// {
// SW_Version__Display();
// display_Check01++;
// }
// else
// {
// display_Check01 = 0U;
// }
// }
// if ( display_Check02 != 7 )
// {
// if ( HW_Version [ 0 ] != 255 )
// {
// HW_Version__Display();
// display_Check02++;
// }
// else
// {
// display_Check02 = 0U;
// }
// }
// if ( display_Check03 != 7 )
// {
// if ( Part_Version [ 0 ] != 255 )
// {
// Part_Version__Display();
// display_Check03++;
// }
// else
// {
// display_Check03 = 0U;
// }
// }
//if ( display_Check04 != 7 )
//{
// if ( Made_Date [ 0 ] != 255 )
......@@ -3678,15 +3736,15 @@ void Display_Version_Info(uint32_t ON_OFF)
// }
// }
// HW_Voltage_Check(1);
Voltage_UDS [0] = 1;
Voltage_UDS [1] = 2;
Voltage_UDS [2] = 3;
Voltage_UDS [3] = 4;
Voltage_UDS [4] = 5;
Voltage_UDS [5] = 6;
Voltage_UDS [6] = 7;
Voltage_UDS [7] = 8;
Voltage_UDS__Display();
// Voltage_UDS [0] = 1;
// Voltage_UDS [1] = 2;
// Voltage_UDS [2] = 3;
// Voltage_UDS [3] = 4;
// Voltage_UDS [4] = 5;
// Voltage_UDS [5] = 6;
// Voltage_UDS [6] = 7;
// Voltage_UDS [7] = 8;
// Voltage_UDS__Display();
// //FUEL_UDS__Display(1);
// Check_PWM();
}
......
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @ 894c4295
#ifndef DISPLAY_AUTO_CHECK
#define DISPLAY_AUTO_CHECK
#include "TYW_stdint.h"
#include "R485_Communication_Matrix.h"
enum DisplayFont
{
em_0,
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 894c4295
......@@ -93,6 +93,14 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(zhenduanflag != 2 && zhenduanflag != 3)
{
zhenduanflag = 2;
}
else
{
zhenduanflag = 0;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -115,10 +123,11 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
else
{
zhenduanflag = 0;
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
zhenduansendStep = 0;
}
RS485_TX_finish = 0;
......@@ -135,17 +144,46 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
}
void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{
;
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(LINE_OUT_NEG_01 == 1)
{
LINE_OUT_NEG_01 = 0;
Auto_ONOFF = 3;
}
else
{
LINE_OUT_NEG_01 = 1;
Auto_ONOFF == 0;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
}
else
{
}
}
void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(Get_Display_Type( ) == 2)
// if(Get_Display_Type( ) == 2)
// {
// MENU_CHECK_STEP_SUB( );
// }
if(clearOdoFlag == 0)
{
MENU_CHECK_STEP_SUB( );
clearOdoFlag = 1;
}
else
{
clearOdoFlag = 0;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -166,9 +204,13 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
/*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(Get_Display_Type( ) == 2)
if(Auto_ONOFF != 0)
{
MENU_CHECK_STEP_ADD( );
Auto_ONOFF = 0;
}
else
{
Auto_ONOFF = 1;
}
}
......@@ -218,7 +260,7 @@ Key_Real_Status_en_t Key_Real_sw7(void)
Key_Real_Status_en_t enKeyRealStatus = KEY_LINE_LOOSEN;
if ( SW4 == 0U )
if ( SW7 == 0U )
{
enKeyRealStatus = KEY_LINE_PRESS;
}
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.h
View file @ 894c4295
......@@ -4,6 +4,7 @@
#include "api_RS485.h"
#include "Barcode_Scanner.h"
#include "Check_Ctrl.h"
#include "Task.h"
typedef union
{
uint8_t Msg[64];
......@@ -1134,5 +1135,7 @@ extern uint32_t R485_Send_0x47(void);
extern uint32_t R485_Send_Line_0x47(uint8_t n);
extern uint32_t R485_Send_clear(void);
extern uint32_t R485_Sendcheck_0x47(void);
extern uint8_t barcode_Msg[64];
#endif
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 894c4295
......@@ -77,6 +77,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//Pin0-14 LJS 电压采集 正控7
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_6;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 894c4295
......@@ -66,7 +66,7 @@
#define NEG_9_Ctrl GPIO_OUT_PORT10_PIN04
#define NEG_10_Ctrl GPIO_OUT_PORT00_PIN08
#define queren GPIO_OUT_PORT00_PIN06
#define LINE_SafeBelt_1 NEG_1_Ctrl
#define LINE_SafeBelt_2 NEG_2_Ctrl
#define LINE_SafeBelt_3 NEG_3_Ctrl
......@@ -90,10 +90,10 @@
// #define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08
// #define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
#define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 //12V
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 //BAT
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04 //BAT~
#define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03 //ACC1
#define LINE_OUT_NEG_07 GPIO_OUT_PORT10_PIN07
#define LINE_OUT_NEG_08 GPIO_OUT_PORT10_PIN03
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 894c4295
......@@ -32,6 +32,8 @@
uint8_t time100ms = 0;
uint8_t finish = 0;
uint8_t AutoFlag = 0;
const unsigned char gImage_cuo1[] = {24, 24,0X00,0X00,0X00,0X00,0X30,0X70,0XE0,0XC0,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0X70,0X30,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X83,0XC7,0X66,0X38,0X38,0X7C,0XE6,0XC3,0X81,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0C,0X0C,0X06,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X0E,0X0C,0X00,0X00,0X00,0X00,};
const unsigned char gImage_dui1[] = {24, 24,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0XE0,0X40,0X00,0X00,0X00,0X00,0X08,0X18,0X30,0X70,0XC0,0X80,0X00,0X00,0X80,0XC0,0XE0,0X70,0X38,0X1C,0X0E,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
{
SD_FMQ = 1;
......@@ -69,6 +71,7 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
10ms����ִ������ ��0��
------------------------------------------------------------------------------*/
uint8_t testdata[3] = {0,1,2};
uint32_t clearodotime;
void Sys_Run_Mode_10ms_Tasks_Group(void)
{
// BusOff_Service( );
......@@ -91,8 +94,66 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
// RS485_User_Tx_Data();
if(clearOdoFlag == 0)
{
backsend();
// RS485_TX_finish = 0;
if(RS485_TX_finish == 0)
{
LINE_OUT_NEG_09 = 1;
if(LINE_OUT_NEG_09 == 1)
{
if(zhenduanflag == 0)
{
R485_Send_Line_0x47(MENU_CHECK_STEP);
RS485_User_Tx_Data();
comparestart = 0;
}
else if(zhenduanflag == 1)
{
R485_Send_0x47();
comparestart = 0;
}
else if(zhenduanflag == 2)
{
R485_Sendcheck_0x47();
}
else
{
;
}
}
// else
// {
// RS485_TX_finish = 0;
// }
}
else
{
LINE_OUT_NEG_09 = 0;
Recv_Byte();
}
queren = 0;
}
else
{
MENU_CHECK_STEP = 3;
backsend();
RS485_User_Tx_Data();
if(clearodotime < 3000)
clearodotime++;
if(clearodotime >= 1500)
{
// Port_SetPortPinLevel(2,9,PortGpioHigh);
queren = 1;
}
}
}
/*==============================================================================
......@@ -179,47 +240,7 @@ void Sys_Run_Mode_50ms_Tasks_Group(void)
firstIGON = 0;
}
firstIGON = 0;
if(firstIGON == 0 || firstIGON == 2)
{
backsend();
// RS485_TX_finish = 0;
if(RS485_TX_finish == 0)
{
LINE_OUT_NEG_09 = 1;
if(LINE_OUT_NEG_09 == 1)
{
if(zhenduanflag == 0)
{
RS485_User_Tx_Data();
}
else if(zhenduanflag == 1)
{
R485_Send_0x47();
}
}
// else
// {
// RS485_TX_finish = 0;
// }
}
else
{
LINE_OUT_NEG_09 = 0;
Recv_Byte();
if(firstflag == 0)
{
firstflag = 1;
}
}
}
else
{
RS485_send_time = 0;
}
}
......@@ -228,6 +249,8 @@ void Sys_Run_Mode_50ms_Tasks_Group(void)
------------------------------------------------------------------------------*/
uint16_t u16LJSText;
uint32_t AutoTime;
uint32_t ONOFFtime;
uint8_t compareresult;
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
static uint32_t loc_timer = 0;
......@@ -241,7 +264,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Display_PageNum();
Total_Check( );
// Freln_Duty_HZ_Service();
if(RS485_send_time<0xFFFFFFFF)
{
......@@ -260,8 +283,51 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
}
}
if(Auto_ONOFF == 1)
{
if(ONOFFtime <=420)
{
ONOFFtime++;
}
else
{
if(LINE_OUT_NEG_01 == 1)
{
LINE_OUT_NEG_01 = 0;
ONOFFtime = 0;
}
else
{
LINE_OUT_NEG_01 = 1;
ONOFFtime = 0;
}
}
}
if(comparestart == 1)
{
compareresult = GetDataCompare();
Display_TFT_Clear();
if(compareresult == 1)
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
comparestart = 2;
}
else
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
comparestart = 2;
}
}
else if(comparestart == 0)
{
Total_Check( );
}
else
{
;
}
//u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
}
/*=================================================================*/
......
YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.c
View file @ 894c4295
......@@ -74,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{
9U, 15U, 14U,
9U, 15U, 14U ,18U , 19U,
};
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
......@@ -82,6 +82,8 @@ const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
{ 0U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 2U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 3U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 4U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
};
const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
......@@ -89,6 +91,8 @@ const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
{ 0U, 100000U, 0U, 0U,},
{ 0U, 100000U, 0U, 0U,},
{ 330000U, 47000U, 0U, 0U,},
{ 0U, 100000U, 0U, 0U,},
{ 0U, 100000U, 0U, 0U,},
};
/* Private function prototypes ----------------------------------------------*/
......
YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.h
View file @ 894c4295
......@@ -30,11 +30,13 @@ enum ADCChName
ADC_CH_KL15_VOLTAGE = 0,
ADC_CH_KL30_VOLTAGE,
ADC_CH_10_VOLTAGE,
ADC_CH_left_VOLTAGE,
ADC_CH_right_VOLTAGE,
};
/* Exported macro ------------------------------------------------------------*/
#define ADC_TOTAL_CH_NUMBER (3U)
#define ADC_SIGNAL_CH_NUMBER (3U)
#define ADC_TOTAL_CH_NUMBER (5U)
#define ADC_SIGNAL_CH_NUMBER (5U)
#define ADC_REF_VOLTAGE u16ADCRefVoltage
/* Exported variables --------------------------------------------------------*/
......
YueJin_test_bench/source/Driver/UART/UART.h
View file @ 894c4295
......@@ -8,7 +8,7 @@
/***************************************************************/
/***************************************************************/
/**根据实际应用调整buf大小**/
#define UART_30_SEND_MAX 1024UL
#define UART_30_SEND_MAX 512UL
#define UART_31_SEND_MAX 512UL
#define UART_32_SEND_MAX 1UL
#define UART_33_SEND_MAX 1UL
......
YueJin_test_bench/utility/诊断工具1.10.11 x64/Option/Option.properties
View file @ 894c4295
#new Option
#Thu Jan 04 16:39:38 CST 2024
#Mon Dec 16 20:50:58 CST 2024
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
MergeCanXLSPath=
RH850_D1M1AGPIOJSONpath=
DBFFilePath=
MergeCrcTtpe=1
MergeBootFilePath=
IsMergeChangeAddress=false
MergeFlashOutPutFilePath=
GPIOOutPutPath=D\:\\Git\\\u4E0A\u6C7D\u8DC3\u8FDB\\\u68C0\u6D4B\u53F0git\\test-bench\\YueJin_test_bench\\utility\\\u8BCA\u65AD\u5DE5\u51771.10.11 x64\\Option
GPIOOutPutPath=
MergeCanDBCPath=
IsFilling=true
RxID=729
......@@ -33,13 +34,17 @@ MergeAudioOutPutPath=
MergeCanOutPutPath=
ChangeOutPutFilePath=
MergeTelltalesOutPutPath=
TTFExtractTXTpath=
JieFaRH850GPIOJSONpath=
MergeFlashIsMandatory=false
UpdateProcess=\u5409\u5229
Driver=Kvaser
MergeFlashImageFormat=
RH850_F1KMGPIOJSONpath=
DriverFilePath=
IsMergeCreateHex=false
MergeFlashIsCreateREC=false
TTFExtractTTFpath=
MergeImageFilePath=
IsMergeCreateUpdateBin=false
MergeImageSize=128M
......@@ -55,5 +60,7 @@ MergeAppFilePath=
MergeTelltalesXLSPath=
FillingByte=-86
ImageVersion=0
XHYGPIOJSONpath=
Leave1ID=1
TTFExtractOUTpath=
MergeAudioPWMMax=2000
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