Commit 03d50672 authored by 王佳伟's avatar 王佳伟

feat:测试

parent 1c9382a7
......@@ -61,278 +61,12 @@ void get_key(void)
key_value = key_value | ((uint32_t)key_array[2] << 8U);
key_value = key_value | (uint32_t)key_array[3];
}
uint8_t recvflag111 = 0;
void datacheck(void)
{
uint8_t dataopenBuff [ 11 ] ={0x07,0x36,0xAD,0x0F,0x0F,0x11,0x01,0x02,0x03,0x04,0xE6};
uint8_t datacloseBuff [ 11 ] ={0x07,0x36,0x33,0x0F,0x0F,0x11,0x01,0x02,0x03,0x04,0x6C};
RS485_send_time = 0;
RS485_TX_finish = 0;
uint16_t checksum = 0;
uint8_t arraynum = 0;
if(zhenduanflag == 0)
{
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))
{
for(int i = 0;i < 64;i++)
{
RS485_data[i] = BarCode[4+i];
}
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])
{
checknumwrong = 1;
}
break;
case 0x49:
memcpy(R485_ID49h.Msg,RS485_data,64);
checksum = Yadi_CAL_Data_Sum(&BarCode[2], 64 + 2);
if(checksum != BarCode[68])
{
checknumwrong = 1;
}
break;
case 0x4A:
if(connectbleFlag == 1)
{
memcpy(R485_ID4Ah.Msg,RS485_data,64);
}
memcpy(R485_ID4Ah.Msg,RS485_data,64);
checksum = Yadi_CAL_Data_Sum(&BarCode[2], 64 + 2);
if(checksum != BarCode[68])
{
checknumwrong = 1;
}
break;
case 0x4D:
memcpy(R485_ID4Dh.Msg,RS485_data,64);
break;
case 0x81:
{
blename[0] = RS485_data[6];
blename[1] = RS485_data[7];
blename[2] = RS485_data[8];
blename[3] = RS485_data[9];
blename[4] = 0xff;
lightnumber = (RS485_data[11]<<8)+RS485_data[10];
recvflag111 = 1;
RS485_TX_finish = 0;
// General_Number_Disp(blename, 3, 165);
}
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 == 1)
{
line_stdio = 1;
}
break;
case 2:
LineGetSta.turnleft1 = BarCode[7];
if(LineGetSta.turnleft1 == 1)
{
line_stdio = 1;
}
break;
case 3:
LineGetSta.turnright1 = BarCode[7];
if(LineGetSta.turnright1 == 1)
{
line_stdio = 1;
}
break;
case 4:
LineGetSta.ABSlight1 = BarCode[7];
if(LineGetSta.ABSlight1 == 1)
{
line_stdio = 1;
}
break;
case 5:
LineGetSta.lowlight1 = BarCode[7];
if(LineGetSta.lowlight1 == 1)
{
line_stdio = 1;
}
break;
case 6:
LineGetSta.highlight1 = BarCode[7];
if(LineGetSta.highlight1 == 1)
{
line_stdio = 1;
}
break;
case 7:
LineGetSta.weizhilight1 = BarCode[7];
if(LineGetSta.weizhilight1 == 1)
{
line_stdio = 1;
}
break;
default:
break;
}
}
default:
break;
}
memset(RS485_data,0,64);
RS485_TX_finish = 0;
}
else
{
// RS485_send_num--;
RS485_TX_finish = 0;
}
}
else
{
RS485_TX_finish = 0;
}
}
else if(zhenduanflag == 1)
{
if(BarCode[0] == 0x59 && BarCode[1] == 0x44)
{
for(int i = 0;i<255;i++)
{
if(BarCode[i] == 0x4A && BarCode[i - 1] == 0x4B)
{
arraynum = i;
}
}
// g_Stage = 1;
if(((BarCode[arraynum]) == 0x4A) && ((BarCode[arraynum-1]) == 0x4B))
{
switch (zhenduansendStep)
{
case 0:
if(BarCode[2] == 0x4F)
{
if(BarCode[4] == 0x50 && BarCode[5] == 0x3)
{
zhenduansendStep++;
RS485_TX_finish = 0;
}
}
break;
case 1:
if(BarCode[2] == 0x4F)
{
if(BarCode[4] == 0x67 && BarCode[5] == 0x1)
{
seed_value[0] = BarCode[6];
seed_value[1] = BarCode[7];
seed_value[2] = BarCode[8];
seed_value[3] = BarCode[9];
get_key();
zhenduansendStep++;
RS485_TX_finish = 0;
}
}
break;
case 2:
if(BarCode[2] == 0x4F)
{
if(BarCode[4] == 0x67 && BarCode[5] == 0x2)
{
zhenduansendStep++;
RS485_TX_finish = 0;
}
else if(BarCode[4] != 0x67)
{
zhenduansendStep = 0;
RS485_TX_finish = 0;
}
else
{
;
}
}
break;
case 3:
if(BarCode[2] == 0x4F)
{
if((BarCode[4] == 0x6E) && (BarCode[5] == 0x50) && (BarCode[6] == 0))
{
zhenduansendStep++;
RS485_TX_finish = 0;
}
if(BarCode[4] == 0x7F && BarCode[5] == 0x2E && BarCode[6] == 0x78 )
{
RS485_TX_finish = 1;
// zhenduansendStep = 0;
// ;
}
if(BarCode[4] == 0x7F && BarCode[5] == 0x2E && BarCode[6] == 0x31 )
{
RS485_TX_finish = 0;
}
}
else
{
// RS485_TX_finish = 0;
}
break;
default:
break;
}
memset(RS485_data,0,64);
}
else
{
// RS485_TX_finish = 0x0;
}
}
}
else if(zhenduanflag == 2)
{
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;
}
}
}
}
}
uint8_t cmpresult = 3;
void BarCodeDataGet(void)
......@@ -459,7 +193,7 @@ void Recv_Byte(void)
{
if(i > 5)
{
if((mDataBufPtr[i] == 0x4A ) && (mDataBufPtr[i - 1] == 0x4B))
if((mDataBufPtr[i] == 0x4A ) && (mDataBufPtr[i + 1] == 0x4B))
{
if( i < 1)
{
......@@ -477,16 +211,10 @@ void Recv_Byte(void)
}
// 解析协议
len = i;
len = i + 1;
if ( (len > 0) && (len < mDataBufLen) )
{
// 将未解析的数据移到头部
// Move unparsed data to the head
memcpy(mDataBufLen, mDataBufLen + len, mDataBufLen - len);
// memcpy(nowdata,mDataBufPtr + len,len);
// datacheck();
memcpy(mDataBufPtr, mDataBufPtr + len, mDataBufLen - len);
}
mDataBufLen -= len;
datacheck();
......
......@@ -279,7 +279,7 @@ uint8_t yibiaoshuju[34];
{
MENU_CHECK_STEP = 0;
}
Function_Check_Ctrl(1); //Excel表格发报文。硬线信号
//Function_Check_Ctrl(1); //Excel表格发报文。硬线信号
Diag_Info_Init( );
Display_Init( );
// Send_Init();
......
......@@ -140,10 +140,10 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
else
{
zhenduanflag = 0;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
zhenduansendStep = 0;
// memset(barcode_Msg,0,sizeof(barcode_Msg));
......
......@@ -849,10 +849,10 @@ uint32_t R485_Send_0x47(void)
memcpy(R485_zhenduan_Msg+3,barcode_Msg,34);
break;
case 4:
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
break;
......
......@@ -119,15 +119,45 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9;
gpio_temp.enGPIOPIN = GPIO_PIN_4;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9;
gpio_temp.enGPIOPIN = GPIO_PIN_5;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_9;
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);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_8;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_7;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
queren = 0;
LINE_OUT_POS_06 = 0;
LINE_OUT_POS_07 = 0;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
#if(0)
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
......
......@@ -45,8 +45,12 @@
#define LINE_OUT_PARK GPIO_OUT_PORT10_PIN06
#define LINE_OUT_EPS GPIO_OUT_PORT10_PIN06
#define Light_Out GPIO_IN_PORT10_PIN09
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define POWER_CTRL_KL30 GPIO_OUT_PORT09_PIN05
#define POWER_CTRL_KL30_B GPIO_OUT_PORT09_PIN04
#define POWER_CTRL_KL15 GPIO_OUT_PORT09_PIN06
#define LINE_OUT_FANGDAO GPIO_OUT_PORT10_PIN06
......
......@@ -87,6 +87,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{
// BusOff_Service( );
Key_Service( );
Recv_Byte();
if(devicename<0xFFFF)
{
devicename++;
......@@ -158,10 +159,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
else
{
// bleOFFtoONtime = 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 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
startONfalg = 1;
Display_TFT_Clear();
}
......@@ -170,10 +171,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{
if(startIGONtime >= 50)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
if(startIGONtime >= 100)
{
Openble[0] = 0x59;
......@@ -235,14 +236,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
else
{
// backsend();
LINE_OUT_NEG_09 = 0;
if(LINE_OUT_NEG_09 == 0)
{
Recv_Byte();
}
// LINE_OUT_NEG_09 = 0;
// if(LINE_OUT_NEG_09 == 0)
// {
// }
}
}
......@@ -362,6 +360,8 @@ uint8_t compareresult;
uint8_t flashtime = 0;
uint8_t showtime = 0;
uint8_t bleuarttime = 0;
uint16_t time5s = 0;
uint16_t IGFLAG = 0;
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
static uint32_t loc_timer = 0;
......@@ -373,6 +373,33 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Recv_Byte1();
}
Display_PageNum();
//POWER_CTRL_KL30 = 1;
time5s+=100;
if(time5s > 10000)
{
time5s = 0;
if(IGFLAG == 1)
{
IGFLAG = 0;
}
else
{
IGFLAG = 1;
}
}
POWER_CTRL_KL30 = 1;
POWER_CTRL_KL30_B = 1;
if(IGFLAG == 1)
{
POWER_CTRL_KL15 = 1;
}
else
{
POWER_CTRL_KL15 = 0;
}
......@@ -417,18 +444,18 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
else
{
if(LINE_OUT_NEG_01 == 1)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
ONOFFtime = 0;
}
else
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
ONOFFtime = 0;
}
// if(LINE_OUT_NEG_01 == 1)
// {
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_04 = 0;
// ONOFFtime = 0;
// }
// else
// {
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_04 = 1;
// ONOFFtime = 0;
// }
}
}
if(flashtime < 3)
......@@ -456,7 +483,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
}
else if(comparestart == 0)
{
Total_Check( );
//Total_Check( );
if(zhenduanflag == 3)
{
if(compareresult == 1)
......@@ -476,7 +503,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
}
else
{
Total_Check();
//Total_Check();
}
flashtime = 0;
}
......@@ -492,7 +519,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
if(firstpowerflag == 1)
{
zhenduanflag = 2;
Total_Check();
//Total_Check();
firstpowerflag = 2;
Display_TFT_Clear();
if(compareresult == 1 && comparestart == 0)
......@@ -509,7 +536,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
// comparestart = 2;
}
Total_Check();
//Total_Check();
firstpowerflag = 3;
// zhendlag = 5;
}
......@@ -519,7 +546,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{
if(compareresult == 1)
{
Total_Check();
//Total_Check();
firstpowerflag = 3;
zhenduanflag = 2;
if(compareresult == 1)
......
......@@ -64,7 +64,6 @@ void Sys_Startup_Pre_Init(void)
* \attention
* \retval None
******************************************************************************/
uint8_t firstIGON = 0xFF;
void Sys_Startup_Init(void)
{
RTC_Pre_Init( ); //首次上电
......@@ -86,37 +85,32 @@ void Sys_Startup_Init(void)
Fre_In_KL30_Wakeup_Init();
UART_Channel_Config_st_t loc_config;
loc_config.enUARTLINMode = MODE_UART;
loc_config.u32UARTbps = 115200;
loc_config.u32UARTbps = 9600;
loc_config.enUARTOrder = UART_LSB;
loc_config.en2UARTParity = UART_PARITY_DISABLE;
loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
loc_config.pfnUARTConfirmCallBack = 0;
loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put;
firstIGON = 1;
UART_Init(UART_RLIN30, &loc_config);
loc_config.enUARTLINMode = MODE_UART;
loc_config.u32UARTbps = 9600;
loc_config.enUARTOrder = UART_LSB;
loc_config.en2UARTParity = UART_PARITY_DISABLE;
loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
loc_config.pfnUARTConfirmCallBack = 0;
loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put1;
UART_Init(UART_RLIN31, &loc_config);
loc_config.enUARTLINMode = MODE_UART;
loc_config.u32UARTbps = 115200;
loc_config.enUARTOrder = UART_LSB;
loc_config.en2UARTParity = UART_PARITY_DISABLE;
loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
loc_config.pfnUARTConfirmCallBack = 0;
loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put2;
UART_Init(UART_RLIN32, &loc_config);
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
// loc_config.enUARTLINMode = MODE_UART;
// loc_config.u32UARTbps = 9600;
// loc_config.enUARTOrder = UART_LSB;
// loc_config.en2UARTParity = UART_PARITY_DISABLE;
// loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
// loc_config.pfnUARTConfirmCallBack = 0;
// loc_config.pfnUARTErrHandleCallBack = 0;
// loc_config.pfnUARTReadMsgCallBack = UART_Put1;
// UART_Init(UART_RLIN31, &loc_config);
// loc_config.enUARTLINMode = MODE_UART;
// loc_config.u32UARTbps = 115200;
// loc_config.enUARTOrder = UART_LSB;
// loc_config.en2UARTParity = UART_PARITY_DISABLE;
// loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
// loc_config.pfnUARTConfirmCallBack = 0;
// loc_config.pfnUARTErrHandleCallBack = 0;
// loc_config.pfnUARTReadMsgCallBack = UART_Put2;
// UART_Init(UART_RLIN32, &loc_config);
Display_TFT_Clear();
GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
......
......@@ -17,7 +17,6 @@ int main(void)
{
Sys_Scheduling_Service();
WDT_Clear();
}
}
static void Sys_Task_Init(void)
......
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