Skip to content

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

✨ feat:检测ee为64

parent 9bd8a430
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 36 deletions
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
View file @ 21a543a9
......@@ -126,7 +126,7 @@ void ProcessVehicleStatus(void)
}
}
}
uint8_t EE_Flag=0;
void datacheck(void)
{
uint16_t checksum = 0;
......@@ -183,6 +183,8 @@ void datacheck(void)
writeflag = RS485_data[13];
UbootMajor = RS485_data[14];
UbootMinor = RS485_data[15];
EE_Flag=RS485_data[18];
}
// General_Number_Disp(blename, 3, 165);
......
YueJin_test_bench/source/Appliciation/Barcode_Scanner.h
View file @ 21a543a9
......@@ -43,4 +43,6 @@ extern uint8_t btmac[6];
extern uint8_t writeflag;
extern uint8_t saomafinish;
extern uint8_t mimaread[35];
extern uint8_t EE_Flag;
#endif
\ No newline at end of file
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 21a543a9
......@@ -269,7 +269,7 @@ uint8_t yibiaoshuju[34];
erweima[34] = 0xFF;
General_Number_Disp(erweima, 3, 60);
// General_Number_Disp(erweima, 3, 60);
if(writeflag == 1 || writeflag == 3)
{
......@@ -293,7 +293,7 @@ uint8_t yibiaoshuju[34];
memcpy(erweima,barcode_Msg,34);
erweima[34] = 0xFF;
General_Number_Disp(erweima, 3, 60);
// General_Number_Disp(erweima, 3, 60);
if(writeflag == 1 || writeflag == 3)
{
......@@ -304,13 +304,13 @@ uint8_t yibiaoshuju[34];
TFT_LCD_Draw_Bmp(200, 90+40-5, ( uint8_t * )gImage_cuo12 );
}
uint8_t writesuccess[8] = {0x53,0x55,0x43,0x43,0x45,0x53,0x53,0xff};
General_Number_Disp(writesuccess, 3, 125);
// General_Number_Disp(writesuccess, 3, 125);
}
else if(saomafinish == 2)
{
memcpy(erweima,barcode_Msg,34);
erweima[34] = 0xFF;
General_Number_Disp(erweima, 3, 60);
// General_Number_Disp(erweima, 3, 60);
if(writeflag == 1 || writeflag == 3)
{
......@@ -322,20 +322,20 @@ uint8_t yibiaoshuju[34];
}
uint8_t writesuccess[8] = {0x53,0x55,0x43,0x43,0x45,0x53,0x53,0xff};
General_Number_Disp(writesuccess, 3, 125);
// General_Number_Disp(writesuccess, 3, 125);
mimaread[34] = 0xFF;
General_Number_Disp(mimaread, 3, 200);
// General_Number_Disp(mimaread, 3, 200);
if(Datajudgment())
{
saomafinish = 3;
firstpowerflag = 2;
General_Number_Disp(writesuccess, 3, 250);
// General_Number_Disp(writesuccess, 3, 250);
}
else
{
General_Number_Disp(writefail, 3, 250);
// General_Number_Disp(writefail, 3, 250);
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 0;
......@@ -354,7 +354,7 @@ uint8_t yibiaoshuju[34];
// cmperweima[i] = barcode_Msg1[i];
// }
cmperweima[34] = 0xFF;
General_Number_Disp(cmperweima, 3, 60);
// General_Number_Disp(cmperweima, 3, 60);
// memcpy(yibiaoshuju,get_num_buf,34);
// for(int i =0;i<34;i++)
// {
......@@ -371,7 +371,7 @@ uint8_t yibiaoshuju[34];
CAN_Msg_Tx_Enable = 1u;
if(MENU_CHECK_STEP == 0)
{
Display_Version_Info(1);
// Display_Version_Info(0);
}
else
{
......@@ -425,7 +425,7 @@ uint8_t yibiaoshuju[34];
if(blnamedisplay[0]+blnamedisplay[1]+blnamedisplay[2]+blnamedisplay[3] != 0)
{
General_Number_Disp(blenamedisplay, 110, 154);
// General_Number_Disp(blenamedisplay, 110, 154);
}
// }
// recvflag111 = 0;
......@@ -481,7 +481,7 @@ uint8_t yibiaoshuju[34];
if(blnamedisplay[0]+blnamedisplay[1]+blnamedisplay[2]+blnamedisplay[3] != 0)
{
General_Number_Disp(blenamedisplay, 90, 154);
// General_Number_Disp(blenamedisplay, 90, 154);
}
break;
......@@ -523,7 +523,7 @@ uint8_t yibiaoshuju[34];
if(blnamedisplay[0]+blnamedisplay[1]+blnamedisplay[2]+blnamedisplay[3] != 0)
{
General_Number_Disp(blenamedisplay, 90, 154);
// General_Number_Disp(blenamedisplay, 90, 154);
}
break;
......@@ -810,7 +810,7 @@ void Function_Check_Ctrl(uint32_t cmd)
p [ 1 ] = (MENU_CHECK_STEP ) % 10; // 65535
p [ 2 ] = 0xff;
}
General_Number_Disp(p, 190, 10);//刷图：报文检测步数
// General_Number_Disp(p, 190, 10);//刷图：报文检测步数
}
if(BlueTooth == 0)
{
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 21a543a9
......@@ -3962,7 +3962,7 @@ void Display_PageNum(void)
p [0] = (PageNum_current % 10) / 1;
p [1] = (0xff);
}
General_Number_Disp(p, 3, 10);
// General_Number_Disp(p, 3, 10);
}
......@@ -3987,7 +3987,7 @@ void SW_Version__Display(void)
pbuff[5] = (BUFF_32 >> 4) & 0x0F;
pbuff[6] = (BUFF_32 >> 0) & 0x0F;
pbuff[7] = 0xFF;
General_Number_Disp(mbuff, 105, 40);
// General_Number_Disp(mbuff, 105, 40);
// General_Number_Disp(pbuff, 138, 40);
}
......@@ -4676,7 +4676,8 @@ void Display_Version_Info(uint32_t ON_OFF)
static uint8_t display_Check05 = 0U;
uint32_t loc_Type = 0;
loc_Type = ON_OFF;
menumondel=0;
if(menumondel == 1)
{
// TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_icon_01X16_Y16);
......@@ -4820,9 +4821,9 @@ void Display_Version_Info(uint32_t ON_OFF)
if(wuliao[12] == 0x32) //4.3寸
{
nowpuran = 18;
now7926 = 18;
now7106 = 43;
nowpuran = 14;
now7926 = 14;
now7106 = 37;
up_key_press_number = 1;
}
......@@ -4925,7 +4926,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [7] = {2,6,0,1,0,7,0xff};
uint8_t mbuff [7] = {2,6,0,1,6,0xff};
General_Number_Disp(mbuff, 160, 290);
}
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 21a543a9
......@@ -26,6 +26,7 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
MENU_CHECK_STEP_ADD( );
}
}
MENU_CHECK_STEP_ADD( );
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ 21a543a9
......@@ -246,13 +246,14 @@ uint32_t R485_Send_0xD2(void)
switch (MENU_CHECK_STEP)
{
case 0:
R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_L = 0x00;
R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_H = 0x00; //车速00
R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_L = 0x78;
R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_H = 0x56; //车速99
R485_IDD2h.Sig.BusbarVoltage = 0x05;
R485_IDD2h.Sig.BusbarCurrent = 0x3A; //功率
// R485_IDD2h.Sig.BusbarVoltage = 0x05;
// R485_IDD2h.Sig.BusbarCurrent = 0x3A; //功率
R485_IDD2h.Sig.ParkinFeedback = 0x00; //ready灯熄灭
R485_IDD2h.Sig.ParkinFeedback = 0x01; //ready灯熄灭
break;
case 1:
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 21a543a9
......@@ -21,6 +21,8 @@
#include "api_RS485.h"
#include "RTE_WDT.h"
#include "R485_Communication_Matrix.h"
/*******************************************************************************
------------------------------------------------------------------------------*/
......@@ -58,7 +60,7 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
void Sys_Run_Mode_2ms_Tasks_Group(void)
{
RTE_ADC_Services( );
Get_static_Current();
// Get_static_Current();
Bluetoothname();
}
......@@ -73,6 +75,7 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
/*==============================================================================
10ms����ִ������ ��0��
------------------------------------------------------------------------------*/
void Sys_Run_Mode_10ms_Tasks_Group(void)
{
Key_Service();
......@@ -86,6 +89,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
backsend();
TX_RX_485_service();
EE_Read();
if(Version_number_begin == 0)
{
EnterVersionNumber();
......@@ -118,8 +125,42 @@ uint8_t showtime = 0;
uint8_t bleuarttime = 0;
uint8_t querendelay = 0;
uint8_t OTAModeBeginTime;
uint8_t ee=0;
uint8_t ee_flag=0;
uint8_t delay222=0;
const uint16_t ODODigitNum09PosX22222 []= {165,155,145,135,125,115};
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
if(ee<20)
{
ee++;
GUI_General_Digit_Display(eenum, Num_15, 6, 5, ODODigitNum09PosX22222, 40+25);
}
else
{
ee_flag=1;
}
delay222++;
if(delay222==100)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
}
else if(delay222==150)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
delay222=0;
ee_flag=0;
ee=0;
}
if((OTAMode == 1) || (OTAMode == 2))
{
if(OTAModeBeginTime <= 150)
......@@ -214,11 +255,11 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
compareresult = GetDataCompare();
if(compareresult == 1)
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
}
else
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
}
comparestart = 0;
}
......@@ -229,11 +270,11 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{
if(compareresult == 1)
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
}
else
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
}
}
}
......@@ -255,11 +296,11 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{
if(compareresult == 1)
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
}
else
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
}
Total_Check();
firstpowerflag = 3;
......@@ -274,11 +315,11 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
zhenduanflag = Data_Mode_Read;
if(compareresult == 1)
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo1 );
}
else
{
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
// TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
}
}
}
......
YueJin_test_bench/source/Appliciation/Task.h
View file @ 21a543a9
......@@ -21,5 +21,6 @@ void Sys_Exact_50us_Tasks(void);
void Sys_Exact_100ms_Tasks(void);
void Sys_Enter_Sleep_Mode(void);
uint16_t Sys_Get_ms_Rolling_Counter(void);
extern uint8_t ee_flag;
#endif
\ No newline at end of file
YueJin_test_bench/source/Appliciation/api_RS485.c
View file @ 21a543a9
......@@ -634,6 +634,25 @@ uint8_t RS485_User_Tx_Data(void)
break;
}
}
uint16_t eenum;
const uint16_t ODODigitNum09PosX22 []= {165,155,145,135,125,115};
void EE_Read(void)
{
if((EE_Flag!=64))
{
if(ee_flag==1)
{
eenum++;
GUI_General_Digit_Display(eenum, Num_15, 6, 5, ODODigitNum09PosX22, 40+25);
}
}
}
uint8_t SendTime = 0;
void backsend(void)
......
YueJin_test_bench/source/Appliciation/api_RS485.h
View file @ 21a543a9
......@@ -87,4 +87,7 @@ extern void Bluetoothname(void);
extern void ProcessBluetoothDeviceNameWithLock(void);
extern void BTEnableDelayPowerReset(void);
extern void AutoClearCounterAfterAllLit(void);
extern void EE_Read(void);
extern uint16_t eenum;
#endif /* API_ADC_H_ */
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