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
6550d451
Commit
6550d451
authored
Feb 28, 2025
by
李梓源
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:上电所有灯全亮,每步完成之后才能切换下一步
parent
69310be1
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
20 deletions
+52
-20
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+15
-5
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+32
-4
Display_Info.h
YueJin_test_bench/source/Appliciation/Display_Info.h
+2
-0
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+2
-2
Task.c
YueJin_test_bench/source/Appliciation/Task.c
+1
-8
Task.h
YueJin_test_bench/source/Appliciation/Task.h
+0
-1
No files found.
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @
6550d451
...
@@ -595,17 +595,27 @@ void Function_Check_Ctrl(uint32_t cmd)
...
@@ -595,17 +595,27 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_VBAT_MCU
=
1
;
RELAY_VBAT_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_KEY_MCU
=
1
;
RELAY_KEY_MCU
=
1
;
// Aima_SLF(1u, 0x04
, 0x1, 1u);
Aima_SLF
(
1u
,
0x03
,
0x1
,
1u
);
break
;
break
;
}
}
case
1
:
case
1
:
{
if
(
CHECK_Ctrl_delay
<=
10
)
{
RELAY_VBAT_MCU
=
0
;
RELAY_DC12V_MCU
=
0
;
RELAY_KEY_MCU
=
0
;
}
else
{
{
RELAY_VBAT_MCU
=
1
;
RELAY_VBAT_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_KEY_MCU
=
0
;
RELAY_KEY_MCU
=
0
;
}
// ABC_OUT = 1;
// ABC_OUT = 1;
left_turn
=
0
;
left_turn
=
0
;
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
6550d451
...
@@ -4409,7 +4409,8 @@ void Display_Send_ODO(uint8_t fuel)
...
@@ -4409,7 +4409,8 @@ void Display_Send_ODO(uint8_t fuel)
}
}
uint8_t
CHECK_Value
=
1
;
uint8_t
DIS_VALUE
=
0
;
void
Display_Send_Vspead
(
uint8_t
menu
)
void
Display_Send_Vspead
(
uint8_t
menu
)
{
{
uint8_t
fuel_val
=
0
;
uint8_t
fuel_val
=
0
;
...
@@ -4431,22 +4432,38 @@ void Display_Send_Vspead(uint8_t menu)
...
@@ -4431,22 +4432,38 @@ void Display_Send_Vspead(uint8_t menu)
if
(
DIS_AD
==
0
)
if
(
DIS_AD
==
0
)
{
{
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_09_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_09_Word0X51_Y261
);
DIS_VALUE
=
1
;
}
}
else
else
{
{
if
(
DIS_VALUE
==
1
)
{
CHECK_Value
=
1
;
DIS_VALUE
=
0
;
}
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
}
break
;
break
;
case
2
:
case
2
:
if
(
CHECK_Ctrl_delay
>=
100
)
{
CHECK_Value
=
1
;
}
else
{
CHECK_Value
=
0
;
}
break
;
break
;
case
3
:
case
3
:
CHECK_Value
=
1
;
break
;
break
;
case
4
:
case
4
:
CHECK_Value
=
1
;
break
;
break
;
case
5
:
case
5
:
if
(
ZXSW_AD
==
1
)
if
(
ZXSW_AD
==
1
)
{
{
CHECK_Value
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_11_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_11_Word0X51_Y261
);
}
}
else
else
...
@@ -4457,6 +4474,7 @@ void Display_Send_Vspead(uint8_t menu)
...
@@ -4457,6 +4474,7 @@ void Display_Send_Vspead(uint8_t menu)
case
6
:
case
6
:
if
(
ZXSW_AD
==
1
)
if
(
ZXSW_AD
==
1
)
{
{
CHECK_Value
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_11_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_11_Word0X51_Y261
);
}
}
else
else
...
@@ -4467,6 +4485,7 @@ void Display_Send_Vspead(uint8_t menu)
...
@@ -4467,6 +4485,7 @@ void Display_Send_Vspead(uint8_t menu)
case
7
:
case
7
:
if
(
Light_control_headlights
==
1
)
if
(
Light_control_headlights
==
1
)
{
{
CHECK_Value
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_06_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_06_Word0X51_Y261
);
}
}
else
else
...
@@ -4478,16 +4497,23 @@ void Display_Send_Vspead(uint8_t menu)
...
@@ -4478,16 +4497,23 @@ void Display_Send_Vspead(uint8_t menu)
case
8
:
case
8
:
if
(
DIS_AD
==
0
)
if
(
DIS_AD
==
0
)
{
{
DIS_VALUE
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_10_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_10_Word0X51_Y261
);
}
}
else
else
{
{
if
(
DIS_VALUE
==
1
)
{
CHECK_Value
=
1
;
DIS_VALUE
=
0
;
}
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
}
break
;
break
;
case
9
:
case
9
:
if
(
ZYS_A
==
1
)
if
(
ZYS_A
==
1
)
{
{
CHECK_Value
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_08_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_08_Word0X51_Y261
);
}
}
else
else
...
@@ -4496,6 +4522,7 @@ void Display_Send_Vspead(uint8_t menu)
...
@@ -4496,6 +4522,7 @@ void Display_Send_Vspead(uint8_t menu)
}
}
if
(
ZYS_B
==
1
)
if
(
ZYS_B
==
1
)
{
{
CHECK_Value
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
200
,(
uint8_t
*
)
gImage_gImage_ABSX6_Y165
);
TFT_LCD_Draw_Bmp
(
51
,
200
,(
uint8_t
*
)
gImage_gImage_ABSX6_Y165
);
}
}
else
else
...
@@ -4514,6 +4541,7 @@ void Display_Send_Vspead(uint8_t menu)
...
@@ -4514,6 +4541,7 @@ void Display_Send_Vspead(uint8_t menu)
}
}
if
(
LOGOTY_AD
==
1
)
if
(
LOGOTY_AD
==
1
)
{
{
CHECK_Value
=
1
;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_13_Word0X51_Y261
);
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_13_Word0X51_Y261
);
}
}
else
else
...
...
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @
6550d451
...
@@ -97,4 +97,6 @@ extern uint32_t loc_Current_0;
...
@@ -97,4 +97,6 @@ extern uint32_t loc_Current_0;
extern
void
Get_static_Current
(
void
);
extern
void
Get_static_Current
(
void
);
extern
const
uint8_t
*
Num_15
[];
extern
const
uint8_t
*
Num_15
[];
#define PCodeText_Space_size 2//故障文字 英文空格的像素数
#define PCodeText_Space_size 2//故障文字 英文空格的像素数
extern
uint8_t
CHECK_Value
;
#endif
#endif
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
6550d451
...
@@ -9,11 +9,11 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
...
@@ -9,11 +9,11 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{
{
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
{
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
&&
CHECK_
Ctrl_delay
>=
200
)
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
&&
CHECK_
Value
==
1
)
{
{
MENU_CHECK_STEP_ADD
(
);
MENU_CHECK_STEP_ADD
(
);
CHECK_Ctrl_delay
=
0
;
CHECK_Ctrl_delay
=
0
;
C
heck_Flag
=
1
;
C
HECK_Value
=
0
;
}
}
}
}
}
}
...
...
YueJin_test_bench/source/Appliciation/Task.c
View file @
6550d451
...
@@ -325,7 +325,6 @@ uint8_t showtime = 0;
...
@@ -325,7 +325,6 @@ uint8_t showtime = 0;
uint8_t
ACCONOFF_delay_3s
;
uint8_t
ACCONOFF_delay_3s
;
uint16_t
ONE_KEY_ONOFF
;
uint16_t
ONE_KEY_ONOFF
;
uint16_t
CHECK_Ctrl_delay
=
200
;
uint16_t
CHECK_Ctrl_delay
=
200
;
uint8_t
Check_Flag
;
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;
...
@@ -338,17 +337,11 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
...
@@ -338,17 +337,11 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// }
// }
Display_PageNum
();
Display_PageNum
();
if
(
Check_Flag
==
1
)
{
if
(
CHECK_Ctrl_delay
<
200
)
if
(
CHECK_Ctrl_delay
<
200
)
{
{
CHECK_Ctrl_delay
++
;
CHECK_Ctrl_delay
++
;
}
}
else
{
Check_Flag
=
0
;
}
}
if
(
MENU_CHECK_STEP
==
9
)
if
(
MENU_CHECK_STEP
==
9
)
...
...
YueJin_test_bench/source/Appliciation/Task.h
View file @
6550d451
...
@@ -12,7 +12,6 @@ extern uint32_t startIGONtime;
...
@@ -12,7 +12,6 @@ extern uint32_t startIGONtime;
extern
uint8_t
ACCONOFF_delay_3s
;
extern
uint8_t
ACCONOFF_delay_3s
;
extern
uint16_t
ONE_KEY_ONOFF
;
extern
uint16_t
ONE_KEY_ONOFF
;
extern
uint16_t
CHECK_Ctrl_delay
;
extern
uint16_t
CHECK_Ctrl_delay
;
extern
uint8_t
Check_Flag
;
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
);
...
...
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