Commit 8e5b98a8 authored by 潘栩锋's avatar 潘栩锋 🚴

thick_public 的 warningsystem 合并错了,修正

parent 05127552
...@@ -46,9 +46,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -46,9 +46,7 @@ namespace FLY.Thick.Blowing.Server
/// </summary> /// </summary>
const int Roll_bit = 11; const int Roll_bit = 11;
#endregion #endregion
#region 参数 #region 参数
/// <summary> /// <summary>
...@@ -145,7 +143,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -145,7 +143,7 @@ namespace FLY.Thick.Blowing.Server
/// <summary> /// <summary>
/// 累计旋转次数 /// 累计旋转次数
/// </summary> /// </summary>
public virtual int RotationCnt { get; protected set; } public int RotationCnt { get; private set; }
/// <summary> /// <summary>
/// 最新的限位信号序号 /// 最新的限位信号序号
...@@ -1022,22 +1020,15 @@ namespace FLY.Thick.Blowing.Server ...@@ -1022,22 +1020,15 @@ namespace FLY.Thick.Blowing.Server
} }
void update_roll(FlyADBase.IStatusChangedEventArgs e) 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)) if (!Misc.MyBase.CHECKBIT(e.IChanged, Roll_bit - 1))
{ return;//没有信号更新
bchanged = true;
if (!Misc.MyBase.CHECKBIT(e.IStatus, Roll_bit - 1)) //信号的状态
{ bool status = !Misc.MyBase.CHECKBIT(e.IStatus, Roll_bit - 1);
status = true;
} DateTime dt = e.Time;//信号更新发生的时间
}
if (!bchanged)//没有信号更新
return;
DateTime dtmid; DateTime dtmid;
if (mbcRoll.Update(dt, status, out dtmid)) if (mbcRoll.Update(dt, status, out dtmid))
......
Subproject commit 9606ae0ef91daefb2bb0e3358cba5bfa67ecd629 Subproject commit 3afe9982506cd9532f479849c25a711ef82eea0f
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