Major upgrade
This commit is contained in:
@@ -155,7 +155,7 @@ namespace Raytheon.Instruments
|
||||
/// <param name="moduleName">The module to read</param>
|
||||
/// <returns>THe Power Data</returns>
|
||||
[UmsCommand( "IPowerSupplySystem.ReadPowerData" )]
|
||||
void ReadPowerData( string moduleName, out double voltage, out double voltageSetpoint, out double current, out bool outputStatus, out int faultStatus );
|
||||
void ReadPowerData( string moduleName, out double voltage, out double voltageSetpoint, out double current, out bool isOutputOn, out int faultStatus );
|
||||
|
||||
/// <summary>
|
||||
/// Set the slew rate
|
||||
|
||||
@@ -37,16 +37,16 @@ namespace Raytheon.Instruments.PowerSupply
|
||||
/// <param name="overVoltageProtection"></param>
|
||||
/// <param name="current"></param>
|
||||
/// <param name="overCurrentProtection"></param>
|
||||
/// <param name="outputStatus"></param>
|
||||
/// <param name="isOutputOn"></param>
|
||||
/// <param name="faultStatus"></param>
|
||||
public PowerData(double voltage, double voltageSetpoint, double overVoltageProtection, double current, double overCurrentProtection, bool outputStatus, int faultStatus)
|
||||
public PowerData(double voltage, double voltageSetpoint, double overVoltageProtection, double current, double overCurrentProtection, bool isOutputOn, int faultStatus)
|
||||
{
|
||||
Voltage = voltage;
|
||||
VoltageSetpoint = voltageSetpoint;
|
||||
OverVoltageProtection = overVoltageProtection;
|
||||
Current = current;
|
||||
OverCurrentProtection = overCurrentProtection;
|
||||
OutputStatus = outputStatus;
|
||||
IsOutputOn = isOutputOn;
|
||||
FaultStatus = faultStatus;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace Raytheon.Instruments.PowerSupply
|
||||
/// Getter for the output status
|
||||
/// </summary>
|
||||
[DataMember]
|
||||
public bool OutputStatus { get; set; }
|
||||
public bool IsOutputOn { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Getter for OCP value
|
||||
|
||||
Reference in New Issue
Block a user