michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) SENTEC component (24.05.18), (2) SENTEC defines, (3) RegulValve modified for SENTEC, (4) message box shown in case of a fatal error on start-up, ver. 2.18.906

Browse Source
This commit is contained in:
Milan Hanajik
2018-05-30 12:56:45 +02:00
parent 531a728b37
commit dd851fb344
9 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/RegulValve/RegulValve.cs
+18 -11
View File
@@ -29,9 +29,11 @@ namespace TBF.BenchControl.Elde.RegulValve
public int StableTime { get { return RegulValveCfg.StableTime; } } /// 0=200ms, step=50ms, max. 1500ms (max.26)
public int FlowStableSec { get { return RegulValveCfg.FlowStableSec; } } /// 0..60 sec
///
public bool IsCoax { get { return false; } }
public bool IsCoax { get { return false; } }
///
public float Position { get { return ControlBoard.RValvePosition(Idx1); } }
///
int adcChannel;
#region Configuration Change Handling
@@ -71,13 +73,8 @@ namespace TBF.BenchControl.Elde.RegulValve
}
else if (args.Command == CfgChangeCmd.GetAdc1 || args.Command == CfgChangeCmd.GetAdc2)
{
int adc;
#if GENESIS
adc = (int)ControlBoard.AnalogInputRaw((Idx1 < 6) ? (Idx1 - 1) : (Idx1 - 2), 0);
#else
adc = (int)ControlBoard.AnalogInputRaw(Idx1 - 1, 0);
#endif
RegulValveCfgCtrl.OnCmdResponse(this, new CmdResponseArgs(args.Command, Idx1, adc));
int adcValue = (int)ControlBoard.AnalogInputRaw(adcChannel, 0);
RegulValveCfgCtrl.OnCmdResponse(this, new CmdResponseArgs(args.Command, Idx1, adcValue));
}
}
};
@@ -111,7 +108,17 @@ namespace TBF.BenchControl.Elde.RegulValve
Name, ControlBoard.RegValveCalib.GetLength(0), Idx1, Idx1 - 1);
}
log.Debug(this.ToString());
#if GENESIS
adcChannel = (Idx1 < 6) ? (Idx1 - 1) : (Idx1 - 2);
#elif SENTEC
adcChannel = (Idx1 < 3) ? (Idx1 - 1) : (Idx1 - 2);
#else
adcChannel = Idx1 - 1;
#endif
StartChangeHandler();
log.Debug(this.ToString());
}
@@ -121,8 +128,8 @@ namespace TBF.BenchControl.Elde.RegulValve
public void Initialize() { }
public void RunDeviceBefore()
{
int adc = (int)ControlBoard.AnalogInputRaw(Idx1 - 1, 0);
Handlers.OnAdcChanged(this, new CmdResponseArgs(CfgChangeCmd.GetAdc, Idx1, adc));
int adcValue = (int)ControlBoard.AnalogInputRaw(adcChannel, 0);
Handlers.OnAdcChanged(this, new CmdResponseArgs(CfgChangeCmd.GetAdc, Idx1, adcValue));
}
public void RunDeviceAfter() { }
public void StopDevice() { }