diff --git a/Config/Data.cs b/Config/Data.cs index 011a3ed01..f3450389e 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -48,11 +48,11 @@ namespace Config public const int LineSize = 12; public const int CompoundWMsCount = 1; public const int HeatMetersCount = 6; -#elif SLM_END - public const int WMsCount = 12; +#elif SLM_END || WARSAW_END + public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 1; - public const int HeatMetersCount = 0; + public const int HeatMetersCount = 3; #elif MALTA_WSD25 public const int WMsCount = 6; public const int LineSize = 6; diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index c95d63c64..9f1554dd4 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -176,7 +176,7 @@ namespace Config.Entities [Description("vždy")] Always = 1, [Description("na obrazovku")] OnScreen = 2, [Description("interně")] Internal = 3, -#elif IPERLST || IPERLST_SPECIAL || SLM_50 +#elif IPERLST || IPERLST_SPECIAL || SLM_50 || SLM_END /// slovensky [Description("nikdy")] Never = 0, [Description("vždy")] Always = 1, diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index 189a44fbd..0d0f6092c 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.Elde ResetShapesOfPulses = 8, } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || IPERLST_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 99de6a99c..a6d5bad8b 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -122,7 +122,7 @@ namespace TBF.BenchControl.Elde #if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || IPERLST_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || IPERLST_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || SLM_END || WARSAW_END public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #elif MALTA_WSD25 diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index a6103fa80..490f78d8b 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -57,14 +57,16 @@ namespace TBF.BenchControl.Elde public ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } } public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; } public uint AnalogInputRaw(int adcNr0, int bank) { return ctrlBrdComponent.AnalogyRaw[adcNr0, bank]; } /// bank0=RV, bank1=Temp -#if IPERLST || IPERLST_SPECIAL || SLM_50 || MALTA_WSD25 + +#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || GENESIS + public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } + public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } +#else public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume[0]; } } public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume[1]; } } -#else - public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } - public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } #endif - public float VyslExt(int wmNr0, int what) { return ctrlBrdComponent.VyslExt[wmNr0, what]; } + + public float VyslExt(int wmNr0, int what) { return ctrlBrdComponent.VyslExt[wmNr0, what]; } public void SetWeight(int pos, double mass) { ctrlBrdComponent.Weight[pos] = (float)mass; @@ -290,16 +292,15 @@ namespace TBF.BenchControl.Elde #if DN100 || MUNICH ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, filterConstant, fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif IPERLST || IPERLST_SPECIAL || SLM_50 || MALTA_WSD25 +#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || GENESIS + ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, + filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); +#else /// if IPERLST || IPERLST_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#else - ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, - filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); #endif - ulong bufferedRoute = route; if (lastRoute != bufferedRoute) { diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 7a9fbd3d0..9aa966bf1 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -652,10 +652,10 @@ namespace TBF #elif PT200IL || PUCHONG_PT200 || GENESIS private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT +#elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; #elif IPERLST diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 767ae50ff..84957335a 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.375.1")] -[assembly: AssemblyFileVersion("2.12.375.1")] +[assembly: AssemblyVersion("2.12.378.1")] +[assembly: AssemblyFileVersion("2.12.378.1")] diff --git a/packages/ControlBoard/SLM-END/ControlComponent3U.dll b/packages/ControlBoard/SLM-END/ControlComponent3U.dll new file mode 100644 index 000000000..0a52538da Binary files /dev/null and b/packages/ControlBoard/SLM-END/ControlComponent3U.dll differ