diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs
index 2cfff473a..6d72837ef 100644
--- a/ResultsBrowser/Program.cs
+++ b/ResultsBrowser/Program.cs
@@ -1,3 +1,6 @@
+///
+/// Copyright (c) 2013-2015 Sensus Metering Systems
+///
using System;
using System.IO;
using System.Collections.Generic;
@@ -31,7 +34,7 @@ namespace ResultsBrowser
#if (DN100 || MUNICH)
public const int WMsCount = 3;
-#else // if FUZHOU300|| FUZHOU150 || PT200IL || TORINO50
+#else // if FUZHOU300|| FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
public const int WMsCount = 6;
#endif
diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs
index b0c11b9a6..3af0a004e 100644
--- a/TestBenchFramework/BenchControl/Elde/Common.cs
+++ b/TestBenchFramework/BenchControl/Elde/Common.cs
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.Elde
Stop = 2, /// Stop the measurement
}
-#if FUZHOU300 || PT200IL || TORINO50
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,
diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
index ea5efc748..100cb9a06 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
@@ -83,7 +83,7 @@ namespace TBF.BenchControl.Elde
// Array length is the reference flowmeters count plus one
#if DN100
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
-#elif MUNICH || TORINO50
+#elif MUNICH || TORINO50 || BADGER_MALA_TRAT
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
#elif FUZHOU150 || FUZHOU300 || PT200IL
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
@@ -173,6 +173,8 @@ namespace TBF.BenchControl.Elde
ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
#elif TORINO50
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
+#elif BADGER_MALA_TRAT
+ ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
#endif
ulong valvesToInvert,
float[] tankCapacities)
diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
index 5ec0f6723..d809f17b3 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde
/// Properties
///
public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
-#if FUZHOU300 || PT200IL || TORINO50
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
///
/// In case of I11, I12
/// referenceFreq[0] = I11 + I12
@@ -25,7 +25,7 @@ namespace TBF.BenchControl.Elde
///
public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq[0]; } } /// In [Hz] 0..2500, nom.=2000
#else
- public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } } /// In [Hz] 0..2500, nom.=2000
+ public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } } /// In [Hz] 0..2500, nom.=2000
#endif
public int EtPulses(int wmNr0)
{
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde
public ulong RRoute { get { return ctrlBrdComponent.rRoute; } }
public uint DivTime { get { return ctrlBrdComponent.divTime; } }
public float TTime { get { return ctrlBrdComponent.Ttime; } }
-#if FUZHOU300 || PT200IL || TORINO50
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index
#else
public uint FmState { get { return ctrlBrdComponent.fMState; } }
@@ -80,9 +80,11 @@ namespace TBF.BenchControl.Elde
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
#elif TORINO50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+#elif BADGER_MALA_TRAT
+ private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif
- ///
+ ///
/// Constructor that initializes the control board component reference
///
///
@@ -98,8 +100,10 @@ namespace TBF.BenchControl.Elde
public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#elif TORINO50
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
+#elif BADGER_MALA_TRAT
+ public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#endif
- {
+ {
this.ctrlBrdComponent = ctrlBrdComponent;
}
@@ -181,10 +185,10 @@ namespace TBF.BenchControl.Elde
// valveValue[0],
// valveValue[1]));
log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
-#if FUZHOU300 || PT200IL || TORINO50
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
#else
- ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
+ ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
#endif
}
diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs
index c57b0aa2f..25eb39450 100644
--- a/TestBenchFramework/BenchControl/StateMachine.cs
+++ b/TestBenchFramework/BenchControl/StateMachine.cs
@@ -192,8 +192,10 @@ namespace TBF.BenchControl
public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#elif TORINO50
public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
+#elif BADGER_MALA_TRAT
+ public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#endif
- {
+ {
/// Load the list of components (entities) from the database.
/// Then create the components (derived from IComponent).
components = BenchControl.TbfComponents.LoadComponentsFromDB(FluentCommon.CreateSession(Database.Bench));
diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs
index 8492d9a7a..68fb98b36 100644
--- a/TestBenchFramework/MainWnd.Designer.cs
+++ b/TestBenchFramework/MainWnd.Designer.cs
@@ -585,9 +585,11 @@ namespace TBF
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
#elif TORINO50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+#elif BADGER_MALA_TRAT
+ private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif
- private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem measurementTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem;
diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs
index 36108393c..5a9e3b3cb 100644
--- a/TestBenchFramework/Program.cs
+++ b/TestBenchFramework/Program.cs
@@ -36,11 +36,11 @@ namespace TBF
#if DN100 || MUNICH
public const int WMsCount = 3;
-#else // FUZHOU300, FUZHOU150, PT200IL, TORINO50
+#else // if FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
public const int WMsCount = 6;
#endif
- ///
+ ///
/// Selected procedure data
/// - before the main program window is open, objects referenced by this variable
/// are loaded from the database.
diff --git a/packages/ControlBoard/Badger-mala-trat/ControlComponent3U.dll b/packages/ControlBoard/Badger-mala-trat/ControlComponent3U.dll
new file mode 100644
index 000000000..38f93aaa7
Binary files /dev/null and b/packages/ControlBoard/Badger-mala-trat/ControlComponent3U.dll differ