冲突解决

HBLConsole.MORKD/Control_MORKD.cs

@@ -163,14 +163,14 @@ namespace HBLConsole.MORKD
                     mORKD.TemperatureReached = bools[10];
                 }));
 
-                //var ResLoc = ModbusTcpHelper.GetInstance.Read(286, ReadType.HoldingRegisters);
-                //if (ResLoc != null)
-                //{
-                //    if (ResLoc is ushort loc)
-                //    {
-                //        mORKD.TurntableFeedbackloc = loc;
-                //    }
-                //}
+                var ResLoc = ModbusTcpHelper.GetInstance.Read(286, ReadType.HoldingRegisters);
+                if (ResLoc != null)
+                {
+                    if (ResLoc is ushort loc)
+                    {
+                        mORKD.TurntableFeedbackloc = loc;
+                    }
+                }
                 Thread.Sleep(100);
             }), "ReadPLCData");
         }

HBLConsole.MORKS/Control_MORKS.cs

@@ -112,7 +112,16 @@ namespace HBLConsole.MORKS
                     }
                 }));
 
-                mORKS.TurntableFeedbackloc = (ushort)ModbusTcpHelper.GetInstance.Read(286, ReadType.HoldingRegisters);
+
+                var ResLoc = ModbusTcpHelper.GetInstance.Read(286, ReadType.HoldingRegisters);
+                if (ResLoc != null)
+                {
+                    if (ResLoc is ushort loc)
+                    {
+                        mORKS.TurntableFeedbackloc = loc;
+                    }
+                }
+                //mORKS.TurntableFeedbackloc = (ushort)ModbusTcpHelper.GetInstance.Read(286, ReadType.HoldingRegisters);
 
                 Thread.Sleep(500);
             }), "ReadPLCData");

HBLConsole.MainConsole/Main.cs

@@ -21,7 +21,7 @@ namespace HBLConsole.MainConsole
         public static Main GetInstance => _Instance ?? (_Instance = new Main());
         private Main()
         {
-            ActionOperate.GetInstance.Register(new Func<object>(() => { return GeneralConfig.DeviceType.ToString(); }), "GetDeviceType");
+            //ActionOperate.GetInstance.Register(new Func<object>(() => { return GeneralConfig.DeviceType.ToString(); }), "GetDeviceType");
         }
 
         List<string> Topics = new List<string>();

HBLDevice.ICChip/HBLDevice.ICChip.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <Reference Include="BPA.Utility">
-      <HintPath>..\..\..\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
+      <HintPath>..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
     </Reference>
   </ItemGroup>