Skip to content

J
jiancetai
Commit ea54df78 authored by baizhengyuan's avatar baizhengyuan
Browse files
Options

Merge branch 'yedea_jiancetai-16843' of... 

Merge branch 'yedea_jiancetai-16843' of http://tyw-server.synology.me:12345/chenjiale/jiancetai into yedea_can_jiancetai_16843
parents 21bc9a28 d8863c8a
Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 198 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ ea54df78
...@@ -72,7 +72,7 @@ void MENU_CHECK_STEP_ADD(void) ...@@ -72,7 +72,7 @@ void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 15) if(MENU_CHECK_STEP > 17)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -292,11 +292,15 @@ uint8_t yibiaoshuju[34]; ...@@ -292,11 +292,15 @@ uint8_t yibiaoshuju[34];
case 3: case 3:
blename[4] = 0xFF; blename[4] = 0xFF;
if(recvflag111 == 1) // if(recvflag111 == 1)
// {
if((blename[0]+blename[1]+blename[2]+blename[3]) != 0)
{ {
General_Number_Disp(blename, 3, 165); General_Number_Disp(blename, 3, 165);
recvflag111 = 0;
} }
// recvflag111 = 0;
// }
// POWER_CTRL_KL30 = 0u; //B+ // POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15 // POWER_CTRL_KL15 = 0u; //KL15
...@@ -600,12 +604,14 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -600,12 +604,14 @@ void Function_Check_Ctrl(uint32_t cmd)
if(Auto_ONOFF == 0) if(Auto_ONOFF == 0)
{ {
LINE_OUT_NEG_01 = 1; LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 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;
POWER_CTRL_KL30 = 0; POWER_CTRL_KL30 = 0;
name1= (devicename) & 0xFF;
name2 = (devicename >> 8) & 0xFF;
break; break;
} }
...@@ -743,10 +749,11 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -743,10 +749,11 @@ void Function_Check_Ctrl(uint32_t cmd)
if(Auto_ONOFF == 0) if(Auto_ONOFF == 0)
{ {
LINE_OUT_NEG_01 = 1; LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 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;
LED3 = 1; LED3 = 1;
LED4 = 1; LED4 = 1;
LINE_OUT_NEG_05 = 0; LINE_OUT_NEG_05 = 0;
...@@ -791,14 +798,58 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -791,14 +798,58 @@ void Function_Check_Ctrl(uint32_t cmd)
if(Auto_ONOFF == 0) if(Auto_ONOFF == 0)
{ {
LINE_OUT_NEG_01 = 0; LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 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;
POWER_CTRL_KL30 = 0;
break;
}
case 15:
{
LED3 = 0; //右转
LED4 = 0;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
}
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
POWER_CTRL_KL30 = 0; POWER_CTRL_KL30 = 0;
break; break;
} }
case 16:
{
LED3 = 0; //右转
LED4 = 0;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 1;
LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0;
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
}
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
POWER_CTRL_KL30 = 0;
break;
}
// case 21: // case 21:
// { // {
// LINE_OUT_POS_01 = 1; // LINE_OUT_POS_01 = 1;
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ ea54df78
...@@ -3567,16 +3567,12 @@ void HW_Static_Current_Check(uint32_t cmd) ...@@ -3567,16 +3567,12 @@ void HW_Static_Current_Check(uint32_t cmd)
// // loc_ret /= 100;//转化为电流，单位0.001毫安 // // loc_ret /= 100;//转化为电流，单位0.001毫安
// loc_ret /= 10;//单位0.1毫安 // loc_ret /= 10;//单位0.1毫安
if(loc_ret1 != 0)
{
TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0);
GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60);
loc_ret1 = 0;
}
// loc_ret = 0; // loc_ret = 0;
// } // }
} }
} }
uint8_t CurrentWrong = 0;
void Get_static_Current(void) void Get_static_Current(void)
{ {
static uint32_t loc_Timer = 0; static uint32_t loc_Timer = 0;
...@@ -3597,6 +3593,26 @@ void Get_static_Current(void) ...@@ -3597,6 +3593,26 @@ void Get_static_Current(void)
loc_ret /= 10;//单位0.1毫安 loc_ret /= 10;//单位0.1毫安
loc_ret1 = loc_ret; loc_ret1 = loc_ret;
} }
if(loc_ret1 != 0)
{
TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0);
GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60);
if(loc_ret1 > 10)
{
MENU_CHECK_STEP = 13;
CurrentWrong = 1;
}
else
{
CurrentWrong = 0;
}
loc_ret1 = 0;
}
else
{
MENU_CHECK_STEP = 13;
// CurrentWrong = 1;
}
} }
} }
...@@ -3740,7 +3756,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3740,7 +3756,7 @@ void Display_Version_Info(uint32_t ON_OFF)
if(CAN_MSG_Read(7, 2u) == 0x47 || (R485_ID4Dh.Sig.MaterialCode07 == 0x47)) if(CAN_MSG_Read(7, 2u) == 0x47 || (R485_ID4Dh.Sig.MaterialCode07 == 0x47))
{ {
nowbanbenhao = 1; nowbanbenhao = 1;
nowbanbenhaohoumian = 1; nowbanbenhaohoumian = 9;
} }
else if((CAN_MSG_Read(7, 2u) == 0x43) || (R485_ID4Dh.Sig.MaterialCode07 == 0x43)) else if((CAN_MSG_Read(7, 2u) == 0x43) || (R485_ID4Dh.Sig.MaterialCode07 == 0x43))
{ {
...@@ -3792,36 +3808,29 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3792,36 +3808,29 @@ void Display_Version_Info(uint32_t ON_OFF)
{ {
TFT_LCD_Draw_Bmp(200, 90+25+25+30+30+30, ( uint8_t * )gImage_dui ); //硬线指示灯外发对比 对 TFT_LCD_Draw_Bmp(200, 90+25+25+30+30+30, ( uint8_t * )gImage_dui ); //硬线指示灯外发对比 对
} }
TFT_LCD_Draw_Bmp(3, 90+25+25+30+30+30, ( uint8_t * )gImage_gImage_LEDwaif1X6_Y16 ); //硬线指示灯外发对比 TFT_LCD_Draw_Bmp(3, 90+25+25+30+30+30+5, ( uint8_t * )gImage_gImage_LEDwaif1X6_Y16 ); //硬线指示灯外发对比
TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+30+30, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比 TFT_LCD_Draw_Bmp(3, 90+25+25+30+25+30+30+5, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比
// if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0)) if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0))
// { {
// if((nowbanbenhao == R485_ID4Dh.Sig.ESP322) && (nowbanbenhaohoumian == R485_ID4Dh.Sig.ESP321) && (nowbanbenhao == R485_ID4Dh.Sig.G0312) && (nowbanbenhaohoumian == R485_ID4Dh.Sig.G0311)) if((nowbanbenhao == R485_ID4Dh.Sig.ESP322) && (nowbanbenhaohoumian == R485_ID4Dh.Sig.ESP321) && (nowbanbenhao == R485_ID4Dh.Sig.G0312) && (nowbanbenhaohoumian == R485_ID4Dh.Sig.G0311))
// { {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对 TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// firstpowerflag = 2; firstpowerflag = 2;
// } }
// else else
// { {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错 TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// firstpowerflag = 3; firstpowerflag = 3;
// MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
// } //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可
// } // TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// else // firstpowerflag = 2;
// { }
// if((nowbanbenhao == CAN_MSG_Read(10, 3u)) && (nowbanbenhaohoumian == CAN_MSG_Read(10, 2u)) && (nowbanbenhao == CAN_MSG_Read(10, 7u)) && (nowbanbenhaohoumian == CAN_MSG_Read(10, 6u))) }
// { else
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对 {
// firstpowerflag = 2; MENU_CHECK_STEP = 0;
// } }
// else
// {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// firstpowerflag = 3;
// MENU_CHECK_STEP = 0;
// }
// }
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+25, ( uint8_t * )gImage_cuo ); //软件版本号对比 错 // 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, 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(3, 130, ( uint8_t * )gImage_Dyy_words_4X6_Y107); //供应商编码
...@@ -3839,7 +3848,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3839,7 +3848,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(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(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [4] = {1,0,3,0xff}; uint8_t mbuff [4] = {1,1,0,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
...@@ -4285,7 +4294,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4285,7 +4294,7 @@ void Display_Send_Vspead(uint8_t menu)
} }
if(menu > 0) if(menu > 0)
{ {
if(menu != 13) if(menu < 13 )
{ {
TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16); TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);
TFT_LCD_Draw_Bmp(180, 40, ( uint8_t * )gImage_Dey_words_5X195_Y16); TFT_LCD_Draw_Bmp(180, 40, ( uint8_t * )gImage_Dey_words_5X195_Y16);
...@@ -4294,7 +4303,14 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4294,7 +4303,14 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_checkComX6_Y165); TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_checkComX6_Y165);
} }
if(CurrentWrong == 1)
{
MENU_CHECK_STEP = 13;
}
else
{
;
}
switch (menu) switch (menu)
{ {
case 1: case 1:
...@@ -4601,13 +4617,30 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4601,13 +4617,30 @@ void Display_Send_Vspead(uint8_t menu)
HW_Static_Current_Check(1); HW_Static_Current_Check(1);
break; break;
case 14: case 14:
GUI_Display_Version_Code_Service(25, 20, "Please enter password ", Letter_Num_11, PCodeText_Space_size);
break;
case 15:
// blename[4] = 0xFF;
// if((blename[0]+blename[1]+blename[2]+blename[3]) != 0)
// {
// General_Number_Disp(blename, 3, 165);
// }
memset(blename,0xFF,5);
Display_TFT_Clear();
break;
case 16:
blename[4] = 0xFF;
GUI_Display_Version_Code_Service(3, 150, "BT Name is ", Letter_Num_11, PCodeText_Space_size);
if(((blename[0]+blename[1]+blename[2]+blename[3]) != 0) && (blename[0] != 0xFF) && (blename[1] != 0xFF)&& (blename[2] != 0xFF)&& (blename[3] != 0xFF))
{
General_Number_Disp(blename, 110, 150);
}
break; break;
default: default:
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
break; break;
} }
if(menu != 13) if(menu < 13 && menu != 0)
{ {
GUI_General_Digit_Display(VSpeed_val, Num_15, 6, 5, ODODigitNum09PosX, 40); GUI_General_Digit_Display(VSpeed_val, Num_15, 6, 5, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(fuel_val, Num_15, 6, 5, ODODigitNum09PosX, 40+25); GUI_General_Digit_Display(fuel_val, Num_15, 6, 5, ODODigitNum09PosX, 40+25);
......
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @ ea54df78
...@@ -95,6 +95,7 @@ extern const uint8_t * Letter_Num_11[]; ...@@ -95,6 +95,7 @@ extern const uint8_t * Letter_Num_11[];
extern uint32_t loc_Current_0; extern uint32_t loc_Current_0;
extern void Get_static_Current(void); extern void Get_static_Current(void);
extern uint32_t Get_Display_Type(void);
extern const uint8_t *Num_15[]; extern const uint8_t *Num_15[];
#define PCodeText_Space_size 2//故障文字 英文空格的像素数 #define PCodeText_Space_size 2//故障文字 英文空格的像素数
#endif #endif
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ ea54df78
...@@ -204,11 +204,13 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -204,11 +204,13 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
if(clearOdoFlag == 0) if(clearOdoFlag == 0)
{ {
clearOdoFlag = 1; clearOdoFlag = 1;
} }
else else
{ {
clearOdoFlag = 0; clearOdoFlag = 0;
} }
queren = 0;
} }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ ea54df78
...@@ -113,6 +113,12 @@ void RTE_GPIO_Init(void) ...@@ -113,6 +113,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_IN; gpio_temp.enGPIODir = GPIO_DIR_IN;
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_10;
gpio_temp.enGPIOPIN = GPIO_PIN_10;
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.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_4; gpio_temp.enGPIOPIN = GPIO_PIN_4;
gpio_temp.enGPIOMode = GPIO_MODE_PORT; gpio_temp.enGPIOMode = GPIO_MODE_PORT;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ ea54df78
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "../UART/UART.h" #include "../UART/UART.h"
#include "string.h" #include "string.h"
#include "api_RS485.h" #include "api_RS485.h"
#include "RTE_WDT.h"
#include "R485_Communication_Matrix.h" #include "R485_Communication_Matrix.h"
/******************************************************************************* /*******************************************************************************
* * * *
...@@ -37,6 +38,7 @@ uint32_t bleOFFtoONtime = 0; ...@@ -37,6 +38,7 @@ uint32_t bleOFFtoONtime = 0;
uint8_t startONfalg = 0; uint8_t startONfalg = 0;
uint32_t startIGONtime = 0; uint32_t startIGONtime = 0;
uint8_t compareresult; uint8_t compareresult;
extern uint8_t keyopenble;
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_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,}; 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) void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
...@@ -75,10 +77,12 @@ void Sys_Run_Mode_5ms_Tasks_Group(void) ...@@ -75,10 +77,12 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
/*============================================================================== /*==============================================================================
10ms����ִ������ ��0�� 10ms����ִ������ ��0��
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
uint8_t testdata[3] = {0,1,2}; // uint8_t testdata[3] = {0,1,2};
uint8_t Openble[11] = {0};
uint32_t clearodotime; uint32_t clearodotime;
uint32_t devicename = 0; uint32_t devicename = 0;
uint8_t sartigon = 0; uint8_t sartigon = 0;
uint8_t sendflag = 0;
void Sys_Run_Mode_10ms_Tasks_Group(void) void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
// BusOff_Service( ); // BusOff_Service( );
...@@ -91,22 +95,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -91,22 +95,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
devicename = 0; devicename = 0;
} }
// Fre_In_Time_Out_Handle(10);
//刷数字、刷英文拼写。
//GUI_General_Digit_Display(123456789, Num_09, 10, 0, BackLightDigitNum09PosX, 79);
//GUI_General_Digit_Display(123456789, Num_10_03, 10, 0, BackLightDigitNum09PosX, 79+24*1);
//GUI_General_Digit_Display(123456789, Num_13, 10, 0, BackLightDigitNum09PosX, 79+24*2);
//GUI_General_Digit_Display(123456789, Num_30, 10, 0, BackLightDigitNum09PosX, 79+24*3);
//GUI_Display_Version_Code_Service((0), (79+24*0), "Please Check the Driver", Letter_Num_11, PCodeText_Space_size);
//GUI_Display_Version_Code_Service((0), (79+24*1), "ABCDEFGHIJKLMNOPQRST", Letter_Num_11, PCodeText_Space_size);
//GUI_Display_Version_Code_Service((0), (79+24*2), "UVWXYZ / ' @ - ", Letter_Num_11, PCodeText_Space_size);
//GUI_Display_Version_Code_Service((0), (79+24*3), "abcdefghijklmnopqrstuvwxyz", Letter_Num_11, PCodeText_Space_size);
//GUI_Display_Version_Code_Service((0), (79+24*4), "0123456789 18FEAB21", Letter_Num_11, PCodeText_Space_size);
// UART_Ch0_Send_Multiple_Byte(testdata,3);
// RS485_User_Tx_Data();
if(firstpowerflag == 2) if(firstpowerflag == 2)
{ {
if(clearOdoFlag == 0) if(clearOdoFlag == 0)
...@@ -152,12 +140,20 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -152,12 +140,20 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
// } // }
if(RS485_TX_finish == 0) if(RS485_TX_finish == 0)
{ {
if(startONfalg == 0) if(startONfalg == 0)
{ {
if(send0x42time<130) if(send0x42time<130)
{ {
R485_Send_0x42(); // if(sendflag == 1)
Display_TFT_Clear(); // {
R485_Send_0x42();
// sendflag = 0;
// }
queren = 0;
} }
else else
{ {
...@@ -180,8 +176,39 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -180,8 +176,39 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
LINE_OUT_NEG_04 = 1; LINE_OUT_NEG_04 = 1;
if(startIGONtime >= 100) if(startIGONtime >= 100)
{ {
R485_Send_0x80(); Openble[0] = 0x59;
Openble[1] = 0x44;
Openble[2] = 0xA;
Openble[3] = 0x8A;
Openble[4] = 0xA;
Openble[5] = 0xA;
Openble[6] = name2;
Openble[7] = name1;
Openble[8] = 1;
Openble[9] = 0x4B;
Openble[10] = 0x4A;
// RS485_User_Tx_Data();
if(sendflag == 1)
{
R485_Send_0x41();
sendflag = 0;
}
else
{
R485_Send_0x80();
sendflag = 1;
}
blename[4] = 0xFF; blename[4] = 0xFF;
// if(send0x42time % 20 == 0)
// {
UART_Ch2_Send_Multiple_Byte(Openble,sizeof(Openble));
// if(startIGONtime > 500)
// {
// queren = 1;
// }
// }
} }
...@@ -190,6 +217,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -190,6 +217,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
RS485_send_time = 0; RS485_send_time = 0;
RS485_TX_finish = 1; RS485_TX_finish = 1;
} }
else
{
}
} }
...@@ -213,7 +244,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -213,7 +244,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
} }
queren = 0;
} }
else else
{ {
...@@ -330,6 +361,7 @@ uint32_t ONOFFtime; ...@@ -330,6 +361,7 @@ uint32_t ONOFFtime;
uint8_t compareresult; uint8_t compareresult;
uint8_t flashtime = 0; uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
uint8_t bleuarttime = 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;
...@@ -378,7 +410,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -378,7 +410,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
if(Auto_ONOFF == 1) if(Auto_ONOFF == 1)
{ {
if(ONOFFtime <=200) if(ONOFFtime <=160)
{ {
ONOFFtime++; ONOFFtime++;
} }
......
YueJin_test_bench/source/Appliciation/Task.h
View file @ ea54df78
...@@ -11,6 +11,7 @@ extern uint32_t send0x42time; ...@@ -11,6 +11,7 @@ extern uint32_t send0x42time;
extern uint32_t bleOFFtoONtime; extern uint32_t bleOFFtoONtime;
extern uint8_t startONfalg; extern uint8_t startONfalg;
extern uint32_t startIGONtime; extern uint32_t startIGONtime;
extern uint8_t Openble[11];
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void); void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void);
void Sys_Run_Mode_2ms_Tasks_Group(void); void Sys_Run_Mode_2ms_Tasks_Group(void);
void Sys_Run_Mode_5ms_Tasks_Group(void); void Sys_Run_Mode_5ms_Tasks_Group(void);
......
YueJin_test_bench/source/Appliciation/api_RS485.c
View file @ ea54df78
#include "api_RS485.h" #include "api_RS485.h"
#include "R485_Communication_Matrix.h" #include "R485_Communication_Matrix.h"
#include "string.h" #include "string.h"
#include "Display_Info.h"
#define R485_BUF_SIZE (1024 * 4 ) #define R485_BUF_SIZE (1024 * 4 )
#define R485_UART_PORT (1) #define R485_UART_PORT (1)
#define R485_TX_OUT_MCU R485_TX #define R485_TX_OUT_MCU R485_TX
...@@ -331,130 +332,27 @@ uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len) ...@@ -331,130 +332,27 @@ uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len)
uint8_t sendmsgAll[8]; uint8_t sendmsgAll[8];
uint32_t sendnum = 1; uint32_t sendnum = 1;
uint8_t getbanbenhaoflag = 0; uint8_t getbanbenhaoflag = 0;
uint32_t send80time = 0;
void RS485_User_Tx_Data(void) void RS485_User_Tx_Data(void)
{ {
#if (0)
uint8_t flag = 0;
uint32_t sendfinishflag = 0;
// if(firstflag = 0)
// {
memcpy(lastdata,nowdata,4);
// }
// m
sendmsgAll[0] = (uint8_t)sendnum & 0xFF;
sendmsgAll[1] = ((uint8_t)(sendnum >>8)) & 0xFF;
sendmsgAll[2] = ((uint8_t)(sendnum >>16)) & 0xFF;
sendmsgAll[3] = ((uint8_t)(sendnum >>24)) & 0xFF;
sendmsgAll[4] = ((uint8_t)(sendnum)) & 0xFF;
sendmsgAll[5] = ((uint8_t)(sendnum >>8)) & 0xFF;
sendmsgAll[6] = ((uint8_t)(sendnum >>16)) & 0xFF;
sendmsgAll[7] = ((uint8_t)(sendnum >>24)) & 0xFF;
if(RS485_TX_finish == 0)
{
// LINE_OUT_NEG_09 = 1;
switch (RS485_send_num)
{
case RS485_Tx_ID48_Idx:
sendfinishflag = R485_Send(0x70, sendmsgAll, 8);
RS485_TX_finish = 1;
if(sendfinishflag == 0)
{
if(RS485_TX_finish == 1)
{
// RS485_send_num++;
// lastdata[0] = (uint8_t)sendnum & 0xFF;
// lastdata[1] = ((uint8_t)(sendnum >>8)) & 0xFF;
// lastdata[2] = ((uint8_t)(sendnum >>16)) & 0xFF;
// lastdata[3] = ((uint8_t)(sendnum >>24)) & 0xFF;
nowdata[0] = (uint8_t)sendnum & 0xFF;
nowdata[1] = ((uint8_t)(sendnum >>8)) & 0xFF;
nowdata[2] = ((uint8_t)(sendnum >>16)) & 0xFF;
nowdata[3] = ((uint8_t)(sendnum >>24)) & 0xFF;
sendnum++;
}
}
break;
case RS485_Tx_ID49_Idx:
sendfinishflag = R485_Send(0x71, sendmsgAll, 8);
RS485_TX_finish = 1;
if(sendfinishflag == 0)
{
if(RS485_TX_finish == 1)
{
// sendnum++;
RS485_send_num ++;
}
}
// uart_wait_tx_done(R485_UART_PORT, 100);
break;
case RS485_Tx_ID4A_Idx:
sendfinishflag = R485_Send(0x72, sendmsgAll, sizeof(sendmsgAll));
RS485_TX_finish = 1;
if(sendfinishflag == 0)
{
RS485_TX_finish = 1;
if(RS485_TX_finish == 1)
{
RS485_send_num++;
}
}
break;
case 3:
sendfinishflag = R485_Send(0x73, sendmsgAll, sizeof(sendmsgAll));
RS485_TX_finish = 1;
if(sendfinishflag == 0)
{
RS485_TX_finish = 1;
if(RS485_TX_finish == 1)
{
RS485_send_num++;
}
}
break;
case 4:
sendfinishflag = R485_Send(0x74, sendmsgAll, sizeof(sendmsgAll));
RS485_TX_finish = 1;
if(sendfinishflag == 0)
{
RS485_TX_finish = 1;
if(RS485_TX_finish == 1)
{
RS485_send_num++;
}
}
break;
default:
// sendnum++;
RS485_send_num = 0;
break;
RS485_TX_finish = 1;
}
}
#endif
// #if(getbanbenhaoflag == 0)
#if(1) #if(1)
uint8_t flag = 0; uint8_t flag = 0;
uint32_t sendfinishflag = 0; uint32_t sendfinishflag = 0;
// if(RS485_send_time > 3000) // if(RS485_send_time > 3000)
// { // {
if(MENU_CHECK_STEP == 16)
{
if(send80time < 1000)
{
send80time++;
}
}
switch (RS485_send_num) switch (RS485_send_num)
{ {
case RS485_Tx_ID48_Idx: case RS485_Tx_ID48_Idx:
sendfinishflag = R485_Send_0x40(); sendfinishflag = R485_Send_0x40();
RS485_TX_finish = 1; RS485_TX_finish = 1;
if(sendfinishflag == 0) if(sendfinishflag == 0)
...@@ -502,29 +400,68 @@ void RS485_User_Tx_Data(void) ...@@ -502,29 +400,68 @@ void RS485_User_Tx_Data(void)
RS485_TX_finish = 1; RS485_TX_finish = 1;
if(RS485_TX_finish == 1) if(RS485_TX_finish == 1)
{ {
// if(MENU_CHECK_STEP == 3) if(MENU_CHECK_STEP == 3 || Get_Display_Type( ) == 3 || MENU_CHECK_STEP == 16)
// { {
// RS485_send_num += 2; RS485_send_num ++;
// } }
// else else
// { {
RS485_send_num = 0; RS485_send_num = 0;
// } }
} }
} }
break; break;
case 4: case 4:
sendfinishflag = R485_Send_0x80(); sendfinishflag = 0;
if(sendfinishflag == 0) if(MENU_CHECK_STEP == 16)
{ {
RS485_send_time = 0; Openble[0] = 0x59;
RS485_TX_finish = 1; Openble[1] = 0x44;
if(RS485_TX_finish == 1) Openble[2] = 0xA;
Openble[3] = 0x8A;
Openble[4] = 0xA;
Openble[5] = 0xA;
Openble[6] = name2;
Openble[7] = name1;
Openble[8] = 1;
Openble[9] = 0x4B;
Openble[10] = 0x4A;
UART_Ch2_Send_Multiple_Byte(Openble,sizeof(Openble));
if(send80time < 500)
{
RS485_send_num++;
}
}
else
{
Openble[0] = 0x59;
Openble[1] = 0x44;
Openble[2] = 0xA;
Openble[3] = 0x8A;
Openble[4] = 0xA;
Openble[5] = 0xA;
Openble[6] = name2;
Openble[7] = name1;
Openble[8] = 0;
Openble[9] = 0x4B;
Openble[10] = 0x4A;
UART_Ch2_Send_Multiple_Byte(Openble,sizeof(Openble));
}
if(send80time > 500)
{
sendfinishflag = R485_Send_0x80();
if(sendfinishflag == 0)
{ {
RS485_send_num ++; RS485_send_time = 0;
RS485_TX_finish = 1;
if(RS485_TX_finish == 1)
{
RS485_send_num++;
}
} }
} }
default: default:
flag = 1; flag = 1;
RS485_send_time = 0; RS485_send_time = 0;
......
YueJin_test_bench/source/System/init.c
View file @ ea54df78
...@@ -117,9 +117,12 @@ void Sys_Startup_Init(void) ...@@ -117,9 +117,12 @@ void Sys_Startup_Init(void)
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;
// Display_TFT_Clear();
// GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size); Display_TFT_Clear();
firstpowerflag = 2; GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，打开上面两行的注释即可*/
// firstpowerflag = 2;
} }
/*********************************************************************** /***********************************************************************
......
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