DigitalInputs uint --> ulong
This commit is contained in:
@@ -58,7 +58,7 @@ namespace TBF.BenchControl.Elde
|
||||
public float RValvePosition(int rvNr1) { return controlCom.RValvePosition(rvNr1); }
|
||||
public float DivSamples(int ms) { return controlCom.DivSamples(ms); }
|
||||
public int ScopeSamples(int i, int j, int k) { return controlCom.ScopeSamples(i, j, k); }
|
||||
public uint DigitalInputs { get { return controlCom.DigitalInputs; } }
|
||||
public ulong DigitalInputs { get { return controlCom.DigitalInputs; } }
|
||||
public float AnalogInput(int adcNr0) { return controlCom.AnalogInput(adcNr0); }
|
||||
public uint AnalogInputRaw(int adcNr0, int bank) { return controlCom.AnalogInputRaw(adcNr0, bank); } /// adcNr0: 0=RV1, 1=RV2,... bank: 0=RV, 1=Temp
|
||||
public float ReferenceVolume { get { return controlCom.TotalRefVolume; } }
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace TBF.BenchControl.Elde
|
||||
public float RValvePosition(int rvNr1) { return 0; }
|
||||
public float DivSamples(int ms) { return 0; }
|
||||
public int ScopeSamples(int i, int j, int k) { return 0; }
|
||||
public uint DigitalInputs { get { return 0; } }
|
||||
public ulong DigitalInputs { get { return 0; } }
|
||||
public float AnalogInput(int adcNr0) { return 0; }
|
||||
public uint AnalogInputRaw(int adcNr0, int bank) { return 0; } /// bank0=RV, bank1=Temp
|
||||
public float TotalRefVolume { get { return 0; } }
|
||||
|
||||
@@ -64,7 +64,7 @@ namespace TBF.BenchControl.Elde
|
||||
}
|
||||
public float DivSamples(int ms) { return ctrlBrdComponent.DIVSamples[ms, 0]; }
|
||||
public int ScopeSamples(int i, int j, int k) { return ctrlBrdComponent.ScopeSamples[i, j, k]; }
|
||||
public uint DigitalInputs { get { return ctrlBrdComponent.Vstupy; } }
|
||||
public ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } }
|
||||
public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; }
|
||||
public uint AnalogInputRaw(int adcNr0, int bank) { return ctrlBrdComponent.AnalogyRaw[adcNr0, bank]; } /// bank0=RV, bank1=Temp
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.Elde
|
||||
float RValvePosition(int rvNr1);
|
||||
float DivSamples(int ms);
|
||||
int ScopeSamples(int i, int j, int k);
|
||||
uint DigitalInputs { get; }
|
||||
ulong DigitalInputs { get; }
|
||||
float AnalogInput(int adcNr0);
|
||||
uint AnalogInputRaw(int adcNr0, int bank);
|
||||
float TotalRefVolume { get; }
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace TBF.BenchControl.GenericDevices
|
||||
{
|
||||
public interface ISequenceCondition : IComponent
|
||||
{
|
||||
int ConditionsCount;
|
||||
int ConditionsCount { get; }
|
||||
|
||||
/// Returned strings are added to the combo-box
|
||||
string ConditionName(int i);
|
||||
|
||||
Reference in New Issue
Block a user