Skip to content

J
jiancetai
Commit 03d50672 authored by 王佳伟's avatar 王佳伟
Browse files
Options

✨ feat:测试

parent 1c9382a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 351 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 03d50672
...@@ -279,7 +279,7 @@ uint8_t yibiaoshuju[34]; ...@@ -279,7 +279,7 @@ uint8_t yibiaoshuju[34];
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
Function_Check_Ctrl(1); //Excel表格发报文。硬线信号 //Function_Check_Ctrl(1); //Excel表格发报文。硬线信号
Diag_Info_Init( ); Diag_Info_Init( );
Display_Init( ); Display_Init( );
// Send_Init(); // Send_Init();
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 03d50672
...@@ -140,10 +140,10 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -140,10 +140,10 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
else else
{ {
zhenduanflag = 0; zhenduanflag = 0;
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1; // LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; // LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
zhenduansendStep = 0; zhenduansendStep = 0;
// memset(barcode_Msg,0,sizeof(barcode_Msg)); // memset(barcode_Msg,0,sizeof(barcode_Msg));
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ 03d50672
...@@ -849,10 +849,10 @@ uint32_t R485_Send_0x47(void) ...@@ -849,10 +849,10 @@ uint32_t R485_Send_0x47(void)
memcpy(R485_zhenduan_Msg+3,barcode_Msg,34); memcpy(R485_zhenduan_Msg+3,barcode_Msg,34);
break; break;
case 4: case 4:
LINE_OUT_NEG_01 = 0; // LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0; // LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0; // LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0; // LINE_OUT_NEG_04 = 0;
break; break;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 03d50672
...@@ -119,15 +119,45 @@ void RTE_GPIO_Init(void) ...@@ -119,15 +119,45 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_OUT; gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); 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; queren = 0;
LINE_OUT_POS_06 = 0; LINE_OUT_POS_06 = 0;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1; // LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; // LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
#if(0) #if(0)
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 03d50672
...@@ -45,8 +45,12 @@ ...@@ -45,8 +45,12 @@
#define LINE_OUT_PARK GPIO_OUT_PORT10_PIN06 #define LINE_OUT_PARK GPIO_OUT_PORT10_PIN06
#define LINE_OUT_EPS GPIO_OUT_PORT10_PIN06 #define LINE_OUT_EPS GPIO_OUT_PORT10_PIN06
#define Light_Out GPIO_IN_PORT10_PIN09 #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 #define LINE_OUT_FANGDAO GPIO_OUT_PORT10_PIN06
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 03d50672
...@@ -87,6 +87,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -87,6 +87,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
// BusOff_Service( ); // BusOff_Service( );
Key_Service( ); Key_Service( );
Recv_Byte();
if(devicename<0xFFFF) if(devicename<0xFFFF)
{ {
devicename++; devicename++;
...@@ -158,10 +159,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -158,10 +159,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
else else
{ {
// bleOFFtoONtime = 0; // bleOFFtoONtime = 0;
LINE_OUT_NEG_01 = 0; // LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0; // LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0; // LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0; // LINE_OUT_NEG_04 = 0;
startONfalg = 1; startONfalg = 1;
Display_TFT_Clear(); Display_TFT_Clear();
} }
...@@ -170,10 +171,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -170,10 +171,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
if(startIGONtime >= 50) if(startIGONtime >= 50)
{ {
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1; // LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; // LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
if(startIGONtime >= 100) if(startIGONtime >= 100)
{ {
Openble[0] = 0x59; Openble[0] = 0x59;
...@@ -235,14 +236,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -235,14 +236,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
else else
{ {
// backsend(); // backsend();
LINE_OUT_NEG_09 = 0; // LINE_OUT_NEG_09 = 0;
if(LINE_OUT_NEG_09 == 0) // if(LINE_OUT_NEG_09 == 0)
{ // {
Recv_Byte();
} // }
} }
} }
...@@ -362,6 +360,8 @@ uint8_t compareresult; ...@@ -362,6 +360,8 @@ uint8_t compareresult;
uint8_t flashtime = 0; uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
uint8_t bleuarttime = 0; uint8_t bleuarttime = 0;
uint16_t time5s = 0;
uint16_t IGFLAG = 0;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
static uint32_t loc_timer = 0; static uint32_t loc_timer = 0;
...@@ -373,7 +373,34 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -373,7 +373,34 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Recv_Byte1(); Recv_Byte1();
} }
Display_PageNum(); 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;
}
// Freln_Duty_HZ_Service(); // Freln_Duty_HZ_Service();
...@@ -417,18 +444,18 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -417,18 +444,18 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
else else
{ {
if(LINE_OUT_NEG_01 == 1) // if(LINE_OUT_NEG_01 == 1)
{ // {
LINE_OUT_NEG_01 = 0; // LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0; // LINE_OUT_NEG_04 = 0;
ONOFFtime = 0; // ONOFFtime = 0;
} // }
else // else
{ // {
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
ONOFFtime = 0; // ONOFFtime = 0;
} // }
} }
} }
if(flashtime < 3) if(flashtime < 3)
...@@ -456,7 +483,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -456,7 +483,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
else if(comparestart == 0) else if(comparestart == 0)
{ {
Total_Check( ); //Total_Check( );
if(zhenduanflag == 3) if(zhenduanflag == 3)
{ {
if(compareresult == 1) if(compareresult == 1)
...@@ -476,7 +503,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -476,7 +503,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
else else
{ {
Total_Check(); //Total_Check();
} }
flashtime = 0; flashtime = 0;
} }
...@@ -492,7 +519,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -492,7 +519,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
if(firstpowerflag == 1) if(firstpowerflag == 1)
{ {
zhenduanflag = 2; zhenduanflag = 2;
Total_Check(); //Total_Check();
firstpowerflag = 2; firstpowerflag = 2;
Display_TFT_Clear(); Display_TFT_Clear();
if(compareresult == 1 && comparestart == 0) if(compareresult == 1 && comparestart == 0)
...@@ -509,7 +536,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -509,7 +536,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 ); TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui1 );
// comparestart = 2; // comparestart = 2;
} }
Total_Check(); //Total_Check();
firstpowerflag = 3; firstpowerflag = 3;
// zhendlag = 5; // zhendlag = 5;
} }
...@@ -519,7 +546,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -519,7 +546,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
if(compareresult == 1) if(compareresult == 1)
{ {
Total_Check(); //Total_Check();
firstpowerflag = 3; firstpowerflag = 3;
zhenduanflag = 2; zhenduanflag = 2;
if(compareresult == 1) if(compareresult == 1)
......
YueJin_test_bench/source/System/init.c
View file @ 03d50672
...@@ -64,7 +64,6 @@ void Sys_Startup_Pre_Init(void) ...@@ -64,7 +64,6 @@ void Sys_Startup_Pre_Init(void)
* \attention * \attention
* \retval None * \retval None
******************************************************************************/ ******************************************************************************/
uint8_t firstIGON = 0xFF;
void Sys_Startup_Init(void) void Sys_Startup_Init(void)
{ {
RTC_Pre_Init( ); //首次上电 RTC_Pre_Init( ); //首次上电
...@@ -86,37 +85,32 @@ void Sys_Startup_Init(void) ...@@ -86,37 +85,32 @@ void Sys_Startup_Init(void)
Fre_In_KL30_Wakeup_Init(); Fre_In_KL30_Wakeup_Init();
UART_Channel_Config_st_t loc_config; UART_Channel_Config_st_t loc_config;
loc_config.enUARTLINMode = MODE_UART; loc_config.enUARTLINMode = MODE_UART;
loc_config.u32UARTbps = 115200; loc_config.u32UARTbps = 9600;
loc_config.enUARTOrder = UART_LSB; loc_config.enUARTOrder = UART_LSB;
loc_config.en2UARTParity = UART_PARITY_DISABLE; loc_config.en2UARTParity = UART_PARITY_DISABLE;
loc_config.en2UARTPolarity = UART_POLARITY_NORMAL; loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
loc_config.pfnUARTConfirmCallBack = 0; loc_config.pfnUARTConfirmCallBack = 0;
loc_config.pfnUARTErrHandleCallBack = 0; loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put; loc_config.pfnUARTReadMsgCallBack = UART_Put;
firstIGON = 1;
UART_Init(UART_RLIN30, &loc_config); UART_Init(UART_RLIN30, &loc_config);
loc_config.enUARTLINMode = MODE_UART; // loc_config.enUARTLINMode = MODE_UART;
loc_config.u32UARTbps = 9600; // loc_config.u32UARTbps = 9600;
loc_config.enUARTOrder = UART_LSB; // loc_config.enUARTOrder = UART_LSB;
loc_config.en2UARTParity = UART_PARITY_DISABLE; // loc_config.en2UARTParity = UART_PARITY_DISABLE;
loc_config.en2UARTPolarity = UART_POLARITY_NORMAL; // loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
loc_config.pfnUARTConfirmCallBack = 0; // loc_config.pfnUARTConfirmCallBack = 0;
loc_config.pfnUARTErrHandleCallBack = 0; // loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put1; // loc_config.pfnUARTReadMsgCallBack = UART_Put1;
UART_Init(UART_RLIN31, &loc_config); // UART_Init(UART_RLIN31, &loc_config);
loc_config.enUARTLINMode = MODE_UART; // loc_config.enUARTLINMode = MODE_UART;
loc_config.u32UARTbps = 115200; // loc_config.u32UARTbps = 115200;
loc_config.enUARTOrder = UART_LSB; // loc_config.enUARTOrder = UART_LSB;
loc_config.en2UARTParity = UART_PARITY_DISABLE; // loc_config.en2UARTParity = UART_PARITY_DISABLE;
loc_config.en2UARTPolarity = UART_POLARITY_NORMAL; // loc_config.en2UARTPolarity = UART_POLARITY_NORMAL;
loc_config.pfnUARTConfirmCallBack = 0; // loc_config.pfnUARTConfirmCallBack = 0;
loc_config.pfnUARTErrHandleCallBack = 0; // loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put2; // loc_config.pfnUARTReadMsgCallBack = UART_Put2;
UART_Init(UART_RLIN32, &loc_config); // 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;
Display_TFT_Clear(); Display_TFT_Clear();
GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size); GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
......
YueJin_test_bench/source/System/main.c
View file @ 03d50672
...@@ -17,7 +17,6 @@ int main(void) ...@@ -17,7 +17,6 @@ int main(void)
{ {
Sys_Scheduling_Service(); Sys_Scheduling_Service();
WDT_Clear(); WDT_Clear();
} }
} }
static void Sys_Task_Init(void) 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