Skip to content

J
jiancetai
Commit 8d358d96 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:修改版本号读取，版本号限定

parent 8ae7a26f
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 51 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 8d358d96
...@@ -71,20 +71,24 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -71,20 +71,24 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP++; if(jiaoyan == 1)
if(MENU_CHECK_STEP > 14)
{
MENU_CHECK_STEP = 0;
}
// if((guangganflag == 2 || guangganflag == 1 ) && guangganflag != 3)
// {
// MENU_CHECK_STEP = 3;
// }
if(CurrentWrong == 1)
{ {
MENU_CHECK_STEP = 1; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 14)
{
MENU_CHECK_STEP = 0;
}
// if((guangganflag == 2 || guangganflag == 1 ) && guangganflag != 3)
// {
// MENU_CHECK_STEP = 3;
// }
if(CurrentWrong == 1)
{
MENU_CHECK_STEP = 1;
}
} }
} }
void MENU_CHECK_STEP_SUB(void) void MENU_CHECK_STEP_SUB(void)
{ {
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 8d358d96
...@@ -4642,13 +4642,14 @@ uint8_t nowbanbenhaohoumian = 22; ...@@ -4642,13 +4642,14 @@ uint8_t nowbanbenhaohoumian = 22;
const uint16_t banebenhao1[] = {35,25}; const uint16_t banebenhao1[] = {35,25};
const uint16_t banebenhao2[] = {158,148}; const uint16_t banebenhao2[] = {158,148};
const uint16_t banebenhao3[] = {95,85}; const uint16_t banebenhao3[] = {95,85};
const uint16_t banebenhao4[] = {214,224}; const uint16_t banebenhao4[] = {224,214};
uint8_t menumondel; uint8_t menumondel;
uint8_t SideStayflaglast; uint8_t SideStayflaglast;
uint8_t TCSflaglast; uint8_t TCSflaglast;
uint8_t SlopeDescentflaglast; uint8_t SlopeDescentflaglast;
uint8_t RampParkflaglast; uint8_t RampParkflaglast;
uint8_t Autoheadlightflaglast; uint8_t Autoheadlightflaglast;
uint8_t jiaoyan = 0;
void Display_Version_Info(uint32_t ON_OFF) void Display_Version_Info(uint32_t ON_OFF)
{ {
uint8_t pbuff [ 40 ]; uint8_t pbuff [ 40 ];
...@@ -4746,28 +4747,28 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4746,28 +4747,28 @@ void Display_Version_Info(uint32_t ON_OFF)
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_Dyy_words_1X6_Y16 ); //软件版本号文字 TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_Dyy_words_1X6_Y16 ); //软件版本号文字
//杰理7926版本号 //普冉版本号
uint8_t esp32banben[3] = {R485_IDB4h.Sig.Software_Version1,0x2E,0xff}; uint8_t esp32banben[3] = {R485_IDB4h.Sig.PY32F072_APP_PV,0x2E,0xff};
uint8_t esp32houmian = R485_IDB4h.Sig.Software_Version2; uint8_t esp32houmian = R485_IDB4h.Sig.PY32F072_APP_SV;
General_Number_Disp(esp32banben, 5, 50); General_Number_Disp(esp32banben, 5, 50);
GUI_General_Digit_Display(esp32houmian, Num_15, 2, 0, banebenhao1, 50); GUI_General_Digit_Display(esp32houmian, Num_15, 2, 0, banebenhao1, 50);
//普冉MCU版本号 //7926Flash
uint8_t guominbanben[3] = {R485_IDB4h.Sig.G031_APP_PV,0x2E,0xff}; uint8_t guominbanben[3] = {R485_IDB4h.Sig.JL7926_APP_PV,0x2E,0xff};
General_Number_Disp(guominbanben, 65, 50); General_Number_Disp(guominbanben, 65, 50);
uint8_t guominhoumian = R485_IDB4h.Sig.G031_APP_SV; uint8_t guominhoumian = R485_IDB4h.Sig.JL7926_APP_SV;
GUI_General_Digit_Display(guominhoumian, Num_15, 2, 0, banebenhao3, 50); GUI_General_Digit_Display(guominhoumian, Num_15, 2, 0, banebenhao3, 50);
//7106版本号 //7106版本号
uint8_t mbuffruanjian[3] = {R485_IDB4h.Sig.ESP32_APP_PV,0x2E,0xff}; uint8_t mbuffruanjian[3] = {R485_IDB4h.Sig.JL7106_APP_PV,0x2E,0xff};
General_Number_Disp(mbuffruanjian, 128, 50); General_Number_Disp(mbuffruanjian, 128, 50);
uint8_t wifihoumian = R485_IDB4h.Sig.ESP32_APP_SV; uint8_t wifihoumian = R485_IDB4h.Sig.JL7106_APP_SV;
GUI_General_Digit_Display(wifihoumian, Num_15, 2, 0, banebenhao2, 50); GUI_General_Digit_Display(wifihoumian, Num_15, 2, 0, banebenhao2, 50);
//WIFI版本号 //WIFI版本号(整包主版本号)
uint8_t wifiruanjian[3] = {R485_IDB4h.Sig.Whole_package_main,0x2E,0xff}; uint8_t wifiruanjian[3] = {R485_IDB4h.Sig.u8WholeBagUpdateSWVMajor,0x2E,0xff};
uint8_t wifihoumianbanben = R485_IDB4h.Sig.u8WholeBagUpdateSWVMinor;
General_Number_Disp(wifiruanjian, 190, 50); General_Number_Disp(wifiruanjian, 190, 50);
uint8_t wifihoumianbanben = R485_IDB4h.Sig.Whole_package_time;
GUI_General_Digit_Display(wifihoumianbanben, Num_15, 2, 0, banebenhao4, 50); GUI_General_Digit_Display(wifihoumianbanben, Num_15, 2, 0, banebenhao4, 50);
//硬件版本号 //硬件版本号
...@@ -4863,23 +4864,23 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4863,23 +4864,23 @@ 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+5, ( 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+5, ( 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((esp32houmian == 32) && (guominhoumian == 33) && (wifihoumian == 35))
// { {
// 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; jiaoyan = 1;
// } }
// 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; jiaoyan = 0;
// // MENU_CHECK_STEP = 0; //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可
// //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可 // 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
// { // {
...@@ -4902,7 +4903,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4902,7 +4903,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 [7] = {2,5,1,2,0,2,0xff}; uint8_t mbuff [7] = {2,5,1,2,0,3,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @ 8d358d96
...@@ -99,6 +99,7 @@ extern void Get_static_Current(void); ...@@ -99,6 +99,7 @@ extern void Get_static_Current(void);
extern uint32_t Get_Display_Type(void); extern uint32_t Get_Display_Type(void);
extern uint8_t guangganflag; extern uint8_t guangganflag;
extern uint8_t CurrentWrong; extern uint8_t CurrentWrong;
extern uint8_t jiaoyan;
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/R485_Communication_Matrix.h
View file @ 8d358d96
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define RS485_RX_ID0XA4_DATA_LEN 1 #define RS485_RX_ID0XA4_DATA_LEN 1
#define RS485_RX_ID0XC4_DATA_LEN 1 #define RS485_RX_ID0XC4_DATA_LEN 1
#define RS485_RX_ID0XB4_DATA_LEN 75 #define RS485_RX_ID0XB4_DATA_LEN 77
#define RS485_RX_ID0XD4_DATA_LEN 17 #define RS485_RX_ID0XD4_DATA_LEN 17
typedef union typedef union
{ {
...@@ -1168,7 +1168,7 @@ typedef union __attribute__((packed)) ...@@ -1168,7 +1168,7 @@ typedef union __attribute__((packed))
uint8_t SupplierCode03 : 8; //供应商编码第3位 uint8_t SupplierCode03 : 8; //供应商编码第3位
uint8_t SupplierCode02 : 8; //供应商编码第2位 uint8_t SupplierCode02 : 8; //供应商编码第2位
uint8_t SupplierCode01 : 8; //供应商编码第1位 uint8_t SupplierCode01 : 8; //供应商编码第1位
/*40bit*/
uint8_t : 8; //批次号专用预留位 uint8_t : 8; //批次号专用预留位
uint8_t : 8; //批次号专用预留位 uint8_t : 8; //批次号专用预留位
...@@ -1190,15 +1190,15 @@ typedef union __attribute__((packed)) ...@@ -1190,15 +1190,15 @@ typedef union __attribute__((packed))
uint8_t : 8; uint8_t : 8;
uint8_t : 8; uint8_t : 8;
/*58bit*/
uint8_t : 8; //标定固件次版本信息 uint8_t : 8; //标定固件次版本信息
uint8_t : 8; //标定固件主版本信息 uint8_t : 8; //标定固件主版本信息
uint8_t ESP32_APP_SV : 8; //系统固件次版本信息 uint8_t JL7926_APP_SV : 8; //系统固件次版本信息
uint8_t ESP32_APP_PV : 8; //系统固件主版本信息 uint8_t JL7926_APP_PV : 8; //系统固件主版本信息
uint8_t : 8; //应用固件次版本信息 uint8_t JL7106_APP_SV : 8; //应用固件次版本信息
uint8_t : 8; //应用固件主版本信息 uint8_t JL7106_APP_PV : 8; //应用固件主版本信息
uint8_t G031_APP_SV : 8; //从单片机固件次版本信息 uint8_t PY32F072_APP_SV : 8; //从单片机固件次版本信息
uint8_t G031_APP_PV : 8; //从单片机固件主版本信息 uint8_t PY32F072_APP_PV : 8; //从单片机固件主版本信息
uint8_t : 8; //GPS固件次版本信息 uint8_t : 8; //GPS固件次版本信息
uint8_t : 8; //GPS固件主版本信息 uint8_t : 8; //GPS固件主版本信息
uint8_t Picture_SV : 8; //图片次版本信息 uint8_t Picture_SV : 8; //图片次版本信息
...@@ -1207,8 +1207,8 @@ typedef union __attribute__((packed)) ...@@ -1207,8 +1207,8 @@ typedef union __attribute__((packed))
uint8_t Animation_PV : 8; //开机动画主版本信息 uint8_t Animation_PV : 8; //开机动画主版本信息
uint8_t Font_SV : 8; //字体库次版本信息 uint8_t Font_SV : 8; //字体库次版本信息
uint8_t Font_PV : 8; //字体库主版本信息 uint8_t Font_PV : 8; //字体库主版本信息
uint8_t Whole_package_time : 8; //字体库次版本信息 uint8_t u8WholeBagUpdateSWVMinor : 8; /*整包次版本号*/
uint8_t Whole_package_main : 8; //字体库主版本信息 uint8_t u8WholeBagUpdateSWVMajor : 8; /*整包主版本号*/
}Sig; }Sig;
} _ID0XB4h_Data; } _ID0XB4h_Data;
......
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