diff --git a/Common/Common.csproj b/Common/Common.csproj
index 6d7c93884..cc78428c2 100644
--- a/Common/Common.csproj
+++ b/Common/Common.csproj
@@ -17,7 +17,7 @@
full
false
bin\Debug\
- TRACE;DEBUG;LANG_PL
+ TRACE;DEBUG
prompt
4
@@ -25,7 +25,7 @@
pdbonly
true
bin\Release\
- TRACE;LANG_PL
+ TRACE
prompt
4
diff --git a/Config/Mappings/BenchPathMap.cs b/Config/Mappings/BenchPathMap.cs
index b51b63e55..b1ef06b9d 100644
--- a/Config/Mappings/BenchPathMap.cs
+++ b/Config/Mappings/BenchPathMap.cs
@@ -21,6 +21,9 @@ namespace Config.Mappings
Map(x => x.PressMtrUp);
Map(x => x.PressMtrDown);
Map(x => x.PressMtrDelta);
+ //Map(x => x.ElectricMtrUp);
+ //Map(x => x.ElectricMtrDown);
+ //Map(x => x.ElectricMtrDelta);
Map(x => x.StopBFValve);
Map(x => x.ValvesOpen)
.CustomType("StringClob")
diff --git a/Results/Results.csproj b/Results/Results.csproj
index 29acb1445..235fbfdf6 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -19,7 +19,7 @@
full
false
bin\Debug\
- TRACE;DEBUG;LANG_PL
+ TRACE;DEBUG
prompt
4
AnyCPU
@@ -29,7 +29,7 @@
pdbonly
true
bin\Release\
- TRACE;LANG_PL
+ TRACE
prompt
4
false
diff --git a/TBFTests/Rig/Network/Camera/KeyenceIV3G120/CameraTest.cs b/TBFTests/Rig/Network/Camera/KeyenceIV3G120/CameraTest.cs
new file mode 100644
index 000000000..a9179908c
--- /dev/null
+++ b/TBFTests/Rig/Network/Camera/KeyenceIV3G120/CameraTest.cs
@@ -0,0 +1,93 @@
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using JetBrains.Annotations;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TBF.Rig.Generic;
+using TBF.Rig.Network.Camera.KeyenceIV3G120;
+using System.Xml;
+
+
+namespace TBFTests.Rig.Network.Camera.KeyenceIV3G120
+{
+
+ public class Log4NetSetup
+ {
+ public static void ConfigureLog4Net()
+ {
+ // Construct the log4net configuration as a string
+ string log4netConfig = @"
+
+
+
+
+
+
+
+
+
+
+ ";
+
+ // Load the log4net configuration from the string
+ XmlDocument doc = new XmlDocument();
+ doc.LoadXml(log4netConfig);
+ XmlElement element = doc.DocumentElement;
+
+ // Get the current assembly for the repository
+ Assembly assembly = Assembly.GetExecutingAssembly();
+
+ // Configure log4net using the parsed XmlElement
+ ILoggerRepository logRepository = LogManager.GetRepository(assembly);
+ XmlConfigurator.Configure(logRepository, element);
+ }
+ }
+
+ [TestClass]
+ [TestSubject(typeof(TBF.Rig.Network.Camera.KeyenceIV3G120.Camera))]
+ public class CameraTest
+ {
+
+ [TestInitialize]
+ public void Setup()
+ {
+ // Configure Log4Net programmatically
+ Log4NetSetup.ConfigureLog4Net();
+ }
+
+ [TestMethod]
+ public void Initialize()
+ {
+ Factory factory = new Factory();
+ IComponentCfg config = new CameraCfg("Camera0", factory);
+
+ TBF.Rig.Network.Camera.KeyenceIV3G120.Camera camera = new TBF.Rig.Network.Camera.KeyenceIV3G120.Camera(config, null);
+
+ camera.Initialize();
+
+ Thread.Sleep(10000);
+ camera.Stop();
+ Thread.Sleep(10000);
+
+ }
+
+ [TestMethod]
+ public void RtpListener()
+ {
+ Factory factory = new Factory();
+ IComponentCfg config = new CameraCfg("Camera0", factory);
+
+ TBF.Rig.Network.Camera.KeyenceIV3G120.Camera camera = new TBF.Rig.Network.Camera.KeyenceIV3G120.Camera(config, null);
+
+
+ camera.RtpListener();
+
+ camera.Stop();
+
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/TBFTests/Rig/Network/Camera/RoiForFixedStartKeyence/RoiTest.cs b/TBFTests/Rig/Network/Camera/RoiForFixedStartKeyence/RoiTest.cs
new file mode 100644
index 000000000..cb7f75457
--- /dev/null
+++ b/TBFTests/Rig/Network/Camera/RoiForFixedStartKeyence/RoiTest.cs
@@ -0,0 +1,19 @@
+using JetBrains.Annotations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TBF.Rig.Network.Camera.RoiForFixedStartKeyence;
+
+namespace TBFTests.Rig.Network.Camera.RoiForFixedStartKeyence
+{
+ [TestClass]
+ [TestSubject(typeof(Roi))]
+ public class RoiTest
+ {
+
+ [TestMethod]
+ public void Valve()
+ {
+ Roi roi = new Roi();
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/TBFTests/TBFTests.csproj b/TBFTests/TBFTests.csproj
index 1b35c5200..26fc94f62 100644
--- a/TBFTests/TBFTests.csproj
+++ b/TBFTests/TBFTests.csproj
@@ -44,6 +44,9 @@
..\packages\JetBrains.Annotations.2023.3.0\lib\net20\JetBrains.Annotations.dll
+
+ ..\packages\log4net.2.0.15\lib\net45\log4net.dll
+
..\packages\Microsoft.Extensions.Configuration.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Configuration.Abstractions.dll
@@ -81,6 +84,7 @@
..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
@@ -93,6 +97,8 @@
+
+
diff --git a/TBFTests/packages.config b/TBFTests/packages.config
index e52b73a4a..f42fcfa3a 100644
--- a/TBFTests/packages.config
+++ b/TBFTests/packages.config
@@ -13,4 +13,5 @@
+
\ No newline at end of file