Skip to content

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

✨ feat:添加接收报文

parent a34b384d
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 54 deletions
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.c
View file @ 21bc9a28
......@@ -79,6 +79,60 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY [ CAN_CH0_ID_TOTAL_MAX ] =
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x0C82FFD4ul,//物料编码 1 - 5
(( void * )0),
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x0C81FFD4ul,//物料编码 5 - 10
(( void * )0),
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x0C80FFD4ul,//物料编码 10 - 15
(( void * )0),
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x0C70FFD4ul,//esp32主次软件版本号
(( void * )0),
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x0C87FFD4ul,//国民 esp32 固件版本号
(( void * )0),
(( void * )0),
(( void * )0),
},
};
......@@ -241,6 +295,23 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case CAN_CH0_ID_Send18FEFC17_Msg:
u8Result = CAN_CH0_ID_Send18FEFC17_Msg_Count;
break;
case CAN_CH0_ID_WLCODE1_5_Msg:
u8Result = CAN_CH0_ID_WLCODE1_5_Msg_Count;
break;
case CAN_CH0_ID_WLCODE6_10_Msg:
u8Result = CAN_CH0_ID_WLCODE6_10_Msg_Count;
break;
case CAN_CH0_ID_WLCODE10_15Msg:
u8Result = CAN_CH0_ID_WLCODE10_15Msg_Count;
break;
case CAN_CH0_ID_esp32_soft_Msg:
u8Result = CAN_CH0_ID_esp32_soft_Msg_Count;
break;
case CAN_CH0_ID_gm_esp_ee_Msg:
u8Result = CAN_CH0_ID_gm_esp_ee_Msg_Count;
break;
default :
u8Result = CAN_CH0_ID_TOTAL_MAX;
break;
......
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.h
View file @ 21bc9a28
......@@ -13,6 +13,13 @@ typedef enum
CAN_CH0_ID_Send0CFE6CEE_Msg_Count,
CAN_CH0_ID_Send18FEFC17_Msg_Count,
CAN_CH0_ID_WLCODE1_5_Msg_Count,
CAN_CH0_ID_WLCODE6_10_Msg_Count,
CAN_CH0_ID_WLCODE10_15Msg_Count,
CAN_CH0_ID_esp32_soft_Msg_Count,
CAN_CH0_ID_gm_esp_ee_Msg_Count,
CAN_CH0_ID_TOTAL_MAX,
} CAN_MSG_ID_t;
......@@ -34,6 +41,13 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define CAN_CH0_ID_Send0CFE6CEE_Msg 0x0CFE6CEEul
#define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul
#define CAN_CH0_ID_WLCODE1_5_Msg 0x0C82FFD4ul
#define CAN_CH0_ID_WLCODE6_10_Msg 0x0C81FFD4ul
#define CAN_CH0_ID_WLCODE10_15Msg 0x0C80FFD4ul
#define CAN_CH0_ID_esp32_soft_Msg 0x0C70FFD4ul
#define CAN_CH0_ID_gm_esp_ee_Msg 0x0C87FFD4ul
extern uint32_t Get_ID_ODO(void);
extern uint32_t Get_ID_FUEL(void);
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 21bc9a28
......@@ -275,10 +275,10 @@ uint8_t yibiaoshuju[34];
loc_Type_back = 0;
}
if((R485_ID4Dh.Sig.ESP322 == 0) && ( R485_ID4Dh.Sig.G0312 == 0))
{
MENU_CHECK_STEP = 0;
}
// if((R485_ID4Dh.Sig.ESP322 == 0) && ( R485_ID4Dh.Sig.G0312 == 0))
// {
// MENU_CHECK_STEP = 0;
// }
Function_Check_Ctrl(1); //Excel表格发报文。硬线信号
Diag_Info_Init( );
Display_Init( );
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 21bc9a28
......@@ -3645,33 +3645,61 @@ void Display_Version_Info(uint32_t ON_OFF)
}
TFT_LCD_Draw_Bmp(3, 25, ( 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 esp32banben[3] = {R485_ID4Dh.Sig.ESP322,0x2E,0xff};
uint8_t esp32houmian = R485_ID4Dh.Sig.ESP321;
// uint8_t esp32houmian = 0xA;
uint8_t esp32banben[3] = {0,0x2E,0xff};
uint8_t esp32houmian = 0;
uint8_t mbuffruanjian[3] = {0,0x2E,0xff};
uint8_t wifihoumian = 0;
uint8_t guominbanben[3] = {0,0x2E,0xff};
uint8_t guominhoumian = 0;
if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0))
{
esp32banben[0] = R485_ID4Dh.Sig.ESP322;
esp32houmian = R485_ID4Dh.Sig.ESP321;
mbuffruanjian[0] = R485_ID48h.Sig.MCUMainSoftwareVer;
wifihoumian = R485_ID48h.Sig.MCUSecSoftwareVer;
guominbanben[0] = R485_ID4Dh.Sig.G0312;
guominhoumian = R485_ID4Dh.Sig.G0311;
}
else
{
esp32banben[0] = CAN_MSG_Read(10, 3u);
esp32houmian = CAN_MSG_Read(10, 2u);
mbuffruanjian[0] = CAN_MSG_Read(9, 5u);
wifihoumian = CAN_MSG_Read(9, 4u);
guominbanben[0] = CAN_MSG_Read(10, 7u);
guominhoumian = CAN_MSG_Read(10, 6u);
}
General_Number_Disp(esp32banben, 5, 50);
GUI_General_Digit_Display(esp32houmian, Num_15, 2, 0, banebenhao1, 50);
uint8_t mbuffruanjian[3] = {R485_ID48h.Sig.MCUMainSoftwareVer,0x2E,0xff};
uint8_t wifihoumian = R485_ID48h.Sig.MCUSecSoftwareVer;
GUI_General_Digit_Display(wifihoumian, Num_15, 2, 0, banebenhao2, 50);
General_Number_Disp(mbuffruanjian, 160, 50);
uint8_t guominbanben[3] = {R485_ID4Dh.Sig.G0312,0x2E,0xff};
uint8_t guominhoumian = R485_ID4Dh.Sig.G0311;
GUI_General_Digit_Display(guominhoumian, Num_15, 2, 0, banebenhao3, 50);
General_Number_Disp(guominbanben, 75, 50);
// 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[] = {180,170};
if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0))
{
GUI_General_Digit_Display(R485_ID48h.Sig.HardwareVer, Num_15, 2, 0, Currenttest, 50+30);
}
else
{
GUI_General_Digit_Display(CAN_MSG_Read(9, 0u), Num_15, 2, 0, Currenttest, 50+30);
}
uint8_t wuliao[16];
// for(int i =0;i < 16; i++)
// {
// wuliao[i] = barcode_Msg[i];
// }
if((R485_ID4Dh.Sig.ESP322 != 0) && ( R485_ID4Dh.Sig.G0312 != 0))
{
wuliao[0] = R485_ID4Dh.Sig.MaterialCode01;
wuliao[1] = R485_ID4Dh.Sig.MaterialCode02;
wuliao[2] = R485_ID4Dh.Sig.MaterialCode03;
......@@ -3688,12 +3716,33 @@ void Display_Version_Info(uint32_t ON_OFF)
wuliao[13] = R485_ID4Dh.Sig.MaterialCode14;
wuliao[14] = R485_ID4Dh.Sig.MaterialCode15;
wuliao[15] = 0xFF;
if(R485_ID4Dh.Sig.MaterialCode07 == 0x47)
}
else
{
wuliao[0] = CAN_MSG_Read(6, 4u);
wuliao[1] = CAN_MSG_Read(6, 3u);
wuliao[2] = CAN_MSG_Read(6, 2u);
wuliao[3] = CAN_MSG_Read(6, 1u);
wuliao[4] = CAN_MSG_Read(6, 0u);
wuliao[5] = CAN_MSG_Read(7, 4u);
wuliao[6] = CAN_MSG_Read(7, 3u);
wuliao[7] = CAN_MSG_Read(7, 2u);
wuliao[8] = CAN_MSG_Read(7, 1u);
wuliao[9] = CAN_MSG_Read(7, 0u);;
wuliao[10] = CAN_MSG_Read(8, 4u);
wuliao[11] = CAN_MSG_Read(8, 3u);
wuliao[12] = CAN_MSG_Read(8, 2u);
wuliao[13] = CAN_MSG_Read(8, 1u);
wuliao[14] = CAN_MSG_Read(8, 0u);
wuliao[15] = 0xFF;
}
if(CAN_MSG_Read(7, 2u) == 0x47 || (R485_ID4Dh.Sig.MaterialCode07 == 0x47))
{
nowbanbenhao = 1;
nowbanbenhaohoumian = 1;
}
else if(R485_ID4Dh.Sig.MaterialCode07 == 0x43)
else if((CAN_MSG_Read(7, 2u) == 0x43) || (R485_ID4Dh.Sig.MaterialCode07 == 0x43))
{
nowbanbenhao = 2;
nowbanbenhaohoumian = 22;
......@@ -3745,24 +3794,34 @@ void Display_Version_Info(uint32_t ON_OFF)
}
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+25+30+30, ( uint8_t * )gImage_gImage_SV1X6_Y16 ); //软件版本号对比
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))
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
firstpowerflag = 2;
}
else
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
firstpowerflag = 3;
MENU_CHECK_STEP = 0;
}
}
else
{
MENU_CHECK_STEP = 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))
// {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// firstpowerflag = 2;
// }
// else
// {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// firstpowerflag = 3;
// MENU_CHECK_STEP = 0;
// }
// }
// else
// {
// 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)))
// {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// firstpowerflag = 2;
// }
// 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(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); //供应商编码
......
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