Commit b4081c52 authored by 潘栩锋's avatar 潘栩锋 🚴

修复 新长盛旋转转向开关的逻辑。转向开关是长信号

parent 109a8f7f
...@@ -51,5 +51,5 @@ using System.Windows; ...@@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.1.0")]
...@@ -233,6 +233,9 @@ namespace FLY.Winder.XCS.UI.Server ...@@ -233,6 +233,9 @@ namespace FLY.Winder.XCS.UI.Server
return false; return false;
IsTurnSign1 = resultBool.Content; IsTurnSign1 = resultBool.Content;
resultBool = device.ReadBool(ADDR_FORW); resultBool = device.ReadBool(ADDR_FORW);
if (!SetState(resultBool)) if (!SetState(resultBool))
return false; return false;
......
...@@ -227,13 +227,50 @@ namespace FLY.Winder.XCS.UI.Server ...@@ -227,13 +227,50 @@ namespace FLY.Winder.XCS.UI.Server
// } // }
//} //}
bool lastPlcIsTurnSign1;
bool lastPlcIsTurnSign0;
void updatePlcReg() void updatePlcReg()
{ {
IsForw = plc.IsForw; IsForw = plc.IsForw;
IsBackw = plc.IsBackw; IsBackw = plc.IsBackw;
IsTurnSign0 = plc.IsTurnSign0; //IsTurnSign0 = plc.IsTurnSign0;
IsTurnSign1 = plc.IsTurnSign1; //IsTurnSign1 = plc.IsTurnSign1;
if (lastPlcIsTurnSign0 != plc.IsTurnSign0)
{
lastPlcIsTurnSign0 = plc.IsTurnSign0;
if (plc.IsTurnSign1 == false)
{
if (plc.IsTurnSign0 == false)
{
IsTurnSign1 = true;
}
else
{
IsTurnSign0 = false;
}
}
}
if (lastPlcIsTurnSign1 != plc.IsTurnSign1)
{
lastPlcIsTurnSign1 = plc.IsTurnSign1;
if (plc.IsTurnSign0 == false)
{
if (plc.IsTurnSign1 == false)
{
IsTurnSign0 = true;
}
else
{
IsTurnSign1 = false;
}
}
}
IsOrgSign = plc.IsOrgSign; IsOrgSign = plc.IsOrgSign;
RotaryFreqSet = plc.RotaryFreqSet/100.0; RotaryFreqSet = plc.RotaryFreqSet/100.0;
IsRotaryOn = plc.IsRotaryOn; IsRotaryOn = plc.IsRotaryOn;
......
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