diff --git a/Modules/Mainframe/Config/Common/Common.xml b/Modules/Mainframe/Config/Common/Common.xml index 6356d21c..b30e9378 100644 --- a/Modules/Mainframe/Config/Common/Common.xml +++ b/Modules/Mainframe/Config/Common/Common.xml @@ -3,23 +3,27 @@ - + + + + + - - - + + + - - - - + + + + - + \ No newline at end of file diff --git a/Modules/Mainframe/Devices/IoLoadRotation.cs b/Modules/Mainframe/Devices/IoLoadRotation.cs index c88fbafe..7ec811ce 100644 --- a/Modules/Mainframe/Devices/IoLoadRotation.cs +++ b/Modules/Mainframe/Devices/IoLoadRotation.cs @@ -499,7 +499,7 @@ namespace SicModules.Devices _timer.Stop(); } - if(_diServoError.Value) + if(_diServoError?.Value == false) { _doServoOn.SetValue(false, out _); } diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index dda952d7..5ba55c6a 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -1050,13 +1050,16 @@ - - - + + + + + + + + + - - - @@ -1614,10 +1617,13 @@ - - - - + + + + + + + @@ -1987,6 +1993,11 @@ + + + + + diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index ab4a14c3..094a8777 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index dd50ff56..224ae27e 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index 0f5b2ce0..f77b4140 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index e8b0988a..85ab71c3 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 2642f41b..074efe3d 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index bbc9646f..5bd5f04f 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MathNet.Filtering.dll b/ThirdParty/MECF.Framework/MathNet.Filtering.dll new file mode 100644 index 00000000..96a2f357 Binary files /dev/null and b/ThirdParty/MECF.Framework/MathNet.Filtering.dll differ diff --git a/ThirdParty/MECF.Framework/MathNet.Numerics.dll b/ThirdParty/MECF.Framework/MathNet.Numerics.dll new file mode 100644 index 00000000..3e210c1a Binary files /dev/null and b/ThirdParty/MECF.Framework/MathNet.Numerics.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll index f7d0e8aa..465f8031 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll index 819396aa..9810d404 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Localization.dll and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ diff --git a/ThirdParty/MECF.Framework/System.ValueTuple.dll b/ThirdParty/MECF.Framework/System.ValueTuple.dll new file mode 100644 index 00000000..4ce28fde Binary files /dev/null and b/ThirdParty/MECF.Framework/System.ValueTuple.dll differ diff --git a/ThirdParty/MECF.Framework/en/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/en/Sicentury.Localization.resources.dll new file mode 100644 index 00000000..bbc006e6 Binary files /dev/null and b/ThirdParty/MECF.Framework/en/Sicentury.Localization.resources.dll differ diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll index 18f3c067..bcb64523 100644 Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