Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiancetai
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈家乐
jiancetai
Commits
5da94303
Commit
5da94303
authored
Jul 14, 2025
by
何锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:更改软件内部版本号格式,增加软件外部版本号
parent
307d6b49
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
118 additions
and
72 deletions
+118
-72
CAN_APP.c
YueJin_test_bench/source/Appliciation/CAN_APP.c
+67
-64
CAN_APP.h
YueJin_test_bench/source/Appliciation/CAN_APP.h
+3
-1
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+44
-7
Task.c
YueJin_test_bench/source/Appliciation/Task.c
+4
-0
No files found.
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @
5da94303
...
@@ -841,7 +841,8 @@ uint8_t u8getUIDmsg[8];
...
@@ -841,7 +841,8 @@ uint8_t u8getUIDmsg[8];
uint8_t
SWtestresult
=
0
;
uint8_t
SWtestresult
=
0
;
uint8_t
HWtestresult
=
0
;
uint8_t
HWtestresult
=
0
;
uint8_t
PNtestresult
=
0
;
uint8_t
PNtestresult
=
0
;
uint8_t
ruanjianbanbenhao
[
8
];
uint8_t
ruanjianbanbenhao
[
6
];
uint8_t
ruanjianbanbenhaoin
[
5
];
uint8_t
yingjianbanbenhao
[
8
];
uint8_t
yingjianbanbenhao
[
8
];
uint8_t
lingjianhao
[
21
];
uint8_t
lingjianhao
[
21
];
uint8_t
UIDcode1
[
33
];
uint8_t
UIDcode1
[
33
];
...
@@ -855,6 +856,7 @@ extern uint32_t send0x714time;
...
@@ -855,6 +856,7 @@ extern uint32_t send0x714time;
uint8_t
readstopflag
;
uint8_t
readstopflag
;
uint8_t
begin714
;
uint8_t
begin714
;
uint8_t
UIDdelay
;
uint8_t
UIDdelay
;
uint8_t
SWINtestresult
;
void
send_0x714_fuc
()
void
send_0x714_fuc
()
{
{
...
@@ -968,66 +970,36 @@ void send_0x714_fuc()
...
@@ -968,66 +970,36 @@ void send_0x714_fuc()
break
;
break
;
case
8
:
case
8
:
Get_PN_msg
();
Get_PN_msg
();
data7
[
0
]
=
0x03
;
data7
[
1
]
=
0x22
;
data7
[
2
]
=
0x20
;
data7
[
3
]
=
0x24
;
data7
[
4
]
=
0xAA
;
data7
[
5
]
=
0xAA
;
data7
[
6
]
=
0xAA
;
data7
[
7
]
=
0xAA
;
init_CAN_Frame
(
&
m_msg7
,
0x7A1
,
8
,
1
,
data7
);
can_mid
(
m_msg7
);
SWINtestresult
=
1
;
zhenduanstep
++
;
zhenduanstep
++
;
break
;
break
;
// case 9: //读取UID
case
9
:
// if(writeflag == 0)
Get_SWIN_msg
();
// {
data7
[
0
]
=
0x30
;
// data7[0] = 0x03;
data7
[
1
]
=
0x00
;
// data7[1] = 0x22;
data7
[
2
]
=
0x00
;
// data7[2] = 0x50;
data7
[
3
]
=
0xAA
;
// data7[3] = 0x01;
data7
[
4
]
=
0xAA
;
// data7[4] = 0xAA;
data7
[
5
]
=
0xAA
;
// data7[5] = 0xAA;
data7
[
6
]
=
0xAA
;
// data7[6] = 0xAA;
data7
[
7
]
=
0xAA
;
// data7[7] = 0xAA;
init_CAN_Frame
(
&
m_msg7
,
0x7A1
,
8
,
1
,
data7
);
// init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
can_mid
(
m_msg7
);
// can_mid(m_msg7);
zhenduanstep
++
;
// zhenduanstep++;
Get_SWIN_msg
();
// }
case
10
:
// else
Get_SWIN_msg
();
// {
zhenduanstep
++
;
// readstopflag = 1;
// }
// break;
// case 10:
// if(writeflag == 0)
// {
// Get_UID_msg();
// data7[0] = 0x30;
// data7[1] = 0x00;
// data7[2] = 0x00;
// data7[3] = 0xAA;
// data7[4] = 0xAA;
// data7[5] = 0xAA;
// data7[6] = 0xAA;
// data7[7] = 0xAA;
// init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
// can_mid(m_msg7);
// Get_UID_msg();
// }
// else
// {
// readstopflag = 1;
// }
// zhenduanstep++;
// break;
// // case 11:
// // if(UIDresult == 5)
// // {
// // data7[0] = 0x02;
// // data7[1] = 0x3E;
// // data7[2] = 0x00;
// // data7[3] = 0xAA;
// // data7[4] = 0xAA;
// // data7[5] = 0xAA;
// // data7[6] = 0xAA;
// // data7[7] = 0xAA;
// // init_CAN_Frame(&m_msg7, 0x7A1, 8, 1, data7);
// // can_mid(m_msg7);
// // UIDresult = 6;
// // Get_UID_msg();
// // }
default:
default:
// zhenduanstep = 0;
// zhenduanstep = 0;
// cycleflag = 0;
// cycleflag = 0;
...
@@ -1268,14 +1240,45 @@ void Get_SW_msg(void)
...
@@ -1268,14 +1240,45 @@ void Get_SW_msg(void)
if
(
u8getSWmsg
[
0
]
==
0x21
&&
zhenduanstep
==
2
)
if
(
u8getSWmsg
[
0
]
==
0x21
&&
zhenduanstep
==
2
)
{
{
memcpy
(
ruanjianbanbenhao
,
&
u8getSWmsg
[
1
],
7
);
ruanjianbanbenhao
[
0
]
=
u8getSWmsg
[
1
]
/
10
;
ruanjianbanbenhao
[
7
]
=
0xFF
;
ruanjianbanbenhao
[
1
]
=
u8getSWmsg
[
1
]
%
10
;
ruanjianbanbenhao
[
2
]
=
u8getSWmsg
[
2
];
ruanjianbanbenhao
[
3
]
=
u8getSWmsg
[
3
]
/
10
;
ruanjianbanbenhao
[
4
]
=
u8getSWmsg
[
3
]
%
10
;
ruanjianbanbenhao
[
5
]
=
0xFF
;
SWtestresult
=
1
;
SWtestresult
=
1
;
General_Number_Disp
(
ruanjianbanbenhao
,
1
0
5
,
50
);
General_Number_Disp
(
ruanjianbanbenhao
,
1
3
5
,
50
);
}
}
}
}
void
Get_SWIN_msg
(
void
)
{
u8getSWmsg
[
0
]
=
Get_CAN_CH0_ID_7A9_byte0_Sig
();
u8getSWmsg
[
1
]
=
Get_CAN_CH0_ID_7A9_byte1_Sig
();
u8getSWmsg
[
2
]
=
Get_CAN_CH0_ID_7A9_byte2_Sig
();
u8getSWmsg
[
3
]
=
Get_CAN_CH0_ID_7A9_byte3_Sig
();
u8getSWmsg
[
4
]
=
Get_CAN_CH0_ID_7A9_byte4_Sig
();
u8getSWmsg
[
5
]
=
Get_CAN_CH0_ID_7A9_byte5_Sig
();
u8getSWmsg
[
6
]
=
Get_CAN_CH0_ID_7A9_byte6_Sig
();
u8getSWmsg
[
7
]
=
Get_CAN_CH0_ID_7A9_byte7_Sig
();
if
((
u8getSWmsg
[
0
]
==
0x10
)
&&
(
zhenduanstep
==
9
))
{
ruanjianbanbenhaoin
[
0
]
=
u8getSWmsg
[
7
];
}
else
if
(
u8getSWmsg
[
0
]
==
0x21
)
{
ruanjianbanbenhaoin
[
1
]
=
u8getSWmsg
[
1
];
ruanjianbanbenhaoin
[
2
]
=
u8getSWmsg
[
2
];
ruanjianbanbenhaoin
[
3
]
=
u8getSWmsg
[
3
];
ruanjianbanbenhaoin
[
4
]
=
0xFF
;
General_Number_Disp
(
ruanjianbanbenhaoin
,
135
,
75
);
SWINtestresult
=
0
;
}
}
void
Get_HW_msg
(
void
)
void
Get_HW_msg
(
void
)
{
{
if
(
HWtestresult
==
1
)
if
(
HWtestresult
==
1
)
...
@@ -1295,7 +1298,7 @@ void Get_HW_msg(void)
...
@@ -1295,7 +1298,7 @@ void Get_HW_msg(void)
memcpy
(
yingjianbanbenhao
,
&
u8get714msg
[
1
],
7
);
memcpy
(
yingjianbanbenhao
,
&
u8get714msg
[
1
],
7
);
yingjianbanbenhao
[
7
]
=
0xFF
;
yingjianbanbenhao
[
7
]
=
0xFF
;
HWtestresult
=
1
;
HWtestresult
=
1
;
General_Number_Disp
(
yingjianbanbenhao
,
105
,
75
);
General_Number_Disp
(
yingjianbanbenhao
,
105
,
100
);
HWtestresult
=
1
;
HWtestresult
=
1
;
}
}
...
@@ -1347,7 +1350,7 @@ void Get_PN_msg(void)
...
@@ -1347,7 +1350,7 @@ void Get_PN_msg(void)
lingjianhao
[
15
]
=
u8get714msg
[
6
];
lingjianhao
[
15
]
=
u8get714msg
[
6
];
lingjianhao
[
16
]
=
u8get714msg
[
7
];
lingjianhao
[
16
]
=
u8get714msg
[
7
];
// lingjianhao[16] = u8get714msg[7];
// lingjianhao[16] = u8get714msg[7];
General_Number_Disp
(
lingjianhao
,
15
,
1
25
);
General_Number_Disp
(
lingjianhao
,
15
,
1
50
);
PNtestresult
=
1
;
PNtestresult
=
1
;
}
}
}
}
...
...
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @
5da94303
...
@@ -48,13 +48,15 @@ uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
...
@@ -48,13 +48,15 @@ uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
void
can_submit
(
void
);
void
can_submit
(
void
);
void
Get_ID_0x794_Msg
(
void
);
void
Get_ID_0x794_Msg
(
void
);
void
send_0x714_fuc
(
void
);
void
send_0x714_fuc
(
void
);
extern
uint8_t
ruanjianbanbenhao
[
8
];
extern
uint8_t
ruanjianbanbenhao
[
6
];
extern
uint8_t
SWINtestresult
;
void
Get_PN_msg
(
void
);
void
Get_PN_msg
(
void
);
extern
void
Get_UID_msg
(
void
);
extern
void
Get_UID_msg
(
void
);
void
change_UDS_DID
(
void
);
void
change_UDS_DID
(
void
);
void
resetchangeUDSfuc
(
void
);
void
resetchangeUDSfuc
(
void
);
void
resetpowerfuel
(
void
);
void
resetpowerfuel
(
void
);
void
UIDWrite
(
void
);
void
UIDWrite
(
void
);
extern
void
Get_SWIN_msg
(
void
);
extern
uint8_t
UIDcode1
[
33
];
extern
uint8_t
UIDcode1
[
33
];
extern
uint8_t
UIDcode2
[
33
];
extern
uint8_t
UIDcode2
[
33
];
extern
uint8_t
UIDNumber
[
19
];
extern
uint8_t
UIDNumber
[
19
];
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
5da94303
...
@@ -129,6 +129,42 @@ const unsigned char gImage_Dyy_words_3X6_Y75[]={/*Byte Size126*/
...
@@ -129,6 +129,42 @@ const unsigned char gImage_Dyy_words_3X6_Y75[]={/*Byte Size126*/
0X3fU,0X20U,0X20U,0X00U,0X20U,0X3fU,0X20U,0X20U,0X20U,0X10U,0X0fU,0X00U,0X08U,0X08U,0X09U,0X09U,
0X3fU,0X20U,0X20U,0X00U,0X20U,0X3fU,0X20U,0X20U,0X20U,0X10U,0X0fU,0X00U,0X08U,0X08U,0X09U,0X09U,
0X09U,0X09U,0X09U,0X09U,0X09U,0X49U,0X41U,0X3fU,0X00U,0X00U,0X40U,0X20U,0X10U,0X0cU,0X03U,0X00U,
0X09U,0X09U,0X09U,0X09U,0X09U,0X49U,0X41U,0X3fU,0X00U,0X00U,0X40U,0X20U,0X10U,0X0cU,0X03U,0X00U,
0X00U,0X00U,0X03U,0X0cU,0X10U,0X20U,0X40U,0X00U,0X00U,0X00U,0X31U,0X31U,};
0X00U,0X00U,0X03U,0X0cU,0X10U,0X20U,0X40U,0X00U,0X00U,0X00U,0X31U,0X31U,};
const unsigned char gImage_pic_01X0_Y01[]={/*Byte Size242*/
120U,16U,
0X00U,0X00U,0Xc0U,0X20U,0X9eU,0X09U,0X08U,0Xc8U,0X38U,0X00U,0X00U,0XffU,0X40U,0X80U,0X80U,0X00U,
0X00U,0X00U,0X88U,0X88U,0Xa8U,0X89U,0X8eU,0Xc8U,0Xa8U,0X88U,0X00U,0XfeU,0X02U,0Xc2U,0X3aU,0X06U,
0X00U,0X08U,0Xc8U,0Xb8U,0X8eU,0Xe8U,0X88U,0X88U,0Xa8U,0X20U,0X1eU,0X09U,0Xe8U,0X08U,0X08U,0X68U,
0X18U,0X00U,0Xc0U,0X20U,0Xf0U,0X0eU,0X81U,0X60U,0X1eU,0X10U,0X10U,0XfeU,0X10U,0X10U,0X10U,0X10U,
0X00U,0X00U,0X00U,0XfeU,0X20U,0X3fU,0X20U,0X20U,0X00U,0XfeU,0X22U,0Xe2U,0X22U,0X22U,0X21U,0Xe1U,
0X01U,0X10U,0X10U,0X10U,0X10U,0X90U,0X50U,0X30U,0XffU,0X30U,0X50U,0X90U,0X10U,0X10U,0X10U,0X10U,
0X00U,0X00U,0X40U,0X40U,0X5eU,0X52U,0Xd2U,0X52U,0X52U,0X52U,0X52U,0X52U,0X52U,0X5eU,0X40U,0X40U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X40U,0X00U,0X00U,0X00U,0X00U,0X40U,0X20U,0X10U,0X09U,0X06U,0X01U,
0X00U,0X00U,0X00U,0X7fU,0X00U,0X00U,0X00U,0X01U,0X02U,0X00U,0X00U,0X7eU,0X22U,0X22U,0X22U,0X22U,
0X22U,0X7eU,0X00U,0X7fU,0X00U,0X10U,0X11U,0X0eU,0X00U,0X08U,0X08U,0X08U,0X08U,0X7fU,0X04U,0X04U,
0X44U,0X20U,0X10U,0X0eU,0X01U,0X06U,0X18U,0X20U,0X40U,0X00U,0X00U,0X00U,0XffU,0X00U,0X02U,0X02U,
0X02U,0X02U,0X02U,0XffU,0X02U,0X02U,0X02U,0X02U,0X02U,0X00U,0X70U,0X0fU,0X01U,0X01U,0X7fU,0X00U,
0X30U,0X0fU,0X40U,0X21U,0X16U,0X18U,0X26U,0X41U,0X40U,0X10U,0X08U,0X04U,0X02U,0X09U,0X08U,0X08U,
0X7fU,0X08U,0X08U,0X09U,0X02U,0X04U,0X08U,0X10U,0X00U,0X00U,0X00U,0X00U,0X00U,0X03U,0X02U,0X02U,
0X22U,0X42U,0X42U,0X42U,0X3aU,0X06U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X20U,0X00U,0X00U,
};
const unsigned char gImage_pic_02X0_Y02[]={/*Byte Size242*/
120U,16U,
0X00U,0X00U,0Xf8U,0X08U,0X08U,0X08U,0X08U,0X08U,0Xc8U,0X7fU,0X88U,0X08U,0X08U,0X08U,0X08U,0Xf8U,
0X00U,0X00U,0X88U,0X88U,0Xa8U,0X89U,0X8eU,0Xc8U,0Xa8U,0X88U,0X00U,0XfeU,0X02U,0Xc2U,0X3aU,0X06U,
0X00U,0X08U,0Xc8U,0Xb8U,0X8eU,0Xe8U,0X88U,0X88U,0Xa8U,0X20U,0X1eU,0X09U,0Xe8U,0X08U,0X08U,0X68U,
0X18U,0X00U,0Xc0U,0X20U,0Xf0U,0X0eU,0X81U,0X60U,0X1eU,0X10U,0X10U,0XfeU,0X10U,0X10U,0X10U,0X10U,
0X00U,0X00U,0X00U,0XfeU,0X20U,0X3fU,0X20U,0X20U,0X00U,0XfeU,0X22U,0Xe2U,0X22U,0X22U,0X21U,0Xe1U,
0X01U,0X10U,0X10U,0X10U,0X10U,0X90U,0X50U,0X30U,0XffU,0X30U,0X50U,0X90U,0X10U,0X10U,0X10U,0X10U,
0X00U,0X00U,0X40U,0X40U,0X5eU,0X52U,0Xd2U,0X52U,0X52U,0X52U,0X52U,0X52U,0X52U,0X5eU,0X40U,0X40U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X40U,0X00U,0X00U,0X00U,0X00U,0X7fU,0X00U,0X04U,0X04U,0X02U,0X01U,
0X00U,0X00U,0X00U,0X01U,0X42U,0X44U,0X40U,0X3fU,0X00U,0X00U,0X00U,0X7eU,0X22U,0X22U,0X22U,0X22U,
0X22U,0X7eU,0X00U,0X7fU,0X00U,0X10U,0X11U,0X0eU,0X00U,0X08U,0X08U,0X08U,0X08U,0X7fU,0X04U,0X04U,
0X44U,0X20U,0X10U,0X0eU,0X01U,0X06U,0X18U,0X20U,0X40U,0X00U,0X00U,0X00U,0XffU,0X00U,0X02U,0X02U,
0X02U,0X02U,0X02U,0XffU,0X02U,0X02U,0X02U,0X02U,0X02U,0X00U,0X70U,0X0fU,0X01U,0X01U,0X7fU,0X00U,
0X30U,0X0fU,0X40U,0X21U,0X16U,0X18U,0X26U,0X41U,0X40U,0X10U,0X08U,0X04U,0X02U,0X09U,0X08U,0X08U,
0X7fU,0X08U,0X08U,0X09U,0X02U,0X04U,0X08U,0X10U,0X00U,0X00U,0X00U,0X00U,0X00U,0X03U,0X02U,0X02U,
0X22U,0X42U,0X42U,0X42U,0X3aU,0X06U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X20U,0X00U,0X00U,
};
//检测台版本号:
//检测台版本号:
const unsigned char gImage_JCT_01X0_Y0[]={/*Byte Size182*/
const unsigned char gImage_JCT_01X0_Y0[]={/*Byte Size182*/
90U,16U,
90U,16U,
...
@@ -4214,7 +4250,7 @@ const uint16_t banebenhao3[] = {105,95};
...
@@ -4214,7 +4250,7 @@ const uint16_t banebenhao3[] = {105,95};
extern uint8_t SWtestresult;
extern uint8_t SWtestresult;
extern uint8_t HWtestresult;
extern uint8_t HWtestresult;
extern uint8_t PNtestresult;
extern uint8_t PNtestresult;
extern
uint8_t
ruanjianbanbenhao
[
8
];
extern uint8_t ruanjianbanbenhao[
6
];
extern uint8_t yingjianbanbenhao[8];
extern uint8_t yingjianbanbenhao[8];
extern uint8_t lingjianhao[21];
extern uint8_t lingjianhao[21];
uint8_t UUIDX = 197;
uint8_t UUIDX = 197;
...
@@ -4248,7 +4284,8 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -4248,7 +4284,8 @@ void Display_Version_Info(uint32_t ON_OFF)
loc_Type_back = loc_Type;
loc_Type_back = loc_Type;
}
}
TFT_LCD_Draw_Bmp
(
3
,
50
,
(
uint8_t
*
)
gImage_Dyy_words_1X6_Y16
);
//软件版本号
TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_pic_01X0_Y01 ); //软件外部版本号
TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_pic_02X0_Y02 ); //软件内部版本号
const uint16_t Currenttest[] = {180,170};
const uint16_t Currenttest[] = {180,170};
...
@@ -4258,12 +4295,12 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -4258,12 +4295,12 @@ void Display_Version_Info(uint32_t ON_OFF)
// General_Number_Disp(yingjianbanbenhao, 105, 50);
// General_Number_Disp(yingjianbanbenhao, 105, 50);
// General_Number_Disp(lingjianhao, 15, 100);
// General_Number_Disp(lingjianhao, 15, 100);
}
}
TFT_LCD_Draw_Bmp
(
3
,
75
,
(
uint8_t
*
)
gImage_Dyy_words_2X6_Y46
);
//硬件版本号
TFT_LCD_Draw_Bmp(3,
100
, ( uint8_t * )gImage_Dyy_words_2X6_Y46 ); //硬件版本号
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_JCT_01X0_Y0 ); //检测台版本号
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_JCT_01X0_Y0 ); //检测台版本号
// TFT_LCD_Draw_Bmp(3, 120, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //写入UID
// TFT_LCD_Draw_Bmp(3, 120, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //写入UID
// TFT_LCD_Draw_Bmp(3, 225, ( uint8_t * )gImage_JCT_08X0_Y0 ); //读取UID
// TFT_LCD_Draw_Bmp(3, 225, ( uint8_t * )gImage_JCT_08X0_Y0 ); //读取UID
TFT_LCD_Draw_Bmp
(
3
,
1
00
,
(
uint8_t
*
)
gImage_JCT_06X0_Y0
);
//零件号
TFT_LCD_Draw_Bmp(3, 1
25
, ( uint8_t * )gImage_JCT_06X0_Y0 ); //零件号
TFT_LCD_Draw_Bmp
(
3
,
1
50
,
(
uint8_t
*
)
gImage_JCT_02X0_Y0
);
//仪表名称
TFT_LCD_Draw_Bmp(3, 1
75
, ( uint8_t * )gImage_JCT_02X0_Y0 ); //仪表名称
// TFT_LCD_Draw_Bmp(3, 90+30+30, ( uint8_t * )gImage_gImage_dianyuanwaifX6_Y165 ); //仪表电电源检测外发对比检验
// TFT_LCD_Draw_Bmp(3, 90+30+30, ( uint8_t * )gImage_gImage_dianyuanwaifX6_Y165 ); //仪表电电源检测外发对比检验
// TFT_LCD_Draw_Bmp(3, 90+25+25+35+30, ( uint8_t * )gImage_gImage_yibiaowaif1X6_Y16 ); //仪表外发对比检验
// TFT_LCD_Draw_Bmp(3, 90+25+25+35+30, ( uint8_t * )gImage_gImage_yibiaowaif1X6_Y16 ); //仪表外发对比检验
...
@@ -4286,7 +4323,7 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -4286,7 +4323,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
[
10
]
=
{
2
,
0
,
2
,
5
,
97
,
0
,
5
,
2
,
8
,
0xff
};
uint8_t mbuff [10] = {2,0,2,5,97,0,
7,1,4
,0xff};
General_Number_Disp(mbuff, 115, 25); //检测台版本号
General_Number_Disp(mbuff, 115, 25); //检测台版本号
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
...
@@ -4294,7 +4331,7 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -4294,7 +4331,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// General_Number_Disp(UUIDS, UUIDX, 160); //UID下——
// General_Number_Disp(UUIDS, UUIDX, 160); //UID下——
// General_Number_Disp(UIDcode1, 95, 225);
// General_Number_Disp(UIDcode1, 95, 225);
uint8_t mbuffff [4] = {82,84,2,0xff};
uint8_t mbuffff [4] = {82,84,2,0xff};
General_Number_Disp
(
mbuffff
,
115
,
1
50
);
//RT2
General_Number_Disp(mbuffff, 115, 1
75
); //RT2
}
}
...
...
YueJin_test_bench/source/Appliciation/Task.c
View file @
5da94303
...
@@ -33,6 +33,10 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
...
@@ -33,6 +33,10 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
TFT_LCD_Display_Update_Service
(
);
TFT_LCD_Display_Update_Service
(
);
Get_PN_msg
();
Get_PN_msg
();
// Get_UID_msg();
// Get_UID_msg();
if
(
SWINtestresult
==
1
)
{
Get_SWIN_msg
();
}
}
}
/*============================================================================*/
/*============================================================================*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment