# 和美安装包_v8.1.0-20241009

1.添加 旋转架编码器支持采集复位信号

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.0.3.0")]
-[assembly: AssemblyFileVersion("8.0.3.0")]
+[assembly: AssemblyVersion("8.1.0.0")]
+[assembly: AssemblyFileVersion("8.1.0.0")]
 [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.0.3")]
-[assembly: AssemblyFileVersion("8.0.3")]
+[assembly: AssemblyVersion("8.1.0.0")]
+[assembly: AssemblyFileVersion("8.1.0.0")]
 [assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVm.cs

@@ -86,6 +86,15 @@ namespace FLY.Thick.Blowing.UI
         /// </summary>
         public bool IsRPosMode { get; set; }
 
+        /// <summary>
+        /// 编码器模式，且使用复位信号
+        /// </summary>
+        public bool IsLimit2Enabled { get; set; }
+        /// <summary>
+        /// 复位信号脉冲长度
+        /// </summary>
+        public int RPosOfLimit2 { get; set; } = 20;
+
         /// <summary>
         /// 离开限位 到 撞下一个限位 的 旋转架转动总脉冲 单位 脉冲；
         /// 通过看 转向信号列表，可以看到
@@ -96,20 +105,26 @@ namespace FLY.Thick.Blowing.UI
         /// 自定义 输入口
         /// </summary>
         public bool IsInNoCustomized { get; set; }
+
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认9-1
+        /// 自定义 换向信号0 输入口序号 X8
         /// </summary>
-        public int InNo_Limit0 { get; set; } = 9 - 1;
+        public int InNo_Limit0 { get; set; } = 8;
 
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认10-1
+        /// 自定义 换向信号1 输入口序号 X9
         /// </summary>
-        public int InNo_Limit1 { get; set; } = 10 - 1;
+        public int InNo_Limit1 { get; set; } = 9;
 
         /// <summary>
-        /// 自定义 辊速度 输入口序号 从0开始 默认11-1
+        /// 自定义 辊速度 输入口序号 X10
         /// </summary>
-        public int InNo_Roll { get; set; } = 11 - 1;
+        public int InNo_Roll { get; set; } = 10;
+
+        /// <summary>
+        /// 自定义 复位信号 输入口序号 X11
+        /// </summary>
+        public int InNo_Limit2 { get; set; } = 11;
         #endregion
         #region 分区设定
         /// <summary>
@@ -218,6 +233,9 @@ namespace FLY.Thick.Blowing.UI
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.Is3D), this, nameof(Is3D));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.IsRPosMode), this, nameof(IsRPosMode));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.RPosOfR), this, nameof(RPosOfR));
+            Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.IsLimit2Enabled), this, nameof(IsLimit2Enabled));
+            Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.RPosOfLimit2), this, nameof(RPosOfLimit2));
+
 
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.IsPlcMode), this, nameof(IsPlcMode));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.PlcAddr), this, nameof(PlcAddr));
@@ -226,7 +244,7 @@ namespace FLY.Thick.Blowing.UI
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Limit0), this, nameof(InNo_Limit0));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Limit1), this, nameof(InNo_Limit1));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Roll), this, nameof(InNo_Roll));
-
+            Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Limit2), this, nameof(InNo_Limit2));
 
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.IsProbeRight), this, nameof(IsProbeRight));
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.IsForwCW), this, nameof(IsForwCW));
@@ -234,7 +252,7 @@ namespace FLY.Thick.Blowing.UI
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.BPC), this, nameof(BPC));
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.OrgBoltNo), this, nameof(OrgBoltNo));
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.IsUsedMap), this, nameof(IsUsedMap));
-            Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.Map), () =>
+            Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.Map), this, () =>
             {
                 BoltMap.Clear();
                 if (renZiJiaService.Map != null)
@@ -277,7 +295,7 @@ namespace FLY.Thick.Blowing.UI
             {
                 updateOrgBoltNo();
             }
-            else if ((e.PropertyName == nameof(OrgBoltNo)))
+            else if (e.PropertyName == nameof(OrgBoltNo))
             {
                 updateNo1InClock();
             }
@@ -462,6 +480,8 @@ namespace FLY.Thick.Blowing.UI
 
                 bDetect.IsRPosMode = this.IsRPosMode;
                 bDetect.RPosOfR = this.RPosOfR;
+                bDetect.IsLimit2Enabled = this.IsLimit2Enabled;
+                bDetect.RPosOfLimit2 = this.RPosOfLimit2;
 
                 bDetect.IsPlcMode = this.IsPlcMode;
                 bDetect.PlcAddr = this.PlcAddr;
@@ -470,7 +490,7 @@ namespace FLY.Thick.Blowing.UI
                 bDetect.InNo_Limit0 = this.InNo_Limit0;
                 bDetect.InNo_Limit1 = this.InNo_Limit1;
                 bDetect.InNo_Roll = this.InNo_Roll;
-
+                bDetect.InNo_Limit2 = this.InNo_Limit2;
                 bDetect.Apply();
 
                 renZiJiaService.ChannelCnt = this.ChannelCnt;

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVmUt.cs

@@ -101,6 +101,9 @@ namespace FLY.Thick.Blowing.UI
         /// </summary>
         public bool IsRPosMode { get; set; }
 
+        public bool IsLimit2Enabled { get; set; }
+
+        public int RPosOfLimit2 { get; set; }
         /// <summary>
         /// 离开限位 到 撞下一个限位 的 旋转架转动总脉冲 单位 脉冲；
         /// 通过看 转向信号列表，可以看到
@@ -112,9 +115,10 @@ namespace FLY.Thick.Blowing.UI
         /// </summary>
         public bool IsInNoCustomized { get; set; }
 
-        public int InNo_Limit0 { get; set; } = 9 - 1;
-        public int InNo_Limit1 { get; set; } = 10 - 1;
-        public int InNo_Roll { get; set; } = 11 - 1;
+        public int InNo_Limit0 { get; set; } = 8;
+        public int InNo_Limit1 { get; set; } = 9;
+        public int InNo_Roll { get; set; } = 10;
+        public int InNo_Limit2 { get; set; } = 11;
         #endregion
 
         #region 状态

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Themes/StringResources/StringResource.FlyADIODefine.xaml

@@ -5,6 +5,7 @@
     <!--字符串换行 必须添加 xml:space="preserve" -->
     <!--字符串换行 换行符 &#10; -->
 
-    <system:String x:Key="str.FlyADIODefine.InNo_Limit0">旋转架转向信号0</system:String>
-    <system:String x:Key="str.FlyADIODefine.InNo_Limit1">旋转架转向信号1</system:String>
+    <system:String x:Key="str.FlyADIODefine.InNo_Limit0">旋转架换向信号0</system:String>
+    <system:String x:Key="str.FlyADIODefine.InNo_Limit1">旋转架换向信号1</system:String>
+    <system:String x:Key="str.FlyADIODefine.InNo_Limit2">旋转架信号2</system:String>
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Themes/StringResources/StringResource.PgBlowing.xaml

@@ -45,6 +45,8 @@
 <system:String x:Key="str.Blowing.PgBlowing.Is3D">立式旋转</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsPlcMode">从PLC获取</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsRPosMode">旋转编码器</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.IsLimit2Enabled">只有信号2</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.RPosOfLimit2">信号2总脉冲</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.RPosOfR">旋转总脉冲</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Pulse">脉冲</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.PlcAddr">PLC服务地址</system:String>
@@ -61,16 +63,17 @@
 <system:String x:Key="str.Blowing.PgBlowing.SignType">信号类型</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Short">短触碰</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Long">长信号</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.IsSign0Double" xml:space="preserve">信号0过冲&#13;接触2次</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.IsSign1Double" xml:space="preserve">信号1过冲&#13;接触2次</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.IsSign0Double" >信号0过冲接触2次</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.IsSign1Double" >信号1过冲接触2次</system:String>
     
 <system:String x:Key="str.Blowing.PgBlowing.IsSignFilter">信号滤波</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsLackSignMode">信号缺少模式</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsInNoCustomized">自定义输入口</system:String>
     
-<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit0" xml:space="preserve">信号0&#13;输入号</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit1" xml:space="preserve">信号1&#13;输入号</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.InNo_Roll" xml:space="preserve">辊速&#13;输入号</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit0" >信号0</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit1" >信号1</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit2" >信号2</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Roll" >辊速</system:String>
    
 <system:String x:Key="str.Blowing.PgBlowing.Time">时间</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Signal">信号</system:String>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Themes/StringResources/en/StringResource.FlyADIODefine.xaml

@@ -7,4 +7,5 @@
 
     <system:String x:Key="str.FlyADIODefine.InNo_Limit0">Rev Signal 0</system:String>
     <system:String x:Key="str.FlyADIODefine.InNo_Limit1">Rev Signal 1</system:String>
+    <system:String x:Key="str.FlyADIODefine.InNo_Limit2">Signal 2</system:String>
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Themes/StringResources/en/StringResource.PgBlowing.xaml

@@ -44,6 +44,8 @@
 <system:String x:Key="str.Blowing.PgBlowing.Is3D">Vertical rotation</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsPlcMode">Get from PLC</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsRPosMode">Rotary Encoder</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.IsLimit2Enabled">Only Sig.2</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.RPosOfLimit2">Sig.2 Total Pulse</system:String>    
 <system:String x:Key="str.Blowing.PgBlowing.RPosOfR">Total Rotating Pulse</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Pulse">Pulse</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.PlcAddr">PLC service address</system:String>
@@ -60,16 +62,17 @@
 <system:String x:Key="str.Blowing.PgBlowing.SignType">Type</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Short">Short</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Long">Long</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.IsSign0Double" xml:space="preserve">Signal 0 overshoot&#13;It triggered twice</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.IsSign1Double" xml:space="preserve">Signal 1 overshoot&#13;It triggered twice</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.IsSign0Double">Sig.0 overshoot! It triggered twice</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.IsSign1Double">Sig.1 overshoot! It triggered twice</system:String>
     
 <system:String x:Key="str.Blowing.PgBlowing.IsSignFilter">Filter</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsLackSignMode">Lack of signal</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.IsInNoCustomized">Customized Input</system:String>
     
-<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit0" xml:space="preserve">Signal 0&#13;Input</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit1" xml:space="preserve">Signal 1&#13;Input</system:String>
-<system:String x:Key="str.Blowing.PgBlowing.InNo_Roll" xml:space="preserve">Signal Roller&#13;Input</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit0" >Sig.0</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit1" >Sig.1</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Limit2" >Sig.2</system:String>
+<system:String x:Key="str.Blowing.PgBlowing.InNo_Roll">Sig. Roller</system:String>
     
 <system:String x:Key="str.Blowing.PgBlowing.Time">Time</system:String>
 <system:String x:Key="str.Blowing.PgBlowing.Signal">Signal</system:String>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Client/BlowingDetectServiceClient.cs

@@ -112,6 +112,16 @@ namespace FLY.Thick.Blowing.Client
         /// </summary>
         public bool IsRPosMode2 { get; set; }
 
+        /// <summary>
+        /// 编码器模式，且使用复位信号
+        /// </summary>
+        public bool IsLimit2Enabled { get; set; }
+
+        /// <summary>
+        /// 复位信号脉冲长度
+        /// </summary>
+        public int RPosOfLimit2 { get; set; }
+
         /// <summary>
         /// 离开限位 到 撞下一个限位 的 旋转架转动总脉冲 单位 脉冲；
         /// 通过看 转向信号列表，可以看到
@@ -124,20 +134,25 @@ namespace FLY.Thick.Blowing.Client
         public bool IsInNoCustomized { get; set; }
 
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认9-1
+        /// 自定义 换向信号0 输入口序号 X8
         /// </summary>
         public int InNo_Limit0 { get; set; }
 
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认10-1
+        /// 自定义 换向信号1 输入口序号 X9
         /// </summary>
         public int InNo_Limit1 { get; set; }
 
         /// <summary>
-        /// 自定义 辊速度 输入口序号 从0开始 默认11-1
+        /// 自定义 辊速度 输入口序号 X10
         /// </summary>
         public int InNo_Roll { get; set; }
 
+        /// <summary>
+        /// 自定义 复位信号 输入口序号 X11
+        /// </summary>
+        public int InNo_Limit2 { get; set; }
+
         #endregion
 
         #region 状态

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Common/FlyADIODefine.cs

@@ -12,20 +12,25 @@ namespace FLY.Thick.Blowing.Common
         public static new FlyADIODefine Instance => (FlyADIODefine)instance;
 
         /// <summary>
-        /// 旋转架转向信号0
+        /// 旋转架换向信号0 X8
         /// </summary>
-        public int InNo_Limit0 { get; protected set; } = 9 - 1;
+        public int InNo_Limit0 { get; protected set; } = 8;
 
         /// <summary>
-        /// 旋转架转向信号1
+        /// 旋转架转向信号1 X9
         /// </summary>
-        public int InNo_Limit1 { get; protected set; } = 10 - 1;
+        public int InNo_Limit1 { get; protected set; } = 9;
 
+        /// <summary>
+        /// 旋转架复位信号 X11
+        /// </summary>
+        public int InNo_Limit2 { get; protected set; } = 11;
         protected override List<string> GetInputPropertyNames()
         {
             return new List<string> {
                 nameof(InNo_Limit0),
                 nameof(InNo_Limit1),
+                nameof(InNo_Limit2),
                 nameof(InNo_Roll)
             };
         }

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/IService/IBlowingDetectService.cs

@@ -96,6 +96,16 @@ namespace FLY.Thick.Blowing.IService
         /// </summary>
         bool IsRPosMode2 { get; }
 
+        /// <summary>
+        /// 编码器模式，且使用复位信号
+        /// </summary>
+        bool IsLimit2Enabled { get; set; }
+
+        /// <summary>
+        /// 复位信号脉冲长度
+        /// </summary>
+        int RPosOfLimit2 { get; set; }
+
         /// <summary>
         /// 离开限位 到 撞下一个限位 的 旋转架转动总脉冲 单位 脉冲；
         /// 通过看 转向信号列表，可以看到
@@ -108,19 +118,25 @@ namespace FLY.Thick.Blowing.IService
         bool IsInNoCustomized { get; set; }
 
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认9-1
+        /// 自定义 换向信号0 输入口序号 X8
         /// </summary>
         int InNo_Limit0 { get; set; }
 
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认10-1
+        /// 自定义 换向信号1 输入口序号 X9
         /// </summary>
         int InNo_Limit1 { get; set; }
 
         /// <summary>
-        /// 自定义 辊速度 输入口序号 从0开始 默认11-1
+        /// 自定义 辊速度 输入口序号 X10
         /// </summary>
         int InNo_Roll { get; set; }
+
+        /// <summary>
+        /// 自定义 复位信号 输入口序号 X11
+        /// </summary>
+        int InNo_Limit2 { get; set; }
+
         #endregion
 
         #region 状态

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.0.2.0")]
-[assembly: AssemblyFileVersion("8.0.2.0")]
+[assembly: AssemblyVersion("8.1.0.0")]
+[assembly: AssemblyFileVersion("8.1.0.0")]
 [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.0.1.0")]
-[assembly: AssemblyFileVersion("8.0.1.0")]
+[assembly: AssemblyVersion("8.1.0.2")]
+[assembly: AssemblyFileVersion("8.1.0.2")]
 [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
 

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVm.cs

@@ -92,6 +92,15 @@ namespace FLY.Thick.BlowingScan.UI.Client
         /// </summary>
         public bool IsRPosMode { get; set; }
 
+        /// <summary>
+        /// 编码器模式，且使用复位信号
+        /// </summary>
+        public bool IsLimit2Enabled { get; set; }
+        /// <summary>
+        /// 复位信号脉冲长度
+        /// </summary>
+        public int RPosOfLimit2 { get; set; } = 20;
+
         /// <summary>
         /// 离开限位 到 撞下一个限位 的 旋转架转动总脉冲 单位 脉冲；
         /// 通过看 转向信号列表，可以看到
@@ -102,20 +111,26 @@ namespace FLY.Thick.BlowingScan.UI.Client
         /// 自定义 输入口
         /// </summary>
         public bool IsInNoCustomized { get; set; }
+
+        /// <summary>
+        /// 自定义 换向信号0 输入口序号 X8
+        /// </summary>
+        public int InNo_Limit0 { get; set; } = 8;
+
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认9-1
+        /// 自定义 换向信号1 输入口序号 X9
         /// </summary>
-        public int InNo_Limit0 { get; set; } = 9 - 1;
+        public int InNo_Limit1 { get; set; } = 9;
 
         /// <summary>
-        /// 自定义 转向信号 输入口序号 从0开始 默认10-1
+        /// 自定义 辊速度 输入口序号 X10
         /// </summary>
-        public int InNo_Limit1 { get; set; } = 10 - 1;
+        public int InNo_Roll { get; set; } = 10;
 
         /// <summary>
-        /// 自定义 辊速度 输入口序号 从0开始 默认11-1
+        /// 自定义 复位信号 输入口序号 X11
         /// </summary>
-        public int InNo_Roll { get; set; } = 11 - 1;
+        public int InNo_Limit2 { get; set; } = 11;
         #endregion
         #region 分区设定
         /// <summary>
@@ -249,6 +264,8 @@ namespace FLY.Thick.BlowingScan.UI.Client
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.Is3D), this, nameof(Is3D));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.IsRPosMode), this, nameof(IsRPosMode));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.RPosOfR), this, nameof(RPosOfR));
+            Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.IsLimit2Enabled), this, nameof(IsLimit2Enabled));
+            Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.RPosOfLimit2), this, nameof(RPosOfLimit2));
 
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.IsPlcMode), this, nameof(IsPlcMode));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.PlcAddr), this, nameof(PlcAddr));
@@ -258,6 +275,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Limit0), this, nameof(InNo_Limit0));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Limit1), this, nameof(InNo_Limit1));
             Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Roll), this, nameof(InNo_Roll));
