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
e9f5f19a
Commit
e9f5f19a
authored
Dec 21, 2024
by
李冠华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:增加多次无请求未收到响应时,清理一下UARTRxBuf.Rx_Buffer功能
parent
e6477b48
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
1 deletion
+24
-1
NVS_Test.c
YueJin_test_bench/source/Appliciation/NVS_Test.c
+12
-0
NVS_Test.h
YueJin_test_bench/source/Appliciation/NVS_Test.h
+1
-0
RS485_Protocol_User.c
YueJin_test_bench/source/Appliciation/RS485_Protocol_User.c
+9
-1
RS485_Protocol_User.h
YueJin_test_bench/source/Appliciation/RS485_Protocol_User.h
+2
-0
No files found.
YueJin_test_bench/source/Appliciation/NVS_Test.c
View file @
e9f5f19a
...
@@ -16,6 +16,7 @@ uint8_t StopFlag = 0U;
...
@@ -16,6 +16,7 @@ uint8_t StopFlag = 0U;
uint32_t
RS485TXBenCiXieRuNum
=
0u
;
uint32_t
RS485TXBenCiXieRuNum
=
0u
;
uint32_t
RS485TXTotalExecutionNum
=
0u
;
uint32_t
RS485TXTotalExecutionNum
=
0u
;
uint8_t
RerequestCount
=
0U
;
uint8_t
RerequestCount
=
0U
;
uint8_t
UARTRxBufClean
=
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
);
...
@@ -37,6 +38,7 @@ void NVS_Test_Init(void)
...
@@ -37,6 +38,7 @@ void NVS_Test_Init(void)
RS485TXBenCiXieRuNum
=
0u
;
RS485TXBenCiXieRuNum
=
0u
;
RS485TXTotalExecutionNum
=
0u
;
RS485TXTotalExecutionNum
=
0u
;
RerequestCount
=
0U
;
RerequestCount
=
0U
;
UARTRxBufClean
=
0U
;
}
}
void
NVS_Test_Service
(
void
)
void
NVS_Test_Service
(
void
)
...
@@ -66,6 +68,7 @@ void NVS_Test_Service(void)
...
@@ -66,6 +68,7 @@ void NVS_Test_Service(void)
{
{
huifudelayCount
=
0u
;
huifudelayCount
=
0u
;
UARTRxBufClean
=
0U
;
if
(
TotalExecutionNum
!=
0U
)
if
(
TotalExecutionNum
!=
0U
)
{
{
if
(
JieShouDaoValue
!=
LastNum
)
if
(
JieShouDaoValue
!=
LastNum
)
...
@@ -112,6 +115,15 @@ void NVS_Test_Service(void)
...
@@ -112,6 +115,15 @@ void NVS_Test_Service(void)
{
{
if
(
huifudelayCount
>
400u
)
if
(
huifudelayCount
>
400u
)
{
{
if
(
UARTRxBufClean
<
3u
)
{
UARTRxBufClean
++
;
}
else
{
RS485_UARTRxBuf_Clean
();
UARTRxBufClean
=
0U
;
}
/*超过了8s没有回复,请求重发*/
/*超过了8s没有回复,请求重发*/
NVS_Test_Rerequest
();
NVS_Test_Rerequest
();
huifudelayCount
=
0
;
huifudelayCount
=
0
;
...
...
YueJin_test_bench/source/Appliciation/NVS_Test.h
View file @
e9f5f19a
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
#include "Check_Ctrl.h"
#include "Check_Ctrl.h"
#include "Barcode_Scanner.h"
#include "Barcode_Scanner.h"
#include "Task.h"
#include "Task.h"
#include "RS485_Protocol_User.h"
#define DUAN_DIAN_STATE 1
/*0--只控制13.5V电,1--控制所有电*/
#define DUAN_DIAN_STATE 1
/*0--只控制13.5V电,1--控制所有电*/
...
...
YueJin_test_bench/source/Appliciation/RS485_Protocol_User.c
View file @
e9f5f19a
...
@@ -218,7 +218,15 @@ void RS485_UART_Put(Protocol_uint16_t Data)
...
@@ -218,7 +218,15 @@ void RS485_UART_Put(Protocol_uint16_t Data)
//return;
//return;
}
}
void
RS485_UARTRxBuf_Clean
(
void
)
{
for
(
uint16_t
i
=
0u
;
i
<
UART_RX_MAX_DEPTH
;
i
++
)
{
UARTRxBuf
.
Rx_Buffer
[
i
]
=
0U
;
}
UARTRxBuf
.
read_pos
=
0U
;
UARTRxBuf
.
write_pos
=
0U
;
}
...
...
YueJin_test_bench/source/Appliciation/RS485_Protocol_User.h
View file @
e9f5f19a
...
@@ -6,4 +6,6 @@
...
@@ -6,4 +6,6 @@
void
RS485_Protocol_KL30_Wakeup_Init
(
void
);
void
RS485_Protocol_KL30_Wakeup_Init
(
void
);
void
RS485_RS485_Protocol_Send_Service
(
void
);
// 10ms任务调用
void
RS485_RS485_Protocol_Send_Service
(
void
);
// 10ms任务调用
void
RS485_UART_Put
(
Protocol_uint16_t
Data
);
void
RS485_UART_Put
(
Protocol_uint16_t
Data
);
extern
void
RS485_UARTRxBuf_Clean
(
void
);
#endif
#endif
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