Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
Details
Activity
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
潘栩锋
Thick-Common
Commits
d25e5cbf
Commit
d25e5cbf
authored
Oct 26, 2023
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.添加 AD盒 记录重连时间点
2.修改 AD盒 10秒脉冲不动触发手动停止
parent
d4e889dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
GComm_TcpClient.cs
GeneralGommunication/GComm_TcpClient.cs
+4
-4
FlyAD7.cs
Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs
+4
-4
No files found.
GeneralGommunication/GComm_TcpClient.cs
View file @
d25e5cbf
...
...
@@ -180,8 +180,8 @@ namespace GeneralGommunication
if
(
sucess
)
{
sock
.
EndConnect
(
result
);
IsConnected
=
true
;
ErrMsg
=
null
;
IsConnected
=
true
;
return
;
}
else
...
...
@@ -241,8 +241,8 @@ namespace GeneralGommunication
}
//Console.WriteLine($"ReceiveTask() {e}");
//肯定断开连接了
IsConnected
=
false
;
ErrMsg
=
e
.
Message
;
IsConnected
=
false
;
return
;
}
logger
?.
Debug
(
$"tcp R len=
{
len
}
"
);
...
...
@@ -271,16 +271,16 @@ namespace GeneralGommunication
catch
(
Exception
e
)
{
//连接断开了
IsConnected
=
false
;
ErrMsg
=
e
.
Message
;
IsConnected
=
false
;
return
;
}
if
(
slen
<=
0
)
{
//连接断开了
IsConnected
=
false
;
ErrMsg
=
"发送数量小于0"
;
IsConnected
=
false
;
return
;
}
}
...
...
Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs
View file @
d25e5cbf
...
...
@@ -384,7 +384,7 @@ namespace FlyADBase
void
constructor
()
{
Now
=
DateTime
.
Now
;
sysTickContext
.
BeReseted
+=
()
=>
BeResetTime
=
DateTime
.
Now
;
//
sysTickContext.BeReseted += () => BeResetTime = DateTime.Now;
this
.
PropertyChanged
+=
new
PropertyChangedEventHandler
(
FlyAD7_PropertyChanged
);
...
...
@@ -478,9 +478,9 @@ namespace FlyADBase
return
;
}
position_no_changed_cnt
++;
if
(
position_no_changed_cnt
>=
3
)
if
(
position_no_changed_cnt
>=
10
)
{
//连续
3
秒,脉冲一样
//连续
10
秒,脉冲一样
//异常
DriveStatus
=
DRIVE_MAN_STATUS
.
STOP_MANUAL
;
position_no_changed_cnt
=
0
;
...
...
@@ -703,7 +703,7 @@ namespace FlyADBase
if
(
IsConnected
)
{
ConnectCnt
++;
BeResetTime
=
DateTime
.
Now
;
AfterConnected
();
}
else
...
...
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