Skip to content

H
hemei
Commit 82074f6b authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

Merge remote-tracking branch 'remotes/git/master'

parents 4da26086 f58ff22e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 63 deletions
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Client/FeedbackHeatServiceClient.cs
View file @ 82074f6b
......@@ -86,7 +86,7 @@ namespace FLY.FeedbackRenZiJia.Client
/// <summary>
/// 烧了的加热棒
/// </summary>
public bool[] Bads { get; set; }
public bool[] Bads { get; private set; }
/// <summary>
/// 当前风机启动中
......@@ -287,7 +287,9 @@ namespace FLY.FeedbackRenZiJia.Client
HasFan = p.hasFan;
HasElectricity = p.hasEletric;
CheckNo = p.checkno;
Bads = p.bads;
NotifyPropertyChanged("Bads");
}break;
......
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/FeedbackHeat.cs
View file @ 82074f6b
......@@ -84,17 +84,13 @@ namespace FLY.FeedbackRenZiJia.Server
#endregion
#region 异常检测
private bool[] bads;
/// <summary>
/// 烧了的加热棒
/// </summary>
public bool[] Bads
{
get { return bads; }
set {
bads = value;
NotifyPropertyChanged("Bads");
}
get { return mHeatCheck.Bads; }
}
/// <summary>
......@@ -239,12 +235,11 @@ namespace FLY.FeedbackRenZiJia.Server
Misc.BindingOperations.SetBinding(mHeatCheck, "Enable", this, "CheckEnable", Misc.BindingOperations.BindingMode.TwoWay);
Misc.BindingOperations.SetBinding(mHeatCheck, "CheckNo", this, "CheckNo");
//Misc.BindingOperations.SetBinding(mHeatCheck, "Bads", this, "Bads");
Bads = mHeatCheck.Bads;
mHeatCheck.PropertyChanged += (s, e) =>
{
if (e.PropertyName == "Bads")
{
Bads = mHeatCheck.Bads;
NotifyPropertyChanged("Bads");
}
};
......
Resource/IBC/设备连接变量表/Generated/WS.xml deleted 100644 → 0
View file @ 4da26086
<?xml version="1.0" encoding="utf-8"?>
<PLCGroup>
<Devices>
<PLCDevice EP="192.168.50.30:502" />
</Devices>
<Variables>
<PLCVariable DeviceIndex="0" Mode="0" Addr="64513" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsInletAirOn" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="6120" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="InletAirFreq" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="3200" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="InletAirFreqSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="64514" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsOutletAirOn" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="6220" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="OutletAirFreq" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="592" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="OutletAirFreqSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="99" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsOutletAirFreqChanged" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="668" Type="uint16" Scale="1" OwnerName="Item" PropertyName="FilmWidth" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="230" Type="uint16" Scale="1" OwnerName="Item" PropertyName="FilmWidthSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="800" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsFilmWidthChanged" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="340" Type="int16" Scale="1" OwnerName="Item" PropertyName="ErrorCorrection" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="659" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsIBCAuto" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1140" Type="uint16" Scale="1" OwnerName="Item" PropertyName="K1" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1142" Type="uint16" Scale="1" OwnerName="Item" PropertyName="K2" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1144" Type="uint16" Scale="1" OwnerName="Item" PropertyName="K3" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="250" Type="float" Scale="1" OwnerName="Item" PropertyName="L" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="18" Type="float" Scale="1" OwnerName="Item" PropertyName="BubbleCorrA" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="28" Type="float" Scale="1" OwnerName="Item" PropertyName="BubbleCorrB" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="38" Type="float" Scale="1" OwnerName="Item" PropertyName="BubbleCorrC" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="102" Type="float" Scale="1" OwnerName="Item" PropertyName="BubbleCorrR" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="300" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="SampleInterval" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="304" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area1Set" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1001" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area1P" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1002" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area1I" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1003" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area1D" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1004" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area1DI" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="2550" Type="uint16" Scale="0.01" OwnerName="Item" PropertyName="AdjustFactor" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="2050" Type="int16" Scale="1" OwnerName="Item" PropertyName="PIDResult" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="2052" Type="int16" Scale="1" OwnerName="Item" PropertyName="PIDAdjust" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="710" Type="uint16" Scale="1" OwnerName="Item" PropertyName="InletAirVelocity" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="712" Type="uint16" Scale="1" OwnerName="Item" PropertyName="OutletAirVelocity" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="306" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2Set" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1201" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2P" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1202" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2I" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1203" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2D" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="420" Type="float" Scale="1" OwnerName="Item" PropertyName="Sensor1DeadZone" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="430" Type="float" Scale="1" OwnerName="Item" PropertyName="Sensor2DeadZone" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="440" Type="float" Scale="1" OwnerName="Item" PropertyName="Sensor3DeadZone" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="200" Type="float" Scale="1" OwnerName="Item" PropertyName="Sensor1Factor" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="400" Type="float" Scale="1" OwnerName="Item" PropertyName="Sensor2Factor" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="410" Type="float" Scale="1" OwnerName="Item" PropertyName="Sensor3Factor" />
<PLCVariable DeviceIndex="0" Mode="1" Addr="63496" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsInletAirMotorError" />
<PLCVariable DeviceIndex="0" Mode="1" Addr="63497" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsOutletAirMotorError" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="403" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsInletAirCommError" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="404" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsOutletAirCommError" />
</Variables>
</PLCGroup>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment