From cbd5e135024f32e282866b07951bbf1645019a01 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 16 Nov 2020 16:16:33 +0200 Subject: fix alarm handling (resolves bugs #4085, #4097). dancer setup - per dancer --- Software/Stubs Collection/stubs/ChangePidDuringRun.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Software/Stubs Collection') diff --git a/Software/Stubs Collection/stubs/ChangePidDuringRun.cs b/Software/Stubs Collection/stubs/ChangePidDuringRun.cs index 4d07cac71..9422e2cdc 100644 --- a/Software/Stubs Collection/stubs/ChangePidDuringRun.cs +++ b/Software/Stubs Collection/stubs/ChangePidDuringRun.cs @@ -8,19 +8,19 @@ using System.Threading; using System.Threading.Tasks; using System.Collections.Generic; using Tango.PMR.Stubs; +using Tango.PMR.Hardware; using Tango.Stubs; public void OnExecute(StubManager stubManager) { +StubHeatingTestRequest stubHeatingTestRequest = new StubHeatingTestRequest(); stubHeatingTestRequest.DryerZone1Temp = 0; stubHeatingTestRequest.DryerZone2Temp = 0; HardwarePidControl hardwarePidControl = new HardwarePidControl(); -hardwarePidControl.HardwarePidControlType = Tango.PMR.Hardware.HardwarePidControlType.FeederMotor; hardwarePidControl.OutputProportionalPowerLimit = 0.5; //Maximal additional power hardwarePidControl.OutputProportionalBand = 5; -hardwarePidControl.IntegralTime = 7000; //Ki hardwarePidControl.DerivativeTime = 0; //Kd hardwarePidControl.SensorCorrectionAdjustment = 0; hardwarePidControl.SensorMinValue = 0; @@ -30,15 +30,19 @@ hardwarePidControl.SetPointControlOutputRate = 0; hardwarePidControl.ControlOutputType = 0.001; ////Dt hardwarePidControl.SsrControlOutputType = 0; hardwarePidControl.OutputOnOffHysteresisValue = 100; //Kp divider -hardwarePidControl.ProcessVariableSamplingRate = 0; -hardwarePidControl.PvInputFilterFactorMode = 6; //averaging the readouts / number of samples +hardwarePidControl.ProcessVariableSamplingRate = 10; +hardwarePidControl.PvInputFilterFactorMode = 4; //averaging the readouts / number of samples hardwarePidControl.OutputProportionalCycleTime = 0; hardwarePidControl.AcHeatersHalfCycleTime = 0; -hardwarePidControl.ProportionalGain = 5000; //Kp hardwarePidControl.PidActive = false; hardwarePidControl.Epsilon = 0; +hardwarePidControl.OutputOnOffHysteresisValue = 100; -stubHeatingTestRequest.HardwarePidControl1 = hardwarePidControl1; +hardwarePidControl.HardwarePidControlType = Tango.PMR.Hardware.HardwarePidControlType.MotorWinder; +hardwarePidControl.IntegralTime = 8000; //Ki +hardwarePidControl.ProportionalGain = 7000; //Kp + +stubHeatingTestRequest.HardwarePidControl1 = hardwarePidControl; StubHeatingTestPollRequest stubHeatingTestPollRequest = new StubHeatingTestPollRequest(); -- cgit v1.3.1