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

Izrael25 : Regulation valve ADC numbers, ver. 2.18.1101

Browse Source
This commit is contained in:
Milan Hanajik
2018-12-18 07:42:21 +01:00
parent d3cd831e03
commit 7d968ba9b4
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/RegulValve/RegulValve.cs
+17 -12
View File
@@ -97,20 +97,9 @@ namespace TBF.BenchControl.Elde.RegulValve
this.dict = new Dictionary<float, float>(); this.dict = new Dictionary<float, float>();
if (Idx1 < ControlBoard.RegValveCalib.GetLength(0))
{
this.ControlBoard.RegValveCalib[Idx1 - 1, 0] = (uint)DacValueClosed;
this.ControlBoard.RegValveCalib[Idx1 - 1, 1] = (uint)DacValueOpen;
}
else
{
log.ErrorFormat("Unable to set {0} ADC levels: RegValveCalib array size={1}, RV Idx1={2}, RV AdcNr={3}",
Name, ControlBoard.RegValveCalib.GetLength(0), Idx1, Idx1 - 1);
}
#if GENESIS #if GENESIS
adcChannel = (Idx1 < 6) ? (Idx1 - 1) : (Idx1 - 2); adcChannel = (Idx1 < 6) ? (Idx1 - 1) : (Idx1 - 2);
#elif SENTEC #elif SENTEC || IZRAEL_25
adcChannel = (Idx1 < 3) ? (Idx1 - 1) : (Idx1 - 2); adcChannel = (Idx1 < 3) ? (Idx1 - 1) : (Idx1 - 2);
#elif CEVAK_200 #elif CEVAK_200
adcChannel = Math.Max(Idx1 - 3, 0); adcChannel = Math.Max(Idx1 - 3, 0);
@@ -118,6 +107,22 @@ namespace TBF.BenchControl.Elde.RegulValve
adcChannel = Idx1 - 1; adcChannel = Idx1 - 1;
#endif #endif
if (Idx1 < ControlBoard.RegValveCalib.GetLength(0))
{
#if IZRAEL_25
this.ControlBoard.RegValveCalib[adcChannel, 0] = (uint)DacValueClosed;
this.ControlBoard.RegValveCalib[adcChannel, 1] = (uint)DacValueOpen;
#else
this.ControlBoard.RegValveCalib[Idx1 - 1, 0] = (uint)DacValueClosed;
this.ControlBoard.RegValveCalib[Idx1 - 1, 1] = (uint)DacValueOpen;
#endif
}
else
{
log.ErrorFormat("Unable to set {0} ADC levels: RegValveCalib array size={1}, RV Idx1={2}, RV AdcNr={3}",
Name, ControlBoard.RegValveCalib.GetLength(0), Idx1, Idx1 - 1);
}
StartChangeHandler(); StartChangeHandler();
log.Debug(this.ToString()); log.Debug(this.ToString());
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1099.0")] [assembly: AssemblyVersion("2.18.1101.0")]
[assembly: AssemblyFileVersion("2.18.1099.0")] [assembly: AssemblyFileVersion("2.18.1101.0")]