Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
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
潘栩锋
hemei
Commits
8e5b98a8
Commit
8e5b98a8
authored
Aug 21, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
thick_public 的 warningsystem 合并错了,修正
parent
05127552
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
18 deletions
+9
-18
BlowingDetect.cs
...Y.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
+8
-17
thick_public
thick_public
+1
-1
No files found.
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @
8e5b98a8
...
...
@@ -46,9 +46,7 @@ namespace FLY.Thick.Blowing.Server
/// </summary>
const
int
Roll_bit
=
11
;
#
endregion
#
region
参数
/// <summary>
...
...
@@ -145,7 +143,7 @@ namespace FLY.Thick.Blowing.Server
/// <summary>
/// 累计旋转次数
/// </summary>
public
virtual
int
RotationCnt
{
get
;
protected
set
;
}
public
int
RotationCnt
{
get
;
private
set
;
}
/// <summary>
/// 最新的限位信号序号
...
...
@@ -1022,22 +1020,15 @@ namespace FLY.Thick.Blowing.Server
}
void
update_roll
(
FlyADBase
.
IStatusChangedEventArgs
e
)
{
bool
bchanged
=
false
;
//信号更新?
DateTime
dt
=
e
.
Time
;
//信号更新发生的时间
bool
status
=
false
;
//信号的状态
//----------------------------------------------------------------------
//更新辊信号
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Roll_bit
-
1
))
{
bchanged
=
true
;
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Roll_bit
-
1
))
{
status
=
true
;
}
}
if
(!
bchanged
)
//没有信号更新
return
;
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Roll_bit
-
1
))
return
;
//没有信号更新
//信号的状态
bool
status
=
!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Roll_bit
-
1
);
DateTime
dt
=
e
.
Time
;
//信号更新发生的时间
DateTime
dtmid
;
if
(
mbcRoll
.
Update
(
dt
,
status
,
out
dtmid
))
...
...
thick_public
@
3afe9982
Subproject commit
9606ae0ef91daefb2bb0e3358cba5bfa67ecd629
Subproject commit
3afe9982506cd9532f479849c25a711ef82eea0f
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