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
55820bef
Commit
55820bef
authored
Sep 07, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 AD盒模拟涂布 bug
parent
1754ee24
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
HMI.cs
Project.FLY.FlyADBase/FLY.Simulation.Coating/HMI.cs
+10
-2
WindowCoating.xaml
...ct.FLY.FlyADBase/FLYAD7_Simulation_Wpf/WindowCoating.xaml
+1
-1
No files found.
Project.FLY.FlyADBase/FLY.Simulation.Coating/HMI.cs
View file @
55820bef
...
@@ -161,6 +161,7 @@ namespace FLY.Simulation.Coating
...
@@ -161,6 +161,7 @@ namespace FLY.Simulation.Coating
}
}
}
}
}
}
private
bool
ok_last
=
false
;
public
HMI
(
Coating
coating
,
CoatingCtrl
cc
,
int
port
)
public
HMI
(
Coating
coating
,
CoatingCtrl
cc
,
int
port
)
{
{
mCoatingCtrl
=
cc
;
mCoatingCtrl
=
cc
;
...
@@ -170,6 +171,8 @@ namespace FLY.Simulation.Coating
...
@@ -170,6 +171,8 @@ namespace FLY.Simulation.Coating
mPLCRegister
.
RegChanged
+=
new
ModbusModule
.
PLCRegister
.
RegChangedEventHandler
(
plcregister_RegChanged
);
mPLCRegister
.
RegChanged
+=
new
ModbusModule
.
PLCRegister
.
RegChangedEventHandler
(
plcregister_RegChanged
);
ok_last
=
OK
;
Addrs_reg
.
Add
(
ADDR_D_PumpSet
,
"PumpSet"
);
Addrs_reg
.
Add
(
ADDR_D_PumpSet
,
"PumpSet"
);
Addrs_reg
.
Add
(
ADDR_D_LeftSet
,
"LeftSet"
);
Addrs_reg
.
Add
(
ADDR_D_LeftSet
,
"LeftSet"
);
Addrs_reg
.
Add
(
ADDR_D_Left
,
"Left"
);
Addrs_reg
.
Add
(
ADDR_D_Left
,
"Left"
);
...
@@ -199,12 +202,17 @@ namespace FLY.Simulation.Coating
...
@@ -199,12 +202,17 @@ namespace FLY.Simulation.Coating
if
(
e
.
PropertyName
==
"OK"
)
if
(
e
.
PropertyName
==
"OK"
)
{
{
if
(
ok_last
!=
OK
)
{
ok_last
=
OK
;
if
(
OK
==
true
)
if
(
OK
==
true
)
{
{
mCoatingCtrl
.
SetCoatingCtrl
(
PumpSet
,
LeftSet
,
RightSet
);
mCoatingCtrl
.
SetCoatingCtrl
(
PumpSet
,
LeftSet
,
RightSet
);
}
}
}
}
}
}
}
void
plcregister_RegChanged
(
object
sender
,
ModbusModule
.
PLCRegister
.
RegChangedEventArgs
e
)
void
plcregister_RegChanged
(
object
sender
,
ModbusModule
.
PLCRegister
.
RegChangedEventArgs
e
)
{
{
...
...
Project.FLY.FlyADBase/FLYAD7_Simulation_Wpf/WindowCoating.xaml
View file @
55820bef
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
</Grid>
</Grid>
<StackPanel>
<StackPanel>
<CheckBox Content="设置位" FontSize="18" FontWeight="Bold" Height="23" Margin="3" VerticalAlignment="Center" FlowDirection="RightToLeft" IsChecked="{Binding OK}"
IsEnabled="False
"/>
<CheckBox Content="设置位" FontSize="18" FontWeight="Bold" Height="23" Margin="3" VerticalAlignment="Center" FlowDirection="RightToLeft" IsChecked="{Binding OK}"
DataContext="{Binding DataContext,ElementName=hmi}
"/>
<CheckBox Content="涂布状态" FontSize="18" FontWeight="Bold" Height="23" Margin="3" VerticalAlignment="Center" FlowDirection="RightToLeft" IsChecked="{Binding DeviceState}" IsEnabled="False"/>
<CheckBox Content="涂布状态" FontSize="18" FontWeight="Bold" Height="23" Margin="3" VerticalAlignment="Center" FlowDirection="RightToLeft" IsChecked="{Binding DeviceState}" IsEnabled="False"/>
</StackPanel>
</StackPanel>
...
...
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