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
f2e78d45
Commit
f2e78d45
authored
Dec 19, 2024
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改上下电时间
parent
3fc554e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
18 deletions
+28
-18
Power_Controls.c
YueJin_test_bench/source/Appliciation/Power_Controls.c
+25
-16
Power_Controls.h
YueJin_test_bench/source/Appliciation/Power_Controls.h
+3
-2
No files found.
YueJin_test_bench/source/Appliciation/Power_Controls.c
View file @
f2e78d45
...
...
@@ -4,6 +4,7 @@
uint16_t
PowerCountNum
=
0U
;
uint8_t
KL1530ON
=
0U
;
uint8_t
ControlsStatus
=
DUAN_DIAN_STATE
;
uint16_t
ShangDianOffset
=
0u
;
void
Power_Controls_Init
(
void
)
...
...
@@ -13,22 +14,30 @@ void Power_Controls_Init(void)
void
Power_Control_Count
(
void
)
{
// if (PowerCountNum <= 250U)
// {
// KL1530ON = 1U;
// PowerCountNum ++;
// }
// else if ((PowerCountNum > 250U) && (PowerCountNum < 300U))
// {
// KL1530ON = 0U;
// PowerCountNum ++;
// }
// else
// {
// KL1530ON = 0U;
// PowerCountNum = 0U;
// }
KL1530ON
=
1U
;
if
(
PowerCountNum
<=
(
SHANG_DIAN_TIMES
+
ShangDianOffset
))
{
KL1530ON
=
1U
;
PowerCountNum
++
;
}
else
if
((
PowerCountNum
>
(
SHANG_DIAN_TIMES
+
ShangDianOffset
))
&&
(
PowerCountNum
<
(
SHANG_DIAN_TIMES
+
ShangDianOffset
+
DUAN_DIAN_TIMES
)))
{
KL1530ON
=
0U
;
PowerCountNum
++
;
}
else
{
KL1530ON
=
0U
;
PowerCountNum
=
0U
;
if
(
ShangDianOffset
<
900U
)
{
/*上电总时长小于90s+25s*/
ShangDianOffset
=
((
ShangDianOffset
+
5
)
*
100
/
7
);
}
else
{
ShangDianOffset
/=
100
;
}
}
}
...
...
YueJin_test_bench/source/Appliciation/Power_Controls.h
View file @
f2e78d45
...
...
@@ -8,8 +8,9 @@
#include "Barcode_Scanner.h"
#include "Task.h"
#define DUAN_DIAN_STATE 1
/*0--只控制13.5V电,1--控制所有电*/
#define DUAN_DIAN_STATE 1
/*0--只控制13.5V电,1--控制所有电*/
#define SHANG_DIAN_TIMES 250U
/*上电时间*/
#define DUAN_DIAN_TIMES 30U
/*断电时长,3s*/
extern
uint8_t
KL1530ON
;
...
...
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