diff --git a/Config/Data.cs b/Config/Data.cs index 831b929d6..8c452dd96 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -32,7 +32,7 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = 1; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 public const int WMsCount = 20; public const int LineSize = 10; public const int CompoundWMsCount = 1; diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index de190b5b1..32310d4da 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.837.0")] -[assembly: AssemblyFileVersion("2.18.837.0")] +[assembly: AssemblyVersion("2.18.857.0")] +[assembly: AssemblyFileVersion("2.18.857.0")] diff --git a/TBF/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs index dfefbeac3..e88ebae33 100644 --- a/TBF/BenchControl/Elde/Common.cs +++ b/TBF/BenchControl/Elde/Common.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde EnduranceCycleStop = 13, } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 public enum StatusP : ulong { RefFlowMeterMask = 0x7, /// bits 0,1,2 diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs index 556fb0af9..8a968e06b 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -137,7 +137,7 @@ namespace TBF.BenchControl.Elde {100,500}, {100,500}, {100,500}, {100,500} }; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index 895b83beb..fc10cd37c 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -32,10 +32,10 @@ namespace TBF.BenchControl.Elde public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq[0]; } } /// In [Hz] 0..2500, nom.=2000 #endif public int EtPulses(int wmNr1) { return (int)ctrlBrdComponent.etPulses[wmNr1]; } -#if GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 +#if GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; } } #else - public int EtPulsesK { get { return 1; } } + public int EtPulsesK { get { return 1; } } #endif public UInt16 WMeterPulses(int wmNr1) { return (UInt16)ctrlBrdComponent.wMeterPuls[wmNr1]; } public int WMeterReference(int wmNr0) { return (int)ctrlBrdComponent.wMeterReference[wmNr0]; } @@ -49,7 +49,7 @@ namespace TBF.BenchControl.Elde public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } } #endif -#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT +#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { @@ -57,7 +57,7 @@ namespace TBF.BenchControl.Elde ctrlBrdComponent.DIVLimit[divNo, 1] = limHiPct; } #else - public uint DivTime(int id) { return ctrlBrdComponent.divTime; } + public uint DivTime(int id) { return ctrlBrdComponent.divTime; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { } #endif @@ -102,7 +102,7 @@ namespace TBF.BenchControl.Elde public uint[] WMeterCont { get { return new uint[3]; } } /// Dummy #endif -#if KEMPNO_50 || KRAKOW_50 +#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } } #else public float ValveOpenCloseTime { get { return 0.001f; } } @@ -371,7 +371,7 @@ namespace TBF.BenchControl.Elde uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT +#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 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); diff --git a/TBF/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs index 152b91c1f..64764aaf1 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/MainWnd.Designer.cs @@ -678,7 +678,7 @@ namespace TBF #elif TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; #elif TURA_IPERL diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index bca141fc2..f904ec3b5 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.856.0")] -[assembly: AssemblyFileVersion("2.18.856.0")] +[assembly: AssemblyVersion("2.18.857.0")] +[assembly: AssemblyFileVersion("2.18.857.0")] diff --git a/packages/ControlBoard/JuznaAfrika50/ControlComponent3U.dll b/packages/ControlBoard/JuznaAfrika50/ControlComponent3U.dll new file mode 100644 index 000000000..0813a564e Binary files /dev/null and b/packages/ControlBoard/JuznaAfrika50/ControlComponent3U.dll differ