Major upgrade
This commit is contained in:
Duc
File diff suppressed because it is too large
Load Diff
@@ -30,73 +30,66 @@
|
||||
// DISTRIBUTION/DISSEMINATION CONTROL: F
|
||||
// POC: Alex Kravchenko (1118268)
|
||||
// **********************************************************************************************************
|
||||
using NLog;
|
||||
using Raytheon.Common;
|
||||
using Raytheon.Units;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.Composition;
|
||||
using System.IO;
|
||||
using System.IO.Ports;
|
||||
using System.Reflection;
|
||||
using NLog;
|
||||
using Raytheon.Common;
|
||||
using Raytheon.Units;
|
||||
|
||||
namespace Raytheon.Instruments
|
||||
{
|
||||
[ExportInstrumentFactory(ModelNumber = "EloadSystemScpiKeysightFactory")]
|
||||
public class EloadSystemScpiKeysightFactory : IInstrumentFactory
|
||||
{
|
||||
/// <summary>
|
||||
/// The supported interfaces
|
||||
/// </summary>
|
||||
private readonly List<Type> _supportedInterfaces = new List<Type>();
|
||||
private ILogger _logger;
|
||||
private readonly IConfigurationManager _configurationManager;
|
||||
private const string DefaultConfigPath = @"C:\ProgramData\Raytheon\InstrumentManagerService";
|
||||
private static string DefaultPath;
|
||||
[ExportInstrumentFactory(ModelNumber = "EloadSystemScpiKeysightFactory")]
|
||||
public class EloadSystemScpiKeysightFactory : IInstrumentFactory
|
||||
{
|
||||
private readonly List<Type> _supportedInterfaces = new List<Type>();
|
||||
|
||||
public EloadSystemScpiKeysightFactory(string defaultConfigPath = DefaultConfigPath)
|
||||
: this(null, defaultConfigPath)
|
||||
{
|
||||
}
|
||||
private readonly IConfigurationManager _configurationManager;
|
||||
private const string DefaultConfigPath = @"C:\ProgramData\Raytheon\InstrumentManagerService";
|
||||
private static string DefaultPath;
|
||||
|
||||
/// <summary>
|
||||
/// COECommDeviceInstrumentFactory injection constructor
|
||||
/// </summary>
|
||||
/// <param name="configManager"></param>
|
||||
/// <param name="simEngine"></param>
|
||||
/// <param name="logger"></param>
|
||||
[ImportingConstructor]
|
||||
public EloadSystemScpiKeysightFactory([Import(AllowDefault = false)] IConfigurationManager configManager,
|
||||
[Import(AllowDefault = true)] string defaultConfigPath = null)
|
||||
{
|
||||
DefaultPath = defaultConfigPath;
|
||||
public EloadSystemScpiKeysightFactory(string defaultConfigPath = DefaultConfigPath)
|
||||
: this(null, defaultConfigPath)
|
||||
{
|
||||
}
|
||||
|
||||
if (LogManager.Configuration == null)
|
||||
{
|
||||
var assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
||||
LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(assemblyFolder + "\\nlog.config");
|
||||
}
|
||||
/// <summary>
|
||||
/// EloadSystemScpiKeysightFactory injection constructor
|
||||
/// </summary>
|
||||
[ImportingConstructor]
|
||||
public EloadSystemScpiKeysightFactory([Import(AllowDefault = false)] IConfigurationManager configManager,
|
||||
[Import(AllowDefault = true)] string defaultConfigPath = null)
|
||||
{
|
||||
DefaultPath = defaultConfigPath;
|
||||
|
||||
_configurationManager = configManager ?? GetConfigurationManager();
|
||||
_supportedInterfaces.Add(typeof(IEload));
|
||||
}
|
||||
/// <summary>
|
||||
/// Gets the instrument
|
||||
/// </summary>
|
||||
/// <param name="name"></param>
|
||||
/// <returns></returns>
|
||||
public IInstrument GetInstrument(string name)
|
||||
{
|
||||
try
|
||||
{
|
||||
_logger = LogManager.GetLogger(name);
|
||||
return new EloadSystemScpiKeysight(name, _configurationManager, _logger);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
if (LogManager.Configuration == null)
|
||||
{
|
||||
var assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
||||
LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(assemblyFolder + "\\nlog.config");
|
||||
}
|
||||
|
||||
_configurationManager = configManager ?? GetConfigurationManager();
|
||||
_supportedInterfaces.Add(typeof(IEload));
|
||||
}
|
||||
/// <summary>
|
||||
/// Gets the instrument
|
||||
/// </summary>
|
||||
/// <param name="name"></param>
|
||||
/// <returns></returns>
|
||||
public IInstrument GetInstrument(string name)
|
||||
{
|
||||
try
|
||||
{
|
||||
return new EloadSystemScpiKeysight(name, _configurationManager);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the instrument
|
||||
@@ -107,9 +100,7 @@ namespace Raytheon.Instruments
|
||||
{
|
||||
try
|
||||
{
|
||||
_logger = LogManager.GetLogger(name);
|
||||
|
||||
return new EloadSystemScpiKeysight(name, _configurationManager, _logger);
|
||||
return new EloadSystemScpiKeysight(name, _configurationManager);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
@@ -122,156 +113,156 @@ namespace Raytheon.Instruments
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public ICollection<Type> GetSupportedInterfaces()
|
||||
{
|
||||
return _supportedInterfaces.ToArray();
|
||||
}
|
||||
{
|
||||
return _supportedInterfaces.ToArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// returns configuration based on the predefined path or default path c:/ProgramData/Raytheon/InstrumentManagerService
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private static IConfigurationManager GetConfigurationManager()
|
||||
{
|
||||
return string.IsNullOrEmpty(DefaultPath) ? new RaytheonConfigurationManager() : new RaytheonConfigurationManager(DefaultPath);
|
||||
}
|
||||
/// <summary>
|
||||
/// returns configuration based on the predefined path or default path c:/ProgramData/Raytheon/InstrumentManagerService
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private static IConfigurationManager GetConfigurationManager()
|
||||
{
|
||||
return string.IsNullOrEmpty(DefaultPath) ? new RaytheonConfigurationManager() : new RaytheonConfigurationManager(DefaultPath);
|
||||
}
|
||||
|
||||
|
||||
#region PrivateFuctions
|
||||
/// <summary>
|
||||
/// Parses the power controller ini file.
|
||||
/// This ini file defines the number of power systems/modules that this controller will manage.
|
||||
/// Upon parsing the file, this function populates this class members with the ini file information
|
||||
/// </summary>
|
||||
private static IELoadSystem CreateEloadSystemInstrument(string instrumentDefFile, string iniSectionName, bool isThereHardware)
|
||||
{
|
||||
const char COMMA_DELIM = ',';
|
||||
#region PrivateFuctions
|
||||
/// <summary>
|
||||
/// Parses the power controller ini file.
|
||||
/// This ini file defines the number of power systems/modules that this controller will manage.
|
||||
/// Upon parsing the file, this function populates this class members with the ini file information
|
||||
/// </summary>
|
||||
private static IELoadSystem CreateEloadSystemInstrument(string instrumentDefFile, string iniSectionName, bool isThereHardware)
|
||||
{
|
||||
const char COMMA_DELIM = ',';
|
||||
|
||||
// interface types
|
||||
const string GPIB = "GPIB";
|
||||
const string RS232 = "232";
|
||||
// interface types
|
||||
const string GPIB = "GPIB";
|
||||
const string RS232 = "232";
|
||||
|
||||
// system
|
||||
const string BOARD_NUMBER_KEY = "BOARD_NUMBER";
|
||||
const string INTERFACE_KEY = "INTERFACE";
|
||||
const string ADDRESS_KEY = "ADDRESS";
|
||||
const string BAUD_RATE = "BAUD_RATE";
|
||||
const string PARITY = "PARITY";
|
||||
const string DATA_BITS = "DATA_BITS";
|
||||
const string STOP_BITS = "STOP_BITS";
|
||||
const string FLOW_CONTROL = "FLOW_CONTROL";
|
||||
const string MODULE_DEFINITION_KEY = "MODULE_DEFINITION";
|
||||
// system
|
||||
const string BOARD_NUMBER_KEY = "BOARD_NUMBER";
|
||||
const string INTERFACE_KEY = "INTERFACE";
|
||||
const string ADDRESS_KEY = "ADDRESS";
|
||||
const string BAUD_RATE = "BAUD_RATE";
|
||||
const string PARITY = "PARITY";
|
||||
const string DATA_BITS = "DATA_BITS";
|
||||
const string STOP_BITS = "STOP_BITS";
|
||||
const string FLOW_CONTROL = "FLOW_CONTROL";
|
||||
const string MODULE_DEFINITION_KEY = "MODULE_DEFINITION";
|
||||
|
||||
// modules
|
||||
const string MODE = "MODE";
|
||||
const string CHANNEL_NUM = "CHANNEL_NUM";
|
||||
const string SETPOINT_VALUE = "SETPOINT_VALUE";
|
||||
const string OCP = "OVER_CURRENT_PROTECTION";
|
||||
const string OVP = "OVER_VOLTAGE_PROTECTION";
|
||||
// modules
|
||||
const string MODE = "MODE";
|
||||
const string CHANNEL_NUM = "CHANNEL_NUM";
|
||||
const string SETPOINT_VALUE = "SETPOINT_VALUE";
|
||||
const string OCP = "OVER_CURRENT_PROTECTION";
|
||||
const string OVP = "OVER_VOLTAGE_PROTECTION";
|
||||
|
||||
IniFile iniReader = new IniFile(instrumentDefFile);
|
||||
IniFile iniReader = new IniFile(instrumentDefFile);
|
||||
|
||||
// pull out the address and the list of definitions
|
||||
string interfaceType = iniReader.ReadValue(iniSectionName, INTERFACE_KEY);
|
||||
string[] moduleDefinitionList = null;
|
||||
IELoadSystem loadSystem = null;
|
||||
if (interfaceType.ToUpper() == GPIB)
|
||||
{
|
||||
int gpibBoardNumber = Convert.ToInt32(iniReader.ReadValue(iniSectionName, BOARD_NUMBER_KEY));
|
||||
byte gpibAddress = Convert.ToByte(iniReader.ReadValue(iniSectionName, ADDRESS_KEY));
|
||||
string moduleDefinitionSections = iniReader.ReadValue(iniSectionName, MODULE_DEFINITION_KEY);
|
||||
moduleDefinitionList = moduleDefinitionSections.Split(COMMA_DELIM);
|
||||
// pull out the address and the list of definitions
|
||||
string interfaceType = iniReader.ReadValue(iniSectionName, INTERFACE_KEY);
|
||||
string[] moduleDefinitionList = null;
|
||||
IELoadSystem loadSystem = null;
|
||||
if (interfaceType.ToUpper() == GPIB)
|
||||
{
|
||||
int gpibBoardNumber = Convert.ToInt32(iniReader.ReadValue(iniSectionName, BOARD_NUMBER_KEY));
|
||||
byte gpibAddress = Convert.ToByte(iniReader.ReadValue(iniSectionName, ADDRESS_KEY));
|
||||
string moduleDefinitionSections = iniReader.ReadValue(iniSectionName, MODULE_DEFINITION_KEY);
|
||||
moduleDefinitionList = moduleDefinitionSections.Split(COMMA_DELIM);
|
||||
|
||||
loadSystem = new EloadSystemScpiKeysight(iniSectionName, gpibBoardNumber, gpibAddress, isThereHardware);
|
||||
loadSystem = new EloadSystemScpiKeysight(iniSectionName, gpibBoardNumber, gpibAddress, isThereHardware);
|
||||
|
||||
}
|
||||
else if (interfaceType.ToUpper() == RS232)
|
||||
{
|
||||
string eloadSystemComAddress = iniReader.ReadValue(iniSectionName, ADDRESS_KEY);
|
||||
int eloadSystemComBaudRate = Convert.ToInt32(iniReader.ReadValue(iniSectionName, BAUD_RATE));
|
||||
Parity eloadSystemComParity = (Parity)Enum.Parse(typeof(Parity), iniReader.ReadValue(iniSectionName, PARITY));
|
||||
int eloadSystemComDataBits = Convert.ToInt32(iniReader.ReadValue(iniSectionName, DATA_BITS));
|
||||
Handshake flowControl = (Handshake)Enum.Parse(typeof(Handshake), iniReader.ReadValue(iniSectionName, FLOW_CONTROL));
|
||||
StopBits eloadSystemComStopBits = (StopBits)Enum.Parse(typeof(StopBits), iniReader.ReadValue(iniSectionName, STOP_BITS));
|
||||
}
|
||||
else if (interfaceType.ToUpper() == RS232)
|
||||
{
|
||||
string eloadSystemComAddress = iniReader.ReadValue(iniSectionName, ADDRESS_KEY);
|
||||
int eloadSystemComBaudRate = Convert.ToInt32(iniReader.ReadValue(iniSectionName, BAUD_RATE));
|
||||
Parity eloadSystemComParity = (Parity)Enum.Parse(typeof(Parity), iniReader.ReadValue(iniSectionName, PARITY));
|
||||
int eloadSystemComDataBits = Convert.ToInt32(iniReader.ReadValue(iniSectionName, DATA_BITS));
|
||||
Handshake flowControl = (Handshake)Enum.Parse(typeof(Handshake), iniReader.ReadValue(iniSectionName, FLOW_CONTROL));
|
||||
StopBits eloadSystemComStopBits = (StopBits)Enum.Parse(typeof(StopBits), iniReader.ReadValue(iniSectionName, STOP_BITS));
|
||||
|
||||
string moduleDefinitionSections = iniReader.ReadValue(iniSectionName, MODULE_DEFINITION_KEY);
|
||||
moduleDefinitionList = moduleDefinitionSections.Split(COMMA_DELIM);
|
||||
string moduleDefinitionSections = iniReader.ReadValue(iniSectionName, MODULE_DEFINITION_KEY);
|
||||
moduleDefinitionList = moduleDefinitionSections.Split(COMMA_DELIM);
|
||||
|
||||
loadSystem = new EloadSystemScpiKeysight(iniSectionName, eloadSystemComAddress, eloadSystemComBaudRate, eloadSystemComParity, eloadSystemComDataBits, eloadSystemComStopBits, flowControl, isThereHardware);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("EloadMeasurementInstruments::CreateEloadSystemInstrument() - Invalid Interface type in ini file. Ini file contained: " + interfaceType + ", supported types are: " + GPIB + "," + RS232);
|
||||
}
|
||||
loadSystem = new EloadSystemScpiKeysight(iniSectionName, eloadSystemComAddress, eloadSystemComBaudRate, eloadSystemComParity, eloadSystemComDataBits, eloadSystemComStopBits, flowControl, isThereHardware);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("EloadMeasurementInstruments::CreateEloadSystemInstrument() - Invalid Interface type in ini file. Ini file contained: " + interfaceType + ", supported types are: " + GPIB + "," + RS232);
|
||||
}
|
||||
|
||||
foreach (string module in moduleDefinitionList)
|
||||
{
|
||||
string trimmedModuleName = module.TrimStart(' ');
|
||||
trimmedModuleName = trimmedModuleName.TrimEnd(' ');
|
||||
foreach (string module in moduleDefinitionList)
|
||||
{
|
||||
string trimmedModuleName = module.TrimStart(' ');
|
||||
trimmedModuleName = trimmedModuleName.TrimEnd(' ');
|
||||
|
||||
int modeTemp = Convert.ToInt32(iniReader.ReadValue(trimmedModuleName, MODE));
|
||||
int channelNumber = Convert.ToInt32(iniReader.ReadValue(trimmedModuleName, CHANNEL_NUM));
|
||||
double setpoint = Convert.ToDouble(iniReader.ReadValue(trimmedModuleName, SETPOINT_VALUE));
|
||||
double ocp = Convert.ToDouble(iniReader.ReadValue(trimmedModuleName, OCP));
|
||||
double ovp = Convert.ToDouble(iniReader.ReadValue(trimmedModuleName, OVP));
|
||||
int modeTemp = Convert.ToInt32(iniReader.ReadValue(trimmedModuleName, MODE));
|
||||
int channelNumber = Convert.ToInt32(iniReader.ReadValue(trimmedModuleName, CHANNEL_NUM));
|
||||
double setpoint = Convert.ToDouble(iniReader.ReadValue(trimmedModuleName, SETPOINT_VALUE));
|
||||
double ocp = Convert.ToDouble(iniReader.ReadValue(trimmedModuleName, OCP));
|
||||
double ovp = Convert.ToDouble(iniReader.ReadValue(trimmedModuleName, OVP));
|
||||
|
||||
EloadModuleMode mode;
|
||||
EloadModuleMode mode;
|
||||
|
||||
if (modeTemp == 0)
|
||||
{
|
||||
mode = EloadModuleMode.RESISTANCE;
|
||||
}
|
||||
else if (modeTemp == 1)
|
||||
{
|
||||
mode = EloadModuleMode.VOLTAGE;
|
||||
}
|
||||
else if (modeTemp == 2)
|
||||
{
|
||||
mode = EloadModuleMode.CURRENT;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("EloadMeasurementInstruments::CreateEloadSystemInstrument() - Invalid mode input: " + modeTemp.ToString());
|
||||
}
|
||||
if (modeTemp == 0)
|
||||
{
|
||||
mode = EloadModuleMode.RESISTANCE;
|
||||
}
|
||||
else if (modeTemp == 1)
|
||||
{
|
||||
mode = EloadModuleMode.VOLTAGE;
|
||||
}
|
||||
else if (modeTemp == 2)
|
||||
{
|
||||
mode = EloadModuleMode.CURRENT;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("EloadMeasurementInstruments::CreateEloadSystemInstrument() - Invalid mode input: " + modeTemp.ToString());
|
||||
}
|
||||
|
||||
loadSystem.AddEloadChannel(trimmedModuleName.ToUpper(), channelNumber, mode, setpoint, Current.FromAmps(ocp), Voltage.FromVolts(ovp));
|
||||
}
|
||||
loadSystem.AddEloadChannel(trimmedModuleName.ToUpper(), channelNumber, mode, setpoint, Current.FromAmps(ocp), Voltage.FromVolts(ovp));
|
||||
}
|
||||
|
||||
return loadSystem;
|
||||
}
|
||||
#endregion
|
||||
return loadSystem;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PublicFuctions
|
||||
public static List<IELoadSystem> CreateEloadSystemInstrument(string instrumentDefFile, bool isThereHardware)
|
||||
{
|
||||
const string KEYSIGHT_ELOAD_SCPI = "KEYSIGHT_SCPI_ELOAD_SYSTEM";
|
||||
#region PublicFuctions
|
||||
public static List<IELoadSystem> CreateEloadSystemInstrument(string instrumentDefFile, bool isThereHardware)
|
||||
{
|
||||
const string KEYSIGHT_ELOAD_SCPI = "KEYSIGHT_SCPI_ELOAD_SYSTEM";
|
||||
|
||||
List<IELoadSystem> loadSystemsToReturn = new List<IELoadSystem>();
|
||||
List<IELoadSystem> loadSystemsToReturn = new List<IELoadSystem>();
|
||||
|
||||
IniFile iniReader = new IniFile(instrumentDefFile);
|
||||
IniFile iniReader = new IniFile(instrumentDefFile);
|
||||
|
||||
List<string> loadSystemsToCreateKeys = iniReader.ReadAllKeys("ELOAD_SYSTEMS_TO_CREATE");
|
||||
List<string> loadSystemsToCreateKeys = iniReader.ReadAllKeys("ELOAD_SYSTEMS_TO_CREATE");
|
||||
|
||||
foreach (string loadSystemName in loadSystemsToCreateKeys)
|
||||
{
|
||||
string loadSystemType = iniReader.ReadValue("ELOAD_SYSTEMS_TO_CREATE", loadSystemName);
|
||||
foreach (string loadSystemName in loadSystemsToCreateKeys)
|
||||
{
|
||||
string loadSystemType = iniReader.ReadValue("ELOAD_SYSTEMS_TO_CREATE", loadSystemName);
|
||||
|
||||
if (loadSystemType.ToUpper() == KEYSIGHT_ELOAD_SCPI.ToUpper())
|
||||
{
|
||||
IELoadSystem loadSystem = CreateEloadSystemInstrument(instrumentDefFile, loadSystemName, isThereHardware);
|
||||
if (loadSystemType.ToUpper() == KEYSIGHT_ELOAD_SCPI.ToUpper())
|
||||
{
|
||||
IELoadSystem loadSystem = CreateEloadSystemInstrument(instrumentDefFile, loadSystemName, isThereHardware);
|
||||
|
||||
loadSystemsToReturn.Add(loadSystem);
|
||||
}
|
||||
else
|
||||
{
|
||||
string errorMsg = "EloadMeasurementInstruments::CreateEloadSystemInstrument() - Unsupported ELoad instrument: " + loadSystemName + "\n";
|
||||
errorMsg += "Supported instrument are: " + KEYSIGHT_ELOAD_SCPI;
|
||||
throw new Exception(errorMsg);
|
||||
}
|
||||
}
|
||||
loadSystemsToReturn.Add(loadSystem);
|
||||
}
|
||||
else
|
||||
{
|
||||
string errorMsg = "EloadMeasurementInstruments::CreateEloadSystemInstrument() - Unsupported ELoad instrument: " + loadSystemName + "\n";
|
||||
errorMsg += "Supported instrument are: " + KEYSIGHT_ELOAD_SCPI;
|
||||
throw new Exception(errorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
return loadSystemsToReturn;
|
||||
}
|
||||
#endregion
|
||||
return loadSystemsToReturn;
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user