+            Misc.BindingOperations.SetBinding(bDetect, nameof(bDetect.InNo_Limit2), this, nameof(InNo_Limit2));
 
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.IsProbeRight), this, nameof(IsProbeRight));
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.IsForwCW), this, nameof(IsForwCW));
@@ -265,7 +283,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.BPC), this, nameof(BPC));
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.OrgBoltNo), this, nameof(OrgBoltNo));
             Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.IsUsedMap), this, nameof(IsUsedMap));
-            Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.Map), () =>
+            Misc.BindingOperations.SetBinding(renZiJiaService, nameof(renZiJiaService.Map), this, () =>
             {
                 BoltMap.Clear();
                 if (renZiJiaService.Map != null && renZiJiaService.Map.Count() > 0)
@@ -514,6 +532,8 @@ namespace FLY.Thick.BlowingScan.UI.Client
 
                 bDetect.IsRPosMode = this.IsRPosMode;
                 bDetect.RPosOfR = this.RPosOfR;
+                bDetect.IsLimit2Enabled = this.IsLimit2Enabled;
+                bDetect.RPosOfLimit2 = this.RPosOfLimit2;
 
                 bDetect.IsPlcMode = this.IsPlcMode;
                 bDetect.PlcAddr = this.PlcAddr;
@@ -522,6 +542,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
                 bDetect.InNo_Limit0 = this.InNo_Limit0;
                 bDetect.InNo_Limit1 = this.InNo_Limit1;
                 bDetect.InNo_Roll = this.InNo_Roll;
+                bDetect.InNo_Limit2 = this.InNo_Limit2;
 
                 bDetect.Apply();
 

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVmUt.cs

@@ -185,6 +185,10 @@ namespace FLY.Thick.BlowingScan.UI.Client
 
         public bool IsRPosMode2 => throw new NotImplementedException();
 
+        public bool IsLimit2Enabled { get; set; }
+        public int RPosOfLimit2 { get; set; }
+        public int InNo_Limit2 { get; set; }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         #endregion

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/Themes/StringResources/StringResource.PgBlowing.xaml

@@ -49,6 +49,8 @@
 <system:String x:Key="str.BlowingScan.PgBlowing.Is3D">立式旋转</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsPlcMode">从PLC获取</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsRPosMode">旋转编码器</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.IsLimit2Enabled">只有信号2</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.RPosOfLimit2">信号2总脉冲</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.RPosOfR">旋转总脉冲</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Pulse">脉冲</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.PlcAddr">PLC服务地址</system:String>
@@ -65,16 +67,17 @@
 <system:String x:Key="str.BlowingScan.PgBlowing.SignType">信号类型</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Short">短触碰</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Long">长信号</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.IsSign0Double" xml:space="preserve">信号0过冲&#13;接触2次</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.IsSign1Double" xml:space="preserve">信号1过冲&#13;接触2次</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.IsSign0Double">信号0过冲接触2次</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.IsSign1Double">信号1过冲接触2次</system:String>
     
 <system:String x:Key="str.BlowingScan.PgBlowing.IsSignFilter">信号滤波</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsLackSignMode">信号缺少模式</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsInNoCustomized">自定义输入口</system:String>
     
-<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit0" xml:space="preserve">信号0&#13;输入号</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit1" xml:space="preserve">信号1&#13;输入号</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Roll" xml:space="preserve">辊速&#13;输入号</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit0" >信号0</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit1" >信号1</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit2" >信号2</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Roll" >辊速</system:String>
     
 <system:String x:Key="str.BlowingScan.PgBlowing.Time">时间</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Signal">信号</system:String>

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/Themes/StringResources/en/StringResource.PgBlowing.xaml

@@ -31,7 +31,7 @@
 <system:String x:Key="str.BlowingScan.PgBlowing.IsProbeRight">Is Sensor on the Right</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.No1InClock">No.1 Channel in clock</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.OClock">o`clock</system:String>
-    <system:String x:Key="str.BlowingScan.PgBlowing.BPC">Bolt Count/Channel Count</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.BPC">Bolt Count/Channel Count</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.BoltCount">Bolt Count</system:String>
     
     
@@ -49,6 +49,8 @@
 <system:String x:Key="str.BlowingScan.PgBlowing.Is3D">Vertical rotation</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsPlcMode">Get from PLC</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsRPosMode">Rotary Encoder</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.IsLimit2Enabled">Only Sig.2</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.RPosOfLimit2">Sig.2 Total Pulse</system:String>   
 <system:String x:Key="str.BlowingScan.PgBlowing.RPosOfR">Total Rotating Pulse</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Pulse">Pulse</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.PlcAddr">PLC service address</system:String>
@@ -65,16 +67,17 @@
 <system:String x:Key="str.BlowingScan.PgBlowing.SignType">Type</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Short">Short</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Long">Long</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.IsSign0Double" xml:space="preserve">Signal 0 overshoot&#13;It triggered twice</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.IsSign1Double" xml:space="preserve">Signal 1 overshoot&#13;It triggered twice</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.IsSign0Double">Sig.0 overshoot! It triggered twice</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.IsSign1Double">Sig.1 overshoot! It triggered twice</system:String>
     
 <system:String x:Key="str.BlowingScan.PgBlowing.IsSignFilter">Filter</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsLackSignMode">Lack of signal</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.IsInNoCustomized">Customized Input</system:String>
     
-<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit0" xml:space="preserve">Signal 0&#13;Input</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit1" xml:space="preserve">Signal 1&#13;Input</system:String>
-<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Roll" xml:space="preserve">Signal Roller&#13;Input</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit0" >Sig.0</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit1" >Sig.1</system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Limit2" >Sig.2 </system:String>
+<system:String x:Key="str.BlowingScan.PgBlowing.InNo_Roll" >Sig. Roller</system:String>
     
 <system:String x:Key="str.BlowingScan.PgBlowing.Time">Time</system:String>
 <system:String x:Key="str.BlowingScan.PgBlowing.Signal">Signal</system:String>

Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/FLY.Simulation.Blowing/Blowing.cs

@@ -229,6 +229,7 @@ namespace FLY.Simulation.Blowing
         /// 辊信号
         /// </summary>
         public bool IsRollSign { get; protected set; }
+
         #endregion
 
         public int Avg { get; set; }

Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/FLY.Simulation.Blowing/GageAD.cs

@@ -103,7 +103,9 @@ namespace FLY.Simulation.Blowing
 
             if (mBlowing.IsTurnSign1)
                 Misc.MyBase.CLEARBIT(ref istatus, IODefinition.IN_RENZIJIA_1);
-
+            
+            if (mBlowing.IsOrgSign)
+                Misc.MyBase.CLEARBIT(ref istatus, IODefinition.IN_RENZIJIA_2);
             return istatus;
         }
 

Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/FLY.Simulation/IODefinition.cs

@@ -10,39 +10,44 @@ namespace FLY.Simulation
         /// <summary>
         /// 归0
         /// </summary>
-        public const int IN_ORG = 2 - 1;
+        public const int IN_ORG = 1;//X1
         /// <summary>
         /// 反向限位
         /// </summary>
-        public const int IN_MINLIMIT = 3-1;
+        public const int IN_MINLIMIT = 2;//X2
         /// <summary>
         /// 正向限位
         /// </summary>
-        public const int IN_MAXLIMIT = 4-1;
+        public const int IN_MAXLIMIT = 3;//X3
 
         /// <summary>
         /// 手动正转
         /// </summary>
-        public const int IN_FORW = 7 - 1;
+        public const int IN_FORW = 6;//X6
         /// <summary>
         /// 手动反转
         /// </summary>
-        public const int IN_BACKW = 8 -1;
+        public const int IN_BACKW = 7;//X7
 
         /// <summary>
-        /// 旋转架 信号0
+        /// 旋转架 转向信号0
         /// </summary>
-        public const int IN_RENZIJIA_0 = 9 - 1;
+        public const int IN_RENZIJIA_0 = 8;//X8
 
         /// <summary>
-        /// 旋转架 信号1
+        /// 旋转架 转向信号1
         /// </summary>
-        public const int IN_RENZIJIA_1 = 10 - 1;
+        public const int IN_RENZIJIA_1 = 9;//X9
 
         /// <summary>
         /// 线速度 
         /// </summary>
-        public const int IN_RSENSOR = 11 - 1;
+        public const int IN_RSENSOR = 10;//X10
+
+        /// <summary>
+        /// 旋转架 复位信号
+        /// </summary>
+        public const int IN_RENZIJIA_2 = 11;//X11
 
 
     }

thick_public @ d7c72d7f

-Subproject commit 781e7c3c3c8663f11a29e5dc476bbcf18fec165d
+Subproject commit d7c72d7f9f7247d46298239db25277652b6dfdcc

脚本/hemeiInstallZipVersionInfo.json

 {
-  "InstallZipVersion":"8.0.3.0",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v8.0.3.0_20240904.7z"
+  "InstallZipVersion":"8.1.0.2",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v8.1.0.2_20241010.7z"
 }
\ No newline at end of file

脚本/版本描述.md

+# 和美安装包_v8.1.0-20241009
+
+## 测厚仪服务器 v8.1.0
+1.添加 旋转架编码器支持采集复位信号
+
+## 测厚仪客户端 v8.1.0
+1.添加 旋转架编码器支持采集复位信号
+
+## 扫描测厚仪服务器 v8.1.0
+1.添加 旋转架编码器支持采集复位信号
+
+## 扫描测厚仪客户端 v8.1.0
+1.添加 旋转架编码器支持采集复位信号
+   
+## 自动风环 v8.0.0
+1.添加 支持英语
+
+## 称重 v8.0.0
+1.添加 支持英语
+
+## 称重单组 v7.6.0
+
+## 收卷 v8.0.0
+1.添加 支持英语
+
+## IBC v8.0.0
+1.添加 支持英语
+
+## 下吹 v7.6.1
+
+## 吹膜数据库浏览器 v7.0.0
+
+<br/>
+<br/>
+<br/>
+
+
 # 和美安装包_v8.0.3.0-20240904
 
 ## 测厚仪服务器 v8.0.3