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
6c0b8c71
Commit
6c0b8c71
authored
Dec 27, 2024
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:增加在上电期间请求重发,也对比两次的功能
parent
6951756a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
NVS_Test.c
YueJin_test_bench/source/Appliciation/NVS_Test.c
+5
-2
No files found.
YueJin_test_bench/source/Appliciation/NVS_Test.c
View file @
6c0b8c71
...
@@ -18,6 +18,7 @@ uint32_t RS485TXTotalExecutionNum = 0u;
...
@@ -18,6 +18,7 @@ uint32_t RS485TXTotalExecutionNum = 0u;
uint8_t
RerequestCount
=
0U
;
uint8_t
RerequestCount
=
0U
;
uint8_t
UARTRxBufClean
=
0u
;
uint8_t
UARTRxBufClean
=
0u
;
uint32_t
BenCiXieRuStoreArr
[
2
]
=
{
0U
,
0U
};
/*此值用于存储刚给表写入的值。当表回复后此值在变化*/
uint32_t
BenCiXieRuStoreArr
[
2
]
=
{
0U
,
0U
};
/*此值用于存储刚给表写入的值。当表回复后此值在变化*/
uint8_t
DuiBiLiangCi
=
0U
;
static
void
NVS_Test_BenCiXieRuNum
(
void
);
static
void
NVS_Test_BenCiXieRuNum
(
void
);
static
void
NVS_Test_Rerequest
(
void
);
static
void
NVS_Test_Rerequest
(
void
);
...
@@ -42,6 +43,7 @@ void NVS_Test_Init(void)
...
@@ -42,6 +43,7 @@ void NVS_Test_Init(void)
UARTRxBufClean
=
0U
;
UARTRxBufClean
=
0U
;
BenCiXieRuStoreArr
[
0
]
=
0U
;
BenCiXieRuStoreArr
[
0
]
=
0U
;
BenCiXieRuStoreArr
[
1
]
=
0U
;
BenCiXieRuStoreArr
[
1
]
=
0U
;
DuiBiLiangCi
=
0U
;
}
}
void
NVS_Test_Service
(
void
)
void
NVS_Test_Service
(
void
)
...
@@ -76,7 +78,7 @@ void NVS_Test_Service(void)
...
@@ -76,7 +78,7 @@ void NVS_Test_Service(void)
{
{
if
(
JieShouDaoValue
!=
XieRuLagNum
)
if
(
JieShouDaoValue
!=
XieRuLagNum
)
{
{
if
((
JieShouDaoValue
==
XieRuLookaheadNum
)
&&
(
BenCiShangDianZhiXingCount
<=
1U
))
if
((
JieShouDaoValue
==
XieRuLookaheadNum
)
&&
(
(
BenCiShangDianZhiXingCount
<=
1U
)
||
(
DuiBiLiangCi
==
1U
)
))
{
{
;
;
}
}
...
@@ -84,7 +86,7 @@ void NVS_Test_Service(void)
...
@@ -84,7 +86,7 @@ void NVS_Test_Service(void)
{
{
errNum
++
;
errNum
++
;
}
}
DuiBiLiangCi
=
0U
;
}
}
}
}
if
(
errNum
==
0U
)
if
(
errNum
==
0U
)
...
@@ -165,4 +167,5 @@ static void NVS_Test_Rerequest(void)
...
@@ -165,4 +167,5 @@ static void NVS_Test_Rerequest(void)
RS485TXBenCiXieRuNum
=
0xFFFFEEEEU
;
RS485TXBenCiXieRuNum
=
0xFFFFEEEEU
;
RS485TXTotalExecutionNum
=
0xFFFFEEEEU
;
RS485TXTotalExecutionNum
=
0xFFFFEEEEU
;
RS485_TX_finish
=
0U
;
RS485_TX_finish
=
0U
;
DuiBiLiangCi
=
1u
;
}
}
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