aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-11-06 15:49:22 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-11-06 15:49:22 +0200
commit0b8ce9dd355873283ffbb644fbad5c46084f895e (patch)
tree4693f8648bf733258ce5c9998b361a3074c7f1c2 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
parenta2f88e964e640537bb56db6bafeb2961d950c552 (diff)
downloadTango-0b8ce9dd355873283ffbb644fbad5c46084f895e.tar.gz
Tango-0b8ce9dd355873283ffbb644fbad5c46084f895e.zip
Fixed a bug with job colorspace is null when entering job summery on catalog.
Added ContinuousRequestTimeout to MachineOperator and machine studio external bridge connection. Fixed dispensing nl\sec calculation. Fixed job brush stops liquid volumes setting by correct process parameters.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index c307a8e33..1831d5aa3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -135,6 +135,11 @@ namespace Tango.MachineStudio.Common
public TimeSpan ExternalBridgeRequestTimeout { get; set; }
/// <summary>
+ /// Gets or sets the external bridge continuous request timeout.
+ /// </summary>
+ public TimeSpan ExternalBridgeContinuousRequestTimeout { get; set; }
+
+ /// <summary>
/// Gets the machine service address.
/// </summary>
public String MachineServiceAddress
@@ -173,6 +178,7 @@ namespace Tango.MachineStudio.Common
Theme = MachineStudioTheme.Light;
JobUnitsMethod = JobUnitsMethods.Operator;
ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
+ ExternalBridgeContinuousRequestTimeout = TimeSpan.FromSeconds(5);
}
}
}