Major upgrade
This commit is contained in:
@@ -15,12 +15,14 @@ GOVERNMENT.
|
||||
|
||||
UNPUBLISHED WORK - COPYRIGHT RAYTHEON COMPANY.
|
||||
-------------------------------------------------------------------------*/
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using NLog;
|
||||
using ProgramLib.GUI.Model;
|
||||
using ProgramLib.GUI.View;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
|
||||
namespace ProgramLib
|
||||
{
|
||||
@@ -32,6 +34,7 @@ namespace ProgramLib
|
||||
private enum Events
|
||||
{
|
||||
GLOBAL_QUIT,
|
||||
QUIT,
|
||||
UUT_POWER_ON,
|
||||
UUT_POWER_OFF,
|
||||
|
||||
@@ -41,31 +44,51 @@ namespace ProgramLib
|
||||
}
|
||||
|
||||
private ILogger _logger;
|
||||
private LiveDataWindow _mainWindow;
|
||||
private LiveDataWindow _liveDataWindow;
|
||||
|
||||
private Dictionary<string, PowerModuleDataModel> _powerModuleToPowerDataModelDict = new Dictionary<string, PowerModuleDataModel>();
|
||||
private Dictionary<string, PowerModuleDataModel> _powerModuleToPowerDataModelDict = new Dictionary<string, PowerModuleDataModel>(StringComparer.OrdinalIgnoreCase);
|
||||
int _pollRateMs;
|
||||
private StreamWriter _fileWriter;
|
||||
private List<string> _powerModulesToBeDisplayed = new List<string>();
|
||||
private string _logNamePrefix;
|
||||
private string _logFileExtension;
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
public PowerSupplyUpdateThread()
|
||||
public PowerSupplyUpdateThread(int pollRateMs, string logNamePrefix, string logFileExtension)
|
||||
{
|
||||
_logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
_mainWindow = (LiveDataWindow)ProgramLib.Program.Instance().GetGuiManager()[ProgramGuiManager.WINDOWS.LIVE_DATA];
|
||||
|
||||
_powerModuleToPowerDataModelDict["UUT_P20V"] = new PowerModuleDataModel();
|
||||
_powerModuleToPowerDataModelDict["UUT_N20V"] = new PowerModuleDataModel();
|
||||
|
||||
ProgramLib.Program.Instance().GetGuiManager()[ProgramGuiManager.WINDOWS.LIVE_DATA].Dispatcher.Invoke((Action)delegate
|
||||
try
|
||||
{
|
||||
_mainWindow.LiveDataWindowViewModel.AddPowerData(_powerModuleToPowerDataModelDict);
|
||||
});
|
||||
}
|
||||
_logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
~PowerSupplyUpdateThread()
|
||||
{
|
||||
_logger?.Debug($"Entering {this.GetType().Name}::{System.Reflection.MethodBase.GetCurrentMethod().Name}() ...");
|
||||
_pollRateMs = pollRateMs;
|
||||
|
||||
_logNamePrefix = logNamePrefix;
|
||||
|
||||
_logFileExtension = logFileExtension;
|
||||
|
||||
_liveDataWindow = (LiveDataWindow)ProgramLib.Program.Instance().GuiManager[ProgramGuiManager.WINDOWS.LIVE_DATA];
|
||||
|
||||
ParseConfig();
|
||||
|
||||
foreach (string powerModule in _powerModulesToBeDisplayed)
|
||||
{
|
||||
if (!_powerModuleToPowerDataModelDict.ContainsKey(powerModule))
|
||||
{
|
||||
_powerModuleToPowerDataModelDict[powerModule] = new PowerModuleDataModel();
|
||||
_powerModuleToPowerDataModelDict[powerModule].Name = powerModule;
|
||||
_liveDataWindow.Dispatcher.Invoke((Action)delegate
|
||||
{
|
||||
_liveDataWindow.LiveDataWindowViewModel.AddPowerData(_powerModuleToPowerDataModelDict[powerModule]);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -81,6 +104,7 @@ namespace ProgramLib
|
||||
{
|
||||
Dictionary<Events, EventWaitHandle> eventDict = new Dictionary<Events, EventWaitHandle>();
|
||||
eventDict[Events.GLOBAL_QUIT] = Program.Instance().EventManager[EventManager.Events.GLOBAL_QUIT];
|
||||
eventDict[Events.QUIT] = _quitEvent;
|
||||
eventDict[Events.UUT_POWER_ON] = Program.Instance().EventManager[EventManager.Events.UUT_POWER_ON];
|
||||
eventDict[Events.EVENT_TIMED_OUT] = null;
|
||||
|
||||
@@ -114,47 +138,105 @@ namespace ProgramLib
|
||||
/// <returns></returns>
|
||||
private void UpdatePowerSupplyData()
|
||||
{
|
||||
int pollRateMs = 1000;
|
||||
_logger?.Debug($"{this.GetType().Name}::{System.Reflection.MethodBase.GetCurrentMethod().Name}() is running...");
|
||||
|
||||
try
|
||||
{
|
||||
Dictionary<Events, EventWaitHandle> eventDict = new Dictionary<Events, EventWaitHandle>();
|
||||
eventDict[Events.GLOBAL_QUIT] = Program.Instance().EventManager[EventManager.Events.GLOBAL_QUIT];
|
||||
eventDict[Events.QUIT] = _quitEvent;
|
||||
eventDict[Events.UUT_POWER_OFF] = Program.Instance().EventManager[EventManager.Events.UUT_POWER_OFF];
|
||||
eventDict[Events.EVENT_TIMED_OUT] = null;
|
||||
|
||||
EventGroup<Events, EventWaitHandle> eventGroup = new EventGroup<Events, EventWaitHandle>(eventDict);
|
||||
|
||||
const string LOG_PREFIX = "DateTime,Module,Voltage,VoltageSetpoint,Current,IsOutputOn";
|
||||
string logFilePath = Path.Combine(Program.Instance().FileAndFolderManager.GetFolder(FileAndFolderManager.Folders.DATA_TEST), Util.GenerateUniqueFilenameUsingDateTime(_logNamePrefix, _logFileExtension));
|
||||
_fileWriter = new StreamWriter(logFilePath);
|
||||
_fileWriter.Write(LOG_PREFIX);
|
||||
_fileWriter.Flush();
|
||||
|
||||
while (true)
|
||||
{
|
||||
Events id = eventGroup.WaitAny(pollRateMs);
|
||||
Events id = eventGroup.WaitAny(_pollRateMs);
|
||||
|
||||
if (id == Events.EVENT_TIMED_OUT)
|
||||
{
|
||||
PowerSupplyData data = Program.Instance().PowerSupplySharedData.GetData("STE_PVM_5V");
|
||||
|
||||
if (data != null && data.Initialized)
|
||||
string logText = String.Empty;
|
||||
foreach (string powerModule in Program.Instance().PowerSupplySharedData.GetAllPowerModules())
|
||||
{
|
||||
_powerModuleToPowerDataModelDict["UUT_P20V"].ActualVoltage = data.Voltage.ToString("0.00");
|
||||
_powerModuleToPowerDataModelDict["UUT_P20V"].ExpectedVoltage = data.PowerSupplyModuleInfo.voltageSetpoint_.ToString("0.00");
|
||||
_powerModuleToPowerDataModelDict["UUT_P20V"].ActualCurrent = data.Current.ToString("0.00");
|
||||
PowerSupplyData data = Program.Instance().PowerSupplySharedData.GetData(powerModule);
|
||||
|
||||
if (data != null && data.Initialized)
|
||||
{
|
||||
if (_powerModuleToPowerDataModelDict.ContainsKey(powerModule))
|
||||
{
|
||||
_powerModuleToPowerDataModelDict[powerModule].ActualVoltage = data.Voltage.ToString("0.00");
|
||||
_powerModuleToPowerDataModelDict[powerModule].ExpectedVoltage = data.PowerSupplyModuleInfo.voltageSetpoint_.ToString("0.00");
|
||||
_powerModuleToPowerDataModelDict[powerModule].ActualCurrent = data.Current.ToString("0.00");
|
||||
}
|
||||
}
|
||||
|
||||
if (!String.IsNullOrEmpty(logText))
|
||||
logText += "\r\n";
|
||||
|
||||
logText += DateTime.Now.ToString("yyyy_MM_dd") + "_" + DateTime.Now.ToString("HH_mm_ss") + "," + powerModule + "," + data.Voltage.ToString("0.00") +
|
||||
"," + data.PowerSupplyModuleInfo.voltageSetpoint_.ToString("0.00") + "," + data.Current.ToString("0.00") + "," + data.PowerSupplyModuleInfo.isOn_.ToString();
|
||||
|
||||
_powerModuleToPowerDataModelDict["UUT_N20V"].ActualVoltage = data.Voltage.ToString("0.00");
|
||||
_powerModuleToPowerDataModelDict["UUT_N20V"].ExpectedVoltage = data.PowerSupplyModuleInfo.voltageSetpoint_.ToString("0.00");
|
||||
_powerModuleToPowerDataModelDict["UUT_N20V"].ActualCurrent = data.Current.ToString("0.00");
|
||||
}
|
||||
|
||||
// log out the data
|
||||
_fileWriter.WriteLine(logText);
|
||||
_fileWriter.Flush();
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
_logger.Error(ex.Message + "\n" + ex.StackTrace);
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (_fileWriter != null)
|
||||
{
|
||||
_fileWriter.Flush();
|
||||
_fileWriter.Close();
|
||||
_fileWriter = null;
|
||||
}
|
||||
|
||||
foreach (KeyValuePair<string, PowerModuleDataModel> item in _powerModuleToPowerDataModelDict)
|
||||
{
|
||||
item.Value.ExpectedVoltage = "";
|
||||
item.Value.ActualVoltage = "";
|
||||
item.Value.ActualCurrent = "";
|
||||
}
|
||||
}
|
||||
|
||||
_logger?.Debug($"{this.GetType().Name}::{System.Reflection.MethodBase.GetCurrentMethod().Name}() is exiting...");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Parse ini file
|
||||
/// </summary>
|
||||
public void ParseConfig()
|
||||
{
|
||||
try
|
||||
{
|
||||
List<string> keys = Program.Instance().ProgramSpecificConfig.ReadAllKeys(ProgramSpecificConfigIni.POWER_MODULES_TO_BE_DISPLAYED.ToString());
|
||||
foreach (string key in keys)
|
||||
{
|
||||
string powerSupplyModule = Program.Instance().ProgramSpecificConfig.ReadValue(ProgramSpecificConfigIni.POWER_MODULES_TO_BE_DISPLAYED.ToString(), key);
|
||||
|
||||
if (!_powerModulesToBeDisplayed.Contains(powerSupplyModule, StringComparer.OrdinalIgnoreCase))
|
||||
_powerModulesToBeDisplayed.Add(powerSupplyModule);
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user