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
574989e7
Commit
574989e7
authored
Mar 18, 2025
by
李梓源
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:优化切换下一步的条件限制
parent
55cfa810
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
14 deletions
+62
-14
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+21
-4
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+35
-9
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+5
-0
Task.c
YueJin_test_bench/source/Appliciation/Task.c
+1
-1
No files found.
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @
574989e7
...
...
@@ -591,11 +591,28 @@ void Function_Check_Ctrl(uint32_t cmd)
switch
(
MENU_CHECK_STEP
)
{
case
0
:
{
if
(
CHECK_Ctrl_delay
<=
10
)
{
RELAY_VBAT_MCU
=
0
;
RELAY_DC12V_MCU
=
0
;
RELAY_KEY_MCU
=
0
;
}
else
if
(
CHECK_Ctrl_delay
>
10
&&
CHECK_Ctrl_delay
<=
60
)
{
RELAY_VBAT_MCU
=
1
;
RELAY_DC12V_MCU
=
1
;
RELAY_KEY_MCU
=
1
;
}
else
if
(
CHECK_Ctrl_delay
>
60
&&
CHECK_Ctrl_delay
<=
65
)
{
Aima_SLF
(
1u
,
0x03
,
0x1
,
1u
);
}
else
{
}
break
;
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
574989e7
...
...
@@ -4409,7 +4409,7 @@ void Display_Send_ODO(uint8_t fuel)
}
uint8_t
CHECK_Value
=
1
;
uint8_t
CHECK_Value
=
0
;
uint8_t
DIS_VALUE
=
0
;
const
uint16_t
Volatile
[]
=
{
90
,
80
};
void
Display_Send_Vspead
(
uint8_t
menu
)
...
...
@@ -4433,8 +4433,11 @@ void Display_Send_Vspead(uint8_t menu)
switch
(
menu
)
{
case
0
:
{
if
(
CHECK_Ctrl_delay
>=
75
)
{
CHECK_Value
=
1
;
}
break
;
}
case
1
:
...
...
@@ -4448,8 +4451,16 @@ void Display_Send_Vspead(uint8_t menu)
{
if
(
DIS_VALUE
==
1
)
{
CHECK_Value
=
1
;
if
(
DIS_AD
==
1
)
{
DIS_VALUE
=
0
;
CHECK_Value
=
1
;
}
else
{
CHECK_Value
=
0
;
}
}
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
...
...
@@ -4473,27 +4484,42 @@ void Display_Send_Vspead(uint8_t menu)
{
if
(
DIS_VALUE
==
1
)
{
CHECK_Value
=
1
;
if
(
DIS_AD
==
1
)
{
DIS_VALUE
=
0
;
CHECK_Value
=
1
;
}
else
{
CHECK_Value
=
0
;
}
}
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
break
;
case
3
:
if
(
LOGOTY_AD
==
1
)
if
(
CHECK_Ctrl_delay
>=
30
)
{
CHECK_Value
=
1
;
}
if
(
LOGOTY_AD
==
1
)
{
// CHECK_Value = 1;
TFT_LCD_Draw_Bmp
(
51
,
261
,(
uint8_t
*
)
gImage_Alarm_13_Word0X51_Y261
);
}
else
{
CHECK_Value
=
1
;
//
CHECK_Value = 1;
TFT_LCD_Draw_Box
(
0
,
261
,
239
,
319
,
TFT_LCD_FILL_FULL
,
TFT_LCD_TYPE_CLR
);
}
break
;
case
4
:
if
(
CHECK_Ctrl_delay
>=
30
)
{
CHECK_Value
=
1
;
}
break
;
case
5
:
ZXSW_Voltage
=
ADC_Read_Signal
(
ADC_CH_ZXSW_VOLTAGE
);
...
...
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
574989e7
...
...
@@ -20,8 +20,13 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
void
Key_Operation_SW4
(
Key_Event_en_t
enKeyEvent
)
{
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
if
(
MENU_CHECK_STEP
!=
0
)
{
MENU_CHECK_STEP_SUB
();
CHECK_Ctrl_delay
=
0
;
CHECK_Value
=
0
;
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
{
...
...
YueJin_test_bench/source/Appliciation/Task.c
View file @
574989e7
...
...
@@ -324,7 +324,7 @@ uint8_t flashtime = 0;
uint8_t
showtime
=
0
;
uint8_t
ACCONOFF_delay_3s
;
uint16_t
ONE_KEY_ONOFF
;
uint16_t
CHECK_Ctrl_delay
=
20
0
;
uint16_t
CHECK_Ctrl_delay
=
0
;
void
Sys_Run_Mode_100ms_Tasks_Group
(
void
)
{
// static uint32_t loc_timer = 0;
...
...
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