From b5d8832fe4b236badacca28b0b107ffa3e571218 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 15 Dec 2017 18:19:36 -0800 Subject: [PATCH] Overridable emulator heatup --- PrinterEmulator/Emulator.cs | 8 ++++++-- .../MatterControl/MatterControlUtilities.cs | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/PrinterEmulator/Emulator.cs b/PrinterEmulator/Emulator.cs index a54010d9e..d6ea73cad 100644 --- a/PrinterEmulator/Emulator.cs +++ b/PrinterEmulator/Emulator.cs @@ -33,6 +33,11 @@ namespace MatterHackers.PrinterEmulator { public partial class Emulator : IDisposable { + /// + /// The number of seconds the emulator should take to heat up and given target + /// + public static double DefaultHeatUpTime = 3; + public int CDChangeCount; public bool CDState; public int CtsChangeCount; @@ -499,7 +504,7 @@ namespace MatterHackers.PrinterEmulator } } - private double _heatupTimeInSeconds = 3; + private double _heatupTimeInSeconds = DefaultHeatUpTime; public double HeatUpTimeInSeconds { get => _heatupTimeInSeconds; @@ -544,7 +549,6 @@ namespace MatterHackers.PrinterEmulator shutdown = true; } } - } public class EmulatorPortFactory : FrostedSerialPortFactory diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index d2fb047cf..171fa031a 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -196,6 +196,8 @@ namespace MatterHackers.MatterControl.Tests.Automation // Load the TestEnv config var config = TestAutomationConfig.Load(); + Emulator.DefaultHeatUpTime = config.HeatupTime; + // Create the printer testRunner.AddAndSelectPrinter(make, model); @@ -810,6 +812,11 @@ namespace MatterHackers.MatterControl.Tests.Automation public double MouseUpDelay { get; set; } = 0.2; + /// + /// The number of seconds the emulator should take to heat up and given target + /// + public double HeatupTime { get; set; } = 0.5; + public static TestAutomationConfig Load() { TestAutomationConfig config = null;