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
47dc7a55
Commit
47dc7a55
authored
Jun 07, 2025
by
huangguoqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:完善静态电流显示
parent
0ccb6d3d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+10
-8
Key.h
YueJin_test_bench/source/Appliciation/Key.h
+1
-1
No files found.
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
47dc7a55
...
@@ -37,7 +37,7 @@ uint8_t canData4[8];//暂存硬件版本号数据用
...
@@ -37,7 +37,7 @@ uint8_t canData4[8];//暂存硬件版本号数据用
static
uint32_t
VoltageADC_CH_9_value_
=
0
;
static
uint32_t
VoltageADC_CH_9_value_
=
0
;
static
uint32_t
VoltageADC_CH_9_value
=
0
;
static
uint32_t
VoltageADC_CH_9_value
=
0
;
uint16_t
count_electric_current
=
0
;
uint16_t
count_electric_current
=
0
;
uint32_t
text5
[
2
];
uint32_t
text5
[
5
];
...
@@ -4434,7 +4434,8 @@ void Display_Can_Data(uint8_t Data , uint16_t X,uint8_t Y)
...
@@ -4434,7 +4434,8 @@ void Display_Can_Data(uint8_t Data , uint16_t X,uint8_t Y)
}
}
const
uint16_t
CurrentDigitNum15PosX
[]
=
{
50
,
40
,
30
};
const
uint16_t
CurrentDigitNum15PosX_1
[]
=
{
75
};
const
uint16_t
CurrentDigitNum15PosX_2
[]
=
{
108
,
98
};
void
Display_Can_Receive_Data
(
uint16_t
X
,
uint8_t
Y
)
void
Display_Can_Receive_Data
(
uint16_t
X
,
uint8_t
Y
)
{
{
if
(
canData3
[
9
]
==
0XFF
&&
canData2
[
13
]
==
0XFF
&&
All_Flag
.
u8flag
[
8
]
==
1
)
if
(
canData3
[
9
]
==
0XFF
&&
canData2
[
13
]
==
0XFF
&&
All_Flag
.
u8flag
[
8
]
==
1
)
...
@@ -4443,8 +4444,10 @@ void Display_Can_Receive_Data(uint16_t X,uint8_t Y)
...
@@ -4443,8 +4444,10 @@ void Display_Can_Receive_Data(uint16_t X,uint8_t Y)
TFT_LCD_Draw_Bmp
(
X
,
Y
+
50
,
(
uint8_t
*
)
gImage_Dyy_words_2X6_Y46
);
//硬件版本号
TFT_LCD_Draw_Bmp
(
X
,
Y
+
50
,
(
uint8_t
*
)
gImage_Dyy_words_2X6_Y46
);
//硬件版本号
General_Number_Disp
(
canData2
,
X
+
70
,
Y
);
General_Number_Disp
(
canData2
,
X
+
70
,
Y
);
General_Number_Disp
(
canData3
,
X
+
70
,
Y
+
50
);
General_Number_Disp
(
canData3
,
X
+
70
,
Y
+
50
);
GUI_General_Digit_Display
(
text5
[
0
],
Num_15
,
3
,
0
,
CurrentDigitNum15PosX
,
200
);
TFT_LCD_Draw_Bmp
(
0
,
200
,
(
uint8_t
*
)
gImage_Dyy_words_5X6_Y137
);
//静态电流
GUI_General_Digit_Display
(
text5
[
0
],
Num_15
,
1
,
0
,
CurrentDigitNum15PosX_1
,
200
);
TFT_LCD_Draw_Bmp
(
85
,
195
,
(
uint8_t
*
)
FONT_TABLE
[
37
]
);
GUI_General_Digit_Display
(
text5
[
1
],
Num_15
,
2
,
0
,
CurrentDigitNum15PosX_2
,
200
);
}
}
}
}
...
@@ -4464,9 +4467,8 @@ void Obtain_The_Static_Current(void)
...
@@ -4464,9 +4467,8 @@ void Obtain_The_Static_Current(void)
if
(
count_electric_current
==
1999
)
if
(
count_electric_current
==
1999
)
{
{
VoltageADC_CH_9_value
=
VoltageADC_CH_9_value_
/
2000
;
VoltageADC_CH_9_value
=
VoltageADC_CH_9_value_
/
2000
;
text5
[
0
]
=
VoltageADC_CH_9_value
;
text5
[
0
]
=
VoltageADC_CH_9_value
/
100
;
text5
[
1
]
=
0Xff
;
text5
[
1
]
=
VoltageADC_CH_9_value
%
100
;
// text5[0]=VoltageADC_CH_9_value;
// text5[0]=VoltageADC_CH_9_value;
// text5[1]=0Xff;
// text5[1]=0Xff;
...
...
YueJin_test_bench/source/Appliciation/Key.h
View file @
47dc7a55
...
@@ -145,7 +145,7 @@ extern uint8_t canData2[14];
...
@@ -145,7 +145,7 @@ extern uint8_t canData2[14];
extern
uint8_t
canData3
[
10
];
extern
uint8_t
canData3
[
10
];
extern
uint8_t
canData4
[
8
];
extern
uint8_t
canData4
[
8
];
extern
uint32_t
text5
[
2
];
extern
uint32_t
text5
[
5
];
...
...
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