aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-10-27 13:19:32 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-10-27 13:19:32 +0200
commit88f609c6244121f07b45e8101174fdc293bbcb2d (patch)
tree330aaad66b1a34ccfb2a29cacfe3fc8c4f01500b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
parent312e8ccad554d6d0e7d21444e069731e770db978 (diff)
downloadTango-88f609c6244121f07b45e8101174fdc293bbcb2d.tar.gz
Tango-88f609c6244121f07b45e8101174fdc293bbcb2d.zip
Removed rollback version in machine studio.
Omitted remove old dll files from machine studio updater. Removed ColorCapture module from MS update to reduce package size. Added ColorCapture module only to MS installer. Added ExternalBridge default timeout to machine studio settings file.
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 781e034e8..c307a8e33 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -130,6 +130,11 @@ namespace Tango.MachineStudio.Common
public TimeSpan MaximumCacheTime { get; set; }
/// <summary>
+ /// Gets or sets the external bridge request timeout.
+ /// </summary>
+ public TimeSpan ExternalBridgeRequestTimeout { get; set; }
+
+ /// <summary>
/// Gets the machine service address.
/// </summary>
public String MachineServiceAddress
@@ -167,6 +172,7 @@ namespace Tango.MachineStudio.Common
CachingMode = ObservablesContextInMemoryCachingMode.None;
Theme = MachineStudioTheme.Light;
JobUnitsMethod = JobUnitsMethods.Operator;
+ ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
}
}
}