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
ee7df05e
Commit
ee7df05e
authored
Oct 26, 2024
by
张金硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:静态电流
parent
f31a98bf
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12064 additions
and
12076 deletions
+12064
-12076
api_timer.c
source/app/api_timer/api_timer.c
+1
-1
bsp_app_AUTO.c
source/bsp_source/bsp_button/bsp_app_AUTO.c
+10
-10
standalone_tcflash.srec
tools/iar_ewarm/standalone_tcflash/standalone_tcflash.srec
+12053
-12065
No files found.
source/app/api_timer/api_timer.c
View file @
ee7df05e
...
@@ -664,7 +664,7 @@ static void TIMER13_10MS_ISR(void)
...
@@ -664,7 +664,7 @@ static void TIMER13_10MS_ISR(void)
if
(
g_Stage
==
STAGE_AutoCheck
)
{
if
(
g_Stage
==
STAGE_AutoCheck
)
{
if
(
StaticCurrent
.
count
<
50
){
if
(
StaticCurrent
.
count
<
50
){
StaticCurrent
.
buf
[
StaticCurrent
.
count
]
=
Calculate_Thermistor
(
AdcValList
[
14
])
;
//18
StaticCurrent
.
buf
[
StaticCurrent
.
count
]
=
AdcValList
[
14
]
;
//18
StaticCurrent
.
count
++
;
StaticCurrent
.
count
++
;
if
(
StaticCurrent
.
count
==
50
)
{
if
(
StaticCurrent
.
count
==
50
)
{
StaticCurrent
.
count
=
0
;
StaticCurrent
.
count
=
0
;
...
...
source/bsp_source/bsp_button/bsp_app_AUTO.c
View file @
ee7df05e
...
@@ -1874,8 +1874,8 @@ void StaticCurrentCheck(void)//???????
...
@@ -1874,8 +1874,8 @@ void StaticCurrentCheck(void)//???????
//if(LampState_L.Lamps.RELAY_B_ == 1){
//if(LampState_L.Lamps.RELAY_B_ == 1){
//LampState_L.Lamps.RELAY_IGN1 = 0;
//LampState_L.Lamps.RELAY_IGN1 = 0;
//}
//}
MC1413_B_ON
;
//
MC1413_B_ON;
MC1413_IGNOFF
;
//
MC1413_IGNOFF;
g_CostTimeSecond
=
0
;
g_CostTimeSecond
=
0
;
StaticCurrent
.
enable
=
1
;
StaticCurrent
.
enable
=
1
;
}
}
...
@@ -1886,7 +1886,7 @@ void StaticCurrentCheck(void)//???????
...
@@ -1886,7 +1886,7 @@ void StaticCurrentCheck(void)//???????
}
}
else
if
(
BetweenTime
(
1000
,
2000
))
{
else
if
(
BetweenTime
(
1000
,
2000
))
{
//LampState_L.Lamps.RELAY_B = 0;
//LampState_L.Lamps.RELAY_B = 0;
MC1413_BOFF
;
//
MC1413_BOFF;
}
}
else
if
(
GreaterThan
(
3000
)){
//
else
if
(
GreaterThan
(
3000
)){
//
StaticCurrentNum
=
StaticCurrent
.
Value
;
StaticCurrentNum
=
StaticCurrent
.
Value
;
...
@@ -1895,9 +1895,9 @@ void StaticCurrentCheck(void)//???????
...
@@ -1895,9 +1895,9 @@ void StaticCurrentCheck(void)//???????
//LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_B_ = 0;
//LampState_L.Lamps.RELAY_B_ = 0;
MC1413_IGNON
;
//
MC1413_IGNON;
MC1413_BON
;
//
MC1413_BON;
MC1413_B_OFF
;
//
MC1413_B_OFF;
CANSendEnable
=
ON
;
CANSendEnable
=
ON
;
if
(
BetweenTime
(
STATIC_BEGIN_CHECK_TIME
,
STATIC_BEGIN_CHECK_TIME
+
CLUSTER_START_TIME
))
{
if
(
BetweenTime
(
STATIC_BEGIN_CHECK_TIME
,
STATIC_BEGIN_CHECK_TIME
+
CLUSTER_START_TIME
))
{
//uint8_t test1=1;
//uint8_t test1=1;
...
@@ -1919,9 +1919,9 @@ void StaticCurrentCheck(void)//???????
...
@@ -1919,9 +1919,9 @@ void StaticCurrentCheck(void)//???????
//LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_B_ = 0;
//LampState_L.Lamps.RELAY_B_ = 0;
MC1413_IGNON
;
//
MC1413_IGNON;
MC1413_BON
;
//
MC1413_BON;
MC1413_B_OFF
;
//
MC1413_B_OFF;
CANSendEnable
=
ON
;
CANSendEnable
=
ON
;
if
(
BetweenTime
(
STATIC_BEGIN_CHECK_TIME
,
STATIC_BEGIN_CHECK_TIME
+
CLUSTER_START_TIME
))
{
if
(
BetweenTime
(
STATIC_BEGIN_CHECK_TIME
,
STATIC_BEGIN_CHECK_TIME
+
CLUSTER_START_TIME
))
{
//uint8_t test2=1;
//uint8_t test2=1;
...
@@ -2413,7 +2413,7 @@ void APP_AUTO(void)
...
@@ -2413,7 +2413,7 @@ void APP_AUTO(void)
{
{
switch
(
ButtomCurrent
.
count
)
{
switch
(
ButtomCurrent
.
count
)
{
case
0
:
case
0
:
//
OtherCheck();
OtherCheck
();
if
(
g_AutoConfig
.
AUTO_STEP10_APPLY
==
0
){
if
(
g_AutoConfig
.
AUTO_STEP10_APPLY
==
0
){
ButtomCurrent
.
count
++
;
ButtomCurrent
.
count
++
;
}
else
{
}
else
{
...
...
tools/iar_ewarm/standalone_tcflash/standalone_tcflash.srec
View file @
ee7df05e
This diff is collapsed.
Click to expand it.
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