diff --git a/Common/CommonCore/Consts/StatusReturn.cs b/Common/CommonCore/Consts/StatusReturn.cs index 702d4c77..2949692a 100644 --- a/Common/CommonCore/Consts/StatusReturn.cs +++ b/Common/CommonCore/Consts/StatusReturn.cs @@ -31,7 +31,12 @@ Warning, /// - /// the measurement is out of range + /// the measurement is 'in-range' for threshold cheks + /// + MeasurementInRange, + + /// + /// the measurement is out of range for threshold checks /// MeasurementOutOfRange } diff --git a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Config/FM2014Config.cs b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Config/FM2014Config.cs index decb4c1f..fb89be01 100644 --- a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Config/FM2014Config.cs +++ b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Config/FM2014Config.cs @@ -18,10 +18,23 @@ using Xylem.Common.CommonCore.Consts; namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Config { /// - /// Configuration of the FM2014 on local machine: - /// - Setup communication with serial com-port. + /// Configuration of the FM2014 on local machine to survive a restart of the FM2014 programs: + /// - Access or create the FM2014 configuration file from the 'C:\ProgramData\FM2014' directory as this is depending + /// on the setup of the test-bench and should be accessible for every user without the need of re-adjustment of + /// these settings, + /// - Set up the shared communication port number, + /// - Set up the baudrate, + /// - Set up the last used address for the 'MiniPrf', + /// - Set up a common current-output-tolerance-display-range ( 3 % or 5 %), + /// - Set up an individual current-output-tolerance-display-range ( 3 % or 5 %) for the 'FM2014TestApp', + /// - Set up the selected (active) slots for the 'FM2014TestApp', + /// - Set up the 'RefPulsesRequired' for the calibration measurement the 'FM2014TestApp' for user convenience, + /// - Set up the 'DefPulsesRequired' for the calibration measurement the 'FM2014TestApp' for user convenience, + /// - Set up the 'DutToRefToleranceMax' for the calibration measurement the 'FM2014TestApp' for user convenience, + /// - Set up the 'DutToRefToleranceMin' for the calibration measurement the 'FM2014TestApp' for user convenience, + /// - Set up the 'DoublePulseDeadtime' for the calibration measurement the 'FM2014TestApp' for user convenience. /// - /// + /// /// - Initial. /// public class FM2014Config @@ -30,22 +43,23 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Config /// /// Comport for the FM2014 /// - public String SerialPort { get; set; } - - /// - /// Address of the FM2014 - /// - public Int32? Address { get; set; } - - /// - /// Address of the FM2014 - /// - public Int32? TolerancePercent { get; set; } + public String SharedSerialPort { get; set; } /// /// Address of the FM2014 /// - public List IndividualTolerancePercent { get; set; } + public Int32? Address { get; set; } + + /// + /// Address of the FM2014 + /// + public Int32 CommonCurrentOutputDisplayRangeNominal_percent { get; set; } = 3; + + + /// + /// Address of the FM2014 + /// + public List IndividualCurrentOutputDisplayRangeNominal_percent { get; set; } /// @@ -67,11 +81,11 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Config /// Backup DUT pulses for calibration measurement to simplify manual setup /// public UInt16 DutPulsesRequired { get; set; } = 50; - + /// /// Backup double pulses detection deadtime for calibration measurement to simplify manual setup /// - public UInt16 DoublePulseDeadtime { get; set; } + public UInt16 DoublePulseDeadtime { get; set; } /// /// Backup tolerance maximal value for calibration measurement threshold check to simplify manual setup @@ -86,18 +100,15 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Config #region methods /// - /// Load FM2014 configuration file from AppRoaming or working directory + /// Load the FM2014 configuration file from the 'C:\ProgramData\FM2014' directory /// - /// + /// /// - Initial. /// - /// - /// - Support multiple FM2014 with shared port but slot selected and individual tolerance. - /// public Boolean ReadFM2014Config() { // Check for AppRoaming - var configFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + var configFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), nameof(FM2014), ProgramConfig.FM2014ConfigFileName); if (!File.Exists(configFile)) @@ -106,11 +117,13 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Config using (var tr = new StreamReader(configFile)) { var fm2014Setup = JsonConvert.DeserializeObject(tr.ReadToEnd()); - SerialPort = fm2014Setup.SerialPort; + SharedSerialPort = fm2014Setup.SharedSerialPort; Address = fm2014Setup.Address; - TolerancePercent = fm2014Setup.TolerancePercent; + CommonCurrentOutputDisplayRangeNominal_percent = + fm2014Setup.CommonCurrentOutputDisplayRangeNominal_percent; Baudrate = fm2014Setup.Baudrate; - IndividualTolerancePercent = fm2014Setup.IndividualTolerancePercent; + IndividualCurrentOutputDisplayRangeNominal_percent = + fm2014Setup.IndividualCurrentOutputDisplayRangeNominal_percent; SlotIsSelected = fm2014Setup.SlotIsSelected; RefPulsesRequired = fm2014Setup.RefPulsesRequired; DutPulsesRequired = fm2014Setup.DutPulsesRequired; @@ -123,19 +136,19 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Config } /// - /// Write file to AppRoaming + /// Store the FM2014 configuration file from the 'C:\ProgramData\FM2014' directory /// - /// + /// /// - Initial. /// public void Update() { - var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), nameof(FM2014)); if (!Directory.Exists(path)) Directory.CreateDirectory(path); - + var configFile = Path.Combine(path, ProgramConfig.FM2014ConfigFileName); File.WriteAllText(configFile, JsonConvert.SerializeObject(this)); diff --git a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs index df224b43..32ccf90f 100644 --- a/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs +++ b/Common/Hardware/WaterMeter/MechanicalMeter/FM2014/FM2014Core/FM2014.cs @@ -87,24 +87,12 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core /// /// Default tolerance if not properly setup. /// - public const Int32 CURRENT_OUTPUT_TOLERANCE_STANDARD_NOMINAL_INT_percent = 3; + public const Int32 CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent = 3; /// /// Default tolerance if not properly setup. /// - public const Int32 CURRENT_OUTPUT_TOLERANCE_EXTENDED_VALUE_INT_percent = 5; - - /// - /// Standard tolerance (nominal 3 %) multiplicator for calculation of value based on feedback from FM2014 - /// (+/- 255 digits). - /// - private const Double CURRENT_OUTPUT_TOLERANCE_STANDARD_VALUE_DOUBLE_percent = 3.3; - - /// - /// Extended tolerance (nominal 5 %) multiplicator for calculation of value based on feedback from FM2014 - /// (+/- 255 digits). - /// - private const Double CURRENT_OUTPUT_TOLERANCE_EXTENDED_VALUE_DOUBLE_percent = 5.5; + public const Int32 CURRENT_OUTPUT_DISPLAY_RANGE_EXTENDED_NOMINAL_percent = 5; /// /// Resolution of tolerance raw value feedback from FM2014 (+/- 255 digits). @@ -349,35 +337,35 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core /// /// Private tolerance percentage /// - private Int32 _currentOutputToleranceNominalInt_percent = CURRENT_OUTPUT_TOLERANCE_STANDARD_NOMINAL_INT_percent; + private Int32 _currentOutputDisplayRangeNominal_percent = CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent; /// /// Actual tolerance scale to convert raw value from FM2014 to percent /// - private Double CurrentOutputToleranceNominalToRealScale { set; get; } = - CURRENT_OUTPUT_TOLERANCE_STANDARD_VALUE_DOUBLE_percent / CURRENT_OUTPUT_TOLERANCE_RESOLUTION_PLUS_MINUS_BYTE; + private Double CurrentOutputDisplayRangeNominalToRealScale { set; get; } = + 1.1 * CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent / CURRENT_OUTPUT_TOLERANCE_RESOLUTION_PLUS_MINUS_BYTE; /// /// Nominal tolerance output of current loop in percent: /// - hardware dependent 3% or 5% /// - public Int32 CurrentOutputToleranceNominalInt_percent + public Int32 CurrentOutputDisplayRangeNominal_percent { - get => _currentOutputToleranceNominalInt_percent; + get => _currentOutputDisplayRangeNominal_percent; set { // Limit input to discrete nominal setting of 3 or 5 %, // Internally those values are going to be scaled for higher resolution to 3.3 or 5.5 Double percentage; - if (value == CURRENT_OUTPUT_TOLERANCE_STANDARD_NOMINAL_INT_percent) - percentage = CURRENT_OUTPUT_TOLERANCE_STANDARD_VALUE_DOUBLE_percent; - else if (value == CURRENT_OUTPUT_TOLERANCE_EXTENDED_VALUE_INT_percent) - percentage = CURRENT_OUTPUT_TOLERANCE_EXTENDED_VALUE_DOUBLE_percent; + if (value == CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent) + percentage = 1.1 * CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent; + else if (value == CURRENT_OUTPUT_DISPLAY_RANGE_EXTENDED_NOMINAL_percent) + percentage = 1.1 * CURRENT_OUTPUT_DISPLAY_RANGE_EXTENDED_NOMINAL_percent; else - percentage = CURRENT_OUTPUT_TOLERANCE_STANDARD_VALUE_DOUBLE_percent; + percentage = 1.1 * CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent; - _currentOutputToleranceNominalInt_percent = value; - CurrentOutputToleranceNominalToRealScale = percentage / CURRENT_OUTPUT_TOLERANCE_RESOLUTION_PLUS_MINUS_BYTE; + _currentOutputDisplayRangeNominal_percent = value; + CurrentOutputDisplayRangeNominalToRealScale = percentage / CURRENT_OUTPUT_TOLERANCE_RESOLUTION_PLUS_MINUS_BYTE; } } @@ -393,7 +381,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core public UInt32 RefPulsesRequired { get => _refPulsesRequired; - private set + set { // Check limits and equality if (value < PULSES_TIME_MEASUREMENT_INPUT_MIN || @@ -412,7 +400,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core public UInt32 DutPulsesRequired { get => _dutPulsesRequired; - private set + set { // Check limits and equality if (value < PULSES_TIME_MEASUREMENT_INPUT_MIN || @@ -586,7 +574,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core public Byte CurrentOutputAttenuation { get => _currentOutputAttenuation; - private set + set { if (value < CURRENT_OUTPUT_ATTENUATION_MIN || value > CURRENT_OUTPUT_ATTENUATION_MAX) @@ -603,7 +591,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core public UInt16 DoublePulseDeadtime_ms { get => _doublePulseDeadtime_ms; - private set + set { if (value > DOUBLE_PULSE_DEADTIME_MAX_ms) return; @@ -1167,14 +1155,14 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core if (Read(cmdName, fm2014, out _, out _, out var doubleValue)) { fm2014.DutToRefToleranceMeasured_percent = doubleValue * - fm2014.CurrentOutputToleranceNominalToRealScale; + fm2014.CurrentOutputDisplayRangeNominalToRealScale; var response = new CmdResponse(cmdName, info, doubleValue: fm2014.DutToRefToleranceMeasured_percent, unit: Units.GetInfo(Units.Name.PERCENT)); // Check the threshold for OOR if (Math.Abs((Double)fm2014.DutToRefToleranceMeasured_percent) > - fm2014.CurrentOutputToleranceNominalInt_percent) + fm2014.CurrentOutputDisplayRangeNominal_percent) statusReturn = StatusReturn.MeasurementOutOfRange; else statusReturn = StatusReturn.Okay; @@ -1590,7 +1578,7 @@ namespace Sensus.Common.Hardware.WaterMeter.MechanicalMeter.FM2014.FM2014Core fm2014.DutToRefToleranceMeasured_percent < fm2014.DutToRefCalibrationToleranceMin_percent) statusReturn = StatusReturn.MeasurementOutOfRange; - else statusReturn = StatusReturn.Okay; + else statusReturn = StatusReturn.MeasurementInRange; var response = new CmdResponse(cmdName, info, doubleValue: fm2014.DutToRefToleranceMeasured_percent, diff --git a/FM2014TestApp/Ui/Fm2014sTest/FM2014TestBenchWindow.xaml b/FM2014TestApp/Ui/Fm2014sTest/FM2014TestBenchWindow.xaml index e4265026..d2ee94dd 100644 --- a/FM2014TestApp/Ui/Fm2014sTest/FM2014TestBenchWindow.xaml +++ b/FM2014TestApp/Ui/Fm2014sTest/FM2014TestBenchWindow.xaml @@ -23,7 +23,7 @@ - /// + /// /// - Initial. /// - private void cbxToleranceCalc_SelectedIndexChanged(Object sender, EventArgs e) + private void cbxToleranceDisplayRange_SelectedIndexChanged(Object sender, EventArgs e) { var firstFm2014 = FM2014.GetFirstConnectedAndLoggedInFm2014(); @@ -1548,13 +1573,13 @@ namespace Sensus.Ui.FM2014TestBench Dispatcher.Invoke(() => { - if (byte.TryParse(cbxToleranceCalc.SelectedItem.ToString(), out var tolerance) && - (tolerance == FM2014.CURRENT_OUTPUT_TOLERANCE_STANDARD_NOMINAL_INT_percent || - tolerance == FM2014.CURRENT_OUTPUT_TOLERANCE_EXTENDED_VALUE_INT_percent) && - firstFm2014.CurrentOutputToleranceNominalInt_percent != tolerance) + if (byte.TryParse(cbxToleranceDisplayRange.SelectedItem.ToString(), out var tolerance) && + (tolerance == FM2014.CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent || + tolerance == FM2014.CURRENT_OUTPUT_DISPLAY_RANGE_EXTENDED_NOMINAL_percent) && + firstFm2014.CurrentOutputDisplayRangeNominal_percent != tolerance) { - _regulationSetupHasChanged = true; - btnSaveRegulationSetup.IsEnabled = true; + _programConfigSetupHasChanged = true; + firstFm2014.CurrentOutputDisplayRangeNominal_percent = tolerance; } }); } @@ -1567,12 +1592,12 @@ namespace Sensus.Ui.FM2014TestBench /// /// - Initial. /// - private void cbxAttenuation_KeyDown(Object sender, KeyEventArgs e) + private void cbxToleranceDisplayAttenuation_KeyDown(Object sender, KeyEventArgs e) { // Catch the enter key, recalculate all settings if (e.Key == Key.Enter || e.Key == Key.Tab) { - Keyboard.Focus(cbxToleranceCalc); + Keyboard.Focus(cbxToleranceDisplayRange); } } @@ -1583,7 +1608,7 @@ namespace Sensus.Ui.FM2014TestBench /// /// - Initial. /// - private void cbxAttenuation_SelectedIndexChanged(Object sender, EventArgs e) + private void cbxToleranceDisplayAttenuation_SelectedIndexChanged(Object sender, EventArgs e) { var firstFm2014 = FM2014.GetFirstConnectedAndLoggedInFm2014(); @@ -1592,13 +1617,17 @@ namespace Sensus.Ui.FM2014TestBench Dispatcher.Invoke(() => { - if (byte.TryParse(cbxDisplayAttenuation.SelectedItem.ToString(), out var attenuation) && + if (byte.TryParse(cbxToleranceDisplayAttenuation.SelectedItem.ToString(), out var attenuation) && attenuation >= FM2014.CURRENT_OUTPUT_ATTENUATION_MIN && attenuation <= FM2014.CURRENT_OUTPUT_ATTENUATION_MAX && firstFm2014.CurrentOutputAttenuation != attenuation) { - _regulationSetupHasChanged = true; - btnSaveRegulationSetup.IsEnabled = true; + foreach (var fm2014 in FM2014.RegisteredFm2014s) + { + fm2014.CurrentOutputAttenuation = attenuation; + } + _fm2014RegulationSetupHasChanged = true; + UiElmEnable(btnSaveSetupToFm2014, true); } }); } @@ -1608,15 +1637,15 @@ namespace Sensus.Ui.FM2014TestBench /// These values can be setup before any connection to the FM2014 has been established. Therefore, those /// settings have to be remembered within this object. /// - /// + /// /// - Initial. /// - private void cbxFM2014BaseSettings_SelectedValueChanged(Object sender, EventArgs e) + private void cbxProgramComPort_SelectedValueChanged(Object sender, EventArgs e) { - if (_comPortIdx != cbxFM2014ComPort.SelectedIndex) + if (_comPortIdx != cbxProgramComPort.SelectedIndex) { - _comPortIdx = cbxFM2014ComPort.SelectedIndex; - StoreFM2014SettingsToConfigFile(); + _comPortIdx = cbxProgramComPort.SelectedIndex; + _programConfigSetupHasChanged = true; } } @@ -1629,12 +1658,12 @@ namespace Sensus.Ui.FM2014TestBench /// /// - Initial. /// - private void btnSaveRegulationSetup_Click(Object sender, EventArgs e) + private void btnSaveSetupToFm2014_Click(Object sender, EventArgs e) { if (FM2014.StoreAllConfigurations()) { - _regulationSetupHasChanged = false; - UiElmEnable(btnSaveRegulationSetup, false); + _fm2014RegulationSetupHasChanged = false; + UiElmEnable(btnSaveSetupToFm2014, false); } } @@ -1770,7 +1799,7 @@ namespace Sensus.Ui.FM2014TestBench /// /// /// - /// + /// /// - Initial. /// private void tbxRefPulsesRequired_LostFocus(Object sender, EventArgs e) @@ -1795,7 +1824,11 @@ namespace Sensus.Ui.FM2014TestBench FM2014.PULSES_TIME_MEASUREMENT_INPUT_MAX >= pulses) { if (backupPulsesRequired != pulses) - _calibrationSetupHasChanged = true; + { + _programCalibrationSetupHasChanged = true; + // Preset to fill the configuration file storage ability + firstFm2014.RefPulsesRequired = (UInt32)pulses; + } tbxRefPulsesRequired.Background = ColorStandardInputField; } @@ -1864,7 +1897,7 @@ namespace Sensus.Ui.FM2014TestBench /// /// /// - /// + /// /// - Initial. /// private void tbxDutPulsesRequired_LostFocus(Object sender, EventArgs e) @@ -1889,8 +1922,11 @@ namespace Sensus.Ui.FM2014TestBench FM2014.PULSES_TIME_MEASUREMENT_INPUT_MIN <= pulses && FM2014.PULSES_TIME_MEASUREMENT_INPUT_MAX >= pulses) { - if (backupPulsesRequired != pulses) - _calibrationSetupHasChanged = true; + if (backupPulsesRequired != pulses){ + _programCalibrationSetupHasChanged = true; + // Preset to fill the configuration file storage ability + firstFm2014.DutPulsesRequired = (UInt32)pulses; + } tbxDutPulsesRequired.Background = ColorStandardInputField; } @@ -1950,7 +1986,7 @@ namespace Sensus.Ui.FM2014TestBench /// /// /// - /// + /// /// - Initial. /// private void tbxDoublePulseDeadtime_LostFocus(Object sender, EventArgs e) @@ -1976,7 +2012,11 @@ namespace Sensus.Ui.FM2014TestBench FM2014.DOUBLE_PULSE_DEADTIME_MAX_ms >= deadtime) { if (backupDoublePulseDeadtime != deadtime) - _calibrationSetupHasChanged = true; + { + _programCalibrationSetupHasChanged = true; + // Preset to fill the configuration file storage ability + firstFm2014.DoublePulseDeadtime_ms = (UInt16)deadtime; + } tbxDoublePulseDeadtime.Background = ColorStandardInputField; } @@ -2038,7 +2078,7 @@ namespace Sensus.Ui.FM2014TestBench /// /// /// - /// + /// /// - Initial. /// private void tbxDutToRefToleranceMax_LostFocus(Object sender, EventArgs e) @@ -2063,7 +2103,11 @@ namespace Sensus.Ui.FM2014TestBench if (double.TryParse(englishNumberFormat, NumberStyles.Any, new CultureInfo("en"), out var tolerance)) { if (Math.Abs(backupDutToRefTolerance - tolerance) > 0.05) - _calibrationSetupHasChanged = true; + { + _programCalibrationSetupHasChanged = true; + // Preset to fill the configuration file storage ability + firstFm2014.DutToRefCalibrationToleranceMax_percent = tolerance; + } tbxDutToRefTolMax.Background = ColorStandardInputField; @@ -2132,7 +2176,7 @@ namespace Sensus.Ui.FM2014TestBench /// /// /// - /// + /// /// - Initial. /// private void tbxDutToRefToleranceMin_LostFocus(Object sender, EventArgs e) @@ -2157,7 +2201,11 @@ namespace Sensus.Ui.FM2014TestBench if (double.TryParse(englishNumberFormat, NumberStyles.Any, new CultureInfo("en"), out var tolerance)) { if (Math.Abs(backupDutToRefTolerance - tolerance) > 0.05) - _calibrationSetupHasChanged = true; + { + _programCalibrationSetupHasChanged = true; + // Preset to fill the configuration file storage ability + firstFm2014.DutToRefCalibrationToleranceMin_percent = tolerance; + } tbxDutToRefTolMin.Background = ColorStandardInputField; @@ -2237,7 +2285,7 @@ namespace Sensus.Ui.FM2014TestBench if (string.IsNullOrEmpty(tbxRefPulsesPerCm.Text)) { tbxRefPulsesPerCm.Background = ColorProcessFailed; - btnSaveRegulationSetup.IsEnabled = false; + btnSaveSetupToFm2014.IsEnabled = false; btnDutToRefRegulation.IsEnabled = false; return; } @@ -2289,7 +2337,7 @@ namespace Sensus.Ui.FM2014TestBench if (e.Key == Key.Enter || e.Key == Key.Tab) { tbxDutPulsesPerCm_LostFocus(this, null); - Keyboard.Focus(cbxDisplayAttenuation); + Keyboard.Focus(cbxToleranceDisplayAttenuation); } else if (!MaskEditIntegerInput(e.Key)) { @@ -2337,7 +2385,7 @@ namespace Sensus.Ui.FM2014TestBench if (string.IsNullOrEmpty(tbxDutPulsesPerCm.Text)) { tbxDutPulsesPerCm.Background = ColorProcessFailed; - btnSaveRegulationSetup.IsEnabled = false; + btnSaveSetupToFm2014.IsEnabled = false; btnDutToRefRegulation.IsEnabled = false; return; } @@ -2493,7 +2541,7 @@ namespace Sensus.Ui.FM2014TestBench private void chkAnySlot_Click(Object sender, RoutedEventArgs e) { - _configSetupHasChanged = true; + _programConfigSetupHasChanged = true; } /// diff --git a/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.Designer.cs b/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.Designer.cs index 1be41125..66bc0836 100644 --- a/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.Designer.cs +++ b/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.Designer.cs @@ -376,7 +376,7 @@ namespace Sensus.Ui.Fm2014TestBench.Properties { } /// - /// Looks up a localized string similar to Tolerance Display [%]:. + /// Looks up a localized string similar to Tolerance Range [%]:. /// internal static string StrLblFM2014Tolerance { get { diff --git a/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.resx b/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.resx index b35ca66b..d3dc3404 100644 --- a/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.resx +++ b/FM2014TestApp/Ui/Fm2014sTest/Properties/Resources.resx @@ -145,7 +145,7 @@ Address: - Tolerance Display [%]: + Tolerance Range [%]: Connect diff --git a/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs b/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs index 896617ef..67d3bedc 100644 --- a/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs +++ b/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs @@ -32,7 +32,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMainMiniPrf)); this.gbxFM2014Setup = new System.Windows.Forms.GroupBox(); this.lblFM2014SerialNumber = new System.Windows.Forms.Label(); - this.cbxFM2014TolerancePercent = new System.Windows.Forms.ComboBox(); + this.cbxToleranceDisplayRange = new System.Windows.Forms.ComboBox(); this.picFM2014 = new System.Windows.Forms.PictureBox(); this.tbxFM2014SerialNumber = new System.Windows.Forms.TextBox(); this.lblFM2014Tolerance = new System.Windows.Forms.Label(); @@ -40,17 +40,17 @@ this.lblFM2014Address = new System.Windows.Forms.Label(); this.lblFwVersion = new System.Windows.Forms.Label(); this.btnFM2014Connect = new System.Windows.Forms.Button(); - this.cbxFM2014ComPort = new System.Windows.Forms.ComboBox(); + this.cbxProgramComPort = new System.Windows.Forms.ComboBox(); this.lblFM2014SerialPort = new System.Windows.Forms.Label(); this.lblConnectFM2014 = new System.Windows.Forms.Label(); this.tbxFM2014FullId = new System.Windows.Forms.TextBox(); this.tbxFM2014ApplicationFwVersion = new System.Windows.Forms.TextBox(); this.gbxRegulationSetup = new System.Windows.Forms.GroupBox(); - this.btnSaveRegulationSetup = new System.Windows.Forms.Button(); - this.cbxAttenuation = new System.Windows.Forms.ComboBox(); + this.btnSaveSetupToFm2014 = new System.Windows.Forms.Button(); + this.cbxToleranceDisplayAttenuation = new System.Windows.Forms.ComboBox(); this.lblRefPulsePerVolume = new System.Windows.Forms.Label(); this.lblDutPulsePerVolume = new System.Windows.Forms.Label(); - this.lblAttenuation = new System.Windows.Forms.Label(); + this.lblToleranceDisplayAttenuation = new System.Windows.Forms.Label(); this.lblScaleRefToDut = new System.Windows.Forms.Label(); this.tbxRefPulsesPerCm = new System.Windows.Forms.TextBox(); this.tbxDutPulsesPerCm = new System.Windows.Forms.TextBox(); @@ -110,7 +110,7 @@ // gbxFM2014Setup // this.gbxFM2014Setup.Controls.Add(this.lblFM2014SerialNumber); - this.gbxFM2014Setup.Controls.Add(this.cbxFM2014TolerancePercent); + this.gbxFM2014Setup.Controls.Add(this.cbxToleranceDisplayRange); this.gbxFM2014Setup.Controls.Add(this.picFM2014); this.gbxFM2014Setup.Controls.Add(this.tbxFM2014SerialNumber); this.gbxFM2014Setup.Controls.Add(this.lblFM2014Tolerance); @@ -118,7 +118,7 @@ this.gbxFM2014Setup.Controls.Add(this.lblFM2014Address); this.gbxFM2014Setup.Controls.Add(this.lblFwVersion); this.gbxFM2014Setup.Controls.Add(this.btnFM2014Connect); - this.gbxFM2014Setup.Controls.Add(this.cbxFM2014ComPort); + this.gbxFM2014Setup.Controls.Add(this.cbxProgramComPort); this.gbxFM2014Setup.Controls.Add(this.lblFM2014SerialPort); this.gbxFM2014Setup.Controls.Add(this.lblConnectFM2014); this.gbxFM2014Setup.Controls.Add(this.tbxFM2014FullId); @@ -139,18 +139,18 @@ this.lblFM2014SerialNumber.TabIndex = 27; this.lblFM2014SerialNumber.Text = "Serial Number:"; // - // cbxFM2014TolerancePercent + // cbxToleranceDisplayRange // - this.cbxFM2014TolerancePercent.FormattingEnabled = true; - this.cbxFM2014TolerancePercent.Items.AddRange(new object[] { + this.cbxToleranceDisplayRange.FormattingEnabled = true; + this.cbxToleranceDisplayRange.Items.AddRange(new object[] { "3", "5"}); - this.cbxFM2014TolerancePercent.Location = new System.Drawing.Point(220, 150); - this.cbxFM2014TolerancePercent.Name = "cbxFM2014TolerancePercent"; - this.cbxFM2014TolerancePercent.Size = new System.Drawing.Size(60, 21); - this.cbxFM2014TolerancePercent.TabIndex = 3; - this.cbxFM2014TolerancePercent.Text = "3"; - this.cbxFM2014TolerancePercent.SelectedValueChanged += new System.EventHandler(this.cbxFM2014BaseSettings_SelectedValueChanged); + this.cbxToleranceDisplayRange.Location = new System.Drawing.Point(220, 150); + this.cbxToleranceDisplayRange.Name = "cbxToleranceDisplayRange"; + this.cbxToleranceDisplayRange.Size = new System.Drawing.Size(60, 21); + this.cbxToleranceDisplayRange.TabIndex = 3; + this.cbxToleranceDisplayRange.Text = "3"; + this.cbxToleranceDisplayRange.SelectedValueChanged += new System.EventHandler(this.cbxFM2014BaseSettings_SelectedValueChanged); // // picFM2014 // @@ -237,15 +237,15 @@ this.btnFM2014Connect.UseVisualStyleBackColor = true; this.btnFM2014Connect.Click += new System.EventHandler(this.btnConnect_Click); // - // cbxFM2014ComPort + // cbxProgramComPort // - this.cbxFM2014ComPort.FormattingEnabled = true; - this.cbxFM2014ComPort.Location = new System.Drawing.Point(220, 100); - this.cbxFM2014ComPort.Name = "cbxFM2014ComPort"; - this.cbxFM2014ComPort.Size = new System.Drawing.Size(60, 21); - this.cbxFM2014ComPort.TabIndex = 1; - this.cbxFM2014ComPort.Text = "NA"; - this.cbxFM2014ComPort.SelectedValueChanged += new System.EventHandler(this.cbxFM2014BaseSettings_SelectedValueChanged); + this.cbxProgramComPort.FormattingEnabled = true; + this.cbxProgramComPort.Location = new System.Drawing.Point(220, 100); + this.cbxProgramComPort.Name = "cbxProgramComPort"; + this.cbxProgramComPort.Size = new System.Drawing.Size(60, 21); + this.cbxProgramComPort.TabIndex = 1; + this.cbxProgramComPort.Text = "NA"; + this.cbxProgramComPort.SelectedValueChanged += new System.EventHandler(this.cbxFM2014BaseSettings_SelectedValueChanged); // // lblFM2014SerialPort // @@ -286,11 +286,11 @@ // // gbxRegulationSetup // - this.gbxRegulationSetup.Controls.Add(this.btnSaveRegulationSetup); - this.gbxRegulationSetup.Controls.Add(this.cbxAttenuation); + this.gbxRegulationSetup.Controls.Add(this.btnSaveSetupToFm2014); + this.gbxRegulationSetup.Controls.Add(this.cbxToleranceDisplayAttenuation); this.gbxRegulationSetup.Controls.Add(this.lblRefPulsePerVolume); this.gbxRegulationSetup.Controls.Add(this.lblDutPulsePerVolume); - this.gbxRegulationSetup.Controls.Add(this.lblAttenuation); + this.gbxRegulationSetup.Controls.Add(this.lblToleranceDisplayAttenuation); this.gbxRegulationSetup.Controls.Add(this.lblScaleRefToDut); this.gbxRegulationSetup.Controls.Add(this.tbxRefPulsesPerCm); this.gbxRegulationSetup.Controls.Add(this.tbxDutPulsesPerCm); @@ -302,20 +302,20 @@ this.gbxRegulationSetup.TabStop = false; this.gbxRegulationSetup.Text = "Regulation Setup"; // - // btnSaveRegulationSetup + // btnSaveSetupToFm2014 // - this.btnSaveRegulationSetup.Location = new System.Drawing.Point(173, 144); - this.btnSaveRegulationSetup.Name = "btnSaveRegulationSetup"; - this.btnSaveRegulationSetup.Size = new System.Drawing.Size(110, 25); - this.btnSaveRegulationSetup.TabIndex = 7; - this.btnSaveRegulationSetup.Text = "Save"; - this.btnSaveRegulationSetup.UseVisualStyleBackColor = true; - this.btnSaveRegulationSetup.Click += new System.EventHandler(this.btnSaveRegulationSetup_Click); + this.btnSaveSetupToFm2014.Location = new System.Drawing.Point(173, 144); + this.btnSaveSetupToFm2014.Name = "btnSaveSetupToFm2014"; + this.btnSaveSetupToFm2014.Size = new System.Drawing.Size(110, 25); + this.btnSaveSetupToFm2014.TabIndex = 7; + this.btnSaveSetupToFm2014.Text = "Save"; + this.btnSaveSetupToFm2014.UseVisualStyleBackColor = true; + this.btnSaveSetupToFm2014.Click += new System.EventHandler(this.btnSaveRegulationSetup_Click); // - // cbxAttenuation + // cbxToleranceDisplayAttenuation // - this.cbxAttenuation.FormattingEnabled = true; - this.cbxAttenuation.Items.AddRange(new object[] { + this.cbxToleranceDisplayAttenuation.FormattingEnabled = true; + this.cbxToleranceDisplayAttenuation.Items.AddRange(new object[] { "1", "2", "3", @@ -325,13 +325,13 @@ "7", "8", "9"}); - this.cbxAttenuation.Location = new System.Drawing.Point(220, 101); - this.cbxAttenuation.Name = "cbxAttenuation"; - this.cbxAttenuation.Size = new System.Drawing.Size(60, 21); - this.cbxAttenuation.TabIndex = 6; - this.cbxAttenuation.Text = "3"; - this.cbxAttenuation.SelectedIndexChanged += new System.EventHandler(this.cbxAttenuation_SelectedIndexChanged); - this.cbxAttenuation.KeyDown += new System.Windows.Forms.KeyEventHandler(this.cbxAttenuation_KeyDown); + this.cbxToleranceDisplayAttenuation.Location = new System.Drawing.Point(220, 101); + this.cbxToleranceDisplayAttenuation.Name = "cbxToleranceDisplayAttenuation"; + this.cbxToleranceDisplayAttenuation.Size = new System.Drawing.Size(60, 21); + this.cbxToleranceDisplayAttenuation.TabIndex = 6; + this.cbxToleranceDisplayAttenuation.Text = "3"; + this.cbxToleranceDisplayAttenuation.SelectedIndexChanged += new System.EventHandler(this.cbxToleranceDisplayAttenuation_SelectedIndexChanged); + this.cbxToleranceDisplayAttenuation.KeyDown += new System.Windows.Forms.KeyEventHandler(this.cbxToleranceDisplayAttenuation_KeyDown); // // lblRefPulsePerVolume // @@ -351,14 +351,14 @@ this.lblDutPulsePerVolume.TabIndex = 63; this.lblDutPulsePerVolume.Text = "DUT [pulses/m³]:"; // - // lblAttenuation + // lblToleranceDisplayAttenuation // - this.lblAttenuation.AutoSize = true; - this.lblAttenuation.Location = new System.Drawing.Point(10, 103); - this.lblAttenuation.Name = "lblAttenuation"; - this.lblAttenuation.Size = new System.Drawing.Size(73, 13); - this.lblAttenuation.TabIndex = 68; - this.lblAttenuation.Text = "Attenuation []:"; + this.lblToleranceDisplayAttenuation.AutoSize = true; + this.lblToleranceDisplayAttenuation.Location = new System.Drawing.Point(10, 103); + this.lblToleranceDisplayAttenuation.Name = "lblToleranceDisplayAttenuation"; + this.lblToleranceDisplayAttenuation.Size = new System.Drawing.Size(73, 13); + this.lblToleranceDisplayAttenuation.TabIndex = 68; + this.lblToleranceDisplayAttenuation.Text = "Attenuation []:"; // // lblScaleRefToDut // @@ -817,7 +817,7 @@ // this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(538, 24); + this.menuStrip1.Size = new System.Drawing.Size(543, 24); this.menuStrip1.TabIndex = 85; this.menuStrip1.Text = "menuStrip1"; // @@ -825,7 +825,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(538, 467); + this.ClientSize = new System.Drawing.Size(543, 461); this.Controls.Add(this.grpBoxDebug); this.Controls.Add(this.gbxRegulationSetup); this.Controls.Add(this.gbxDutToRefRegulation); @@ -868,14 +868,14 @@ private System.Windows.Forms.GroupBox gbxFM2014Setup; private System.Windows.Forms.Button btnFM2014Connect; - private System.Windows.Forms.ComboBox cbxFM2014ComPort; + private System.Windows.Forms.ComboBox cbxProgramComPort; private System.Windows.Forms.Label lblFM2014SerialPort; private System.Windows.Forms.Label lblConnectFM2014; private System.Windows.Forms.TextBox tbxFM2014FullId; private System.Windows.Forms.GroupBox gbxRegulationSetup; private System.Windows.Forms.Label lblRefPulsePerVolume; private System.Windows.Forms.Label lblDutPulsePerVolume; - private System.Windows.Forms.Label lblAttenuation; + private System.Windows.Forms.Label lblToleranceDisplayAttenuation; private System.Windows.Forms.Label lblScaleRefToDut; private System.Windows.Forms.TextBox tbxRefPulsesPerCm; private System.Windows.Forms.TextBox tbxDutPulsesPerCm; @@ -890,11 +890,11 @@ private System.Windows.Forms.Label lblWaitingForMeterResponse; private System.Windows.Forms.ProgressBar barSingleProgressUpdate; private System.Windows.Forms.Label lblActualProcess; - private System.Windows.Forms.ComboBox cbxFM2014TolerancePercent; + private System.Windows.Forms.ComboBox cbxToleranceDisplayRange; private System.Windows.Forms.Label lblFM2014Tolerance; private System.Windows.Forms.ComboBox cbxFM2014Address; private System.Windows.Forms.Label lblFM2014Address; - private System.Windows.Forms.ComboBox cbxAttenuation; + private System.Windows.Forms.ComboBox cbxToleranceDisplayAttenuation; private System.Windows.Forms.Button btnDutToRefRegulation; private System.Windows.Forms.GroupBox gbxManualRefCalibration; private System.Windows.Forms.GroupBox gbxDutToRefRegulation; @@ -909,7 +909,7 @@ private System.Windows.Forms.Label lblActualFlowRateCmPerHour; private System.Windows.Forms.TextBox tbxActualFlowRateCmPerHour; private System.Windows.Forms.CheckBox chkUseDampedTolerance; - private System.Windows.Forms.Button btnSaveRegulationSetup; + private System.Windows.Forms.Button btnSaveSetupToFm2014; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox picFM2014; private System.Windows.Forms.TextBox tbxRefFrequencyHz; diff --git a/MiniPrf/Ui/FrmMainMiniPrf.cs b/MiniPrf/Ui/FrmMainMiniPrf.cs index 1461b9f1..ae4c3a67 100644 --- a/MiniPrf/Ui/FrmMainMiniPrf.cs +++ b/MiniPrf/Ui/FrmMainMiniPrf.cs @@ -90,9 +90,19 @@ namespace Sensus.MiniPrf.Ui // internal reminders of changed items to avoid write access on startup if items are preloaded private Int32 _comPortIdx; private Int32 _addressIdx; - private Int32 _toleranceIdx; + private Int32 _currentOutputDisplayRange_percent; + private Byte _toleranceDisplayAttenuation; + + /// + /// The regulation setup will be stored directly to the FM2014 being able to use it at startup + /// + private Boolean _fm2014RegulationSetupHasChanged; + + /// + /// If the program configuration has changed, this shall be stored to the configuration file + /// + private Boolean _programConfigSetupHasChanged; - private Boolean _regulationSetupHasChanged; #endregion Properties #region FormControls @@ -111,7 +121,7 @@ namespace Sensus.MiniPrf.Ui _version = Assembly.GetExecutingAssembly().GetName().Version; ColorStandardDisplayField = lblFM2014SerialPort.BackColor; - ColorStandardInputField = cbxFM2014ComPort.BackColor; + ColorStandardInputField = cbxProgramComPort.BackColor; _cancellationTokenSource = new CancellationTokenSource(); _cancellationToken = _cancellationTokenSource.Token; @@ -127,53 +137,56 @@ namespace Sensus.MiniPrf.Ui { ActionControl(false); _autoProgressBar = false; - _regulationSetupHasChanged = false; + _fm2014RegulationSetupHasChanged = false; + _programConfigSetupHasChanged = false; + grpBoxDebug.Visible = false; gbxDutToRefRegulation.Visible = true; gbxRegulationSetup.Visible = true; - // Load the configuration from the local file stored in AppData\FM2014 - _fm2014Config.ReadFM2014Config(); - - // Display actual com-port, if not assigned use the '?'. This will be placed on Items[0] - if (_fm2014Config?.SerialPort != null && !cbxFM2014ComPort.Items.Contains(_fm2014Config.SerialPort)) - { - cbxFM2014ComPort.Items.Add(_fm2014Config.SerialPort); - } - else if (_fm2014Config?.SerialPort == null && !cbxFM2014ComPort.Items.Contains("?")) - { - cbxFM2014ComPort.Items.Add("?"); - } - // Collect and add all com-ports from device manager to items - var comPorts = SerialPort.GetPortNames().ToList(); - foreach (var comPort in comPorts.Where(comPort => !cbxFM2014ComPort.Items.Contains(comPort))) - { - cbxFM2014ComPort.Items.Add(comPort); - } - - cbxFM2014ComPort.Text = cbxFM2014ComPort.Items[_comPortIdx].ToString(); - var itemContent = _fm2014Config?.Address ?? 1; - for (var idx = 0; idx < cbxFM2014Address.MaxDropDownItems; idx++) - { - if (!cbxFM2014Address.Items[idx].ToString().Equals(itemContent.ToString())) continue; - - _addressIdx = idx; - cbxFM2014Address.SelectedItem = cbxFM2014Address.Items[idx]; - break; - } - - itemContent = _fm2014Config?.TolerancePercent ?? 3; - for (var idx = 0; idx < cbxFM2014TolerancePercent.MaxDropDownItems; idx++) - { - if (!cbxFM2014TolerancePercent.Items[idx].ToString().Equals(itemContent.ToString())) continue; - - _toleranceIdx = idx; - cbxFM2014TolerancePercent.SelectedItem = cbxFM2014TolerancePercent.Items[idx]; - break; - } - if (_fm2014Config != null) { + // Load the configuration from the local file stored in AppData\FM2014 + _fm2014Config.ReadFM2014Config(); + + // Display actual com-port, if not assigned use the '?'. This will be placed on Items[0] + if (_fm2014Config.SharedSerialPort != null && !cbxProgramComPort.Items.Contains(_fm2014Config.SharedSerialPort)) + { + cbxProgramComPort.Items.Add(_fm2014Config.SharedSerialPort); + } + else if (_fm2014Config.SharedSerialPort == null && !cbxProgramComPort.Items.Contains("?")) + { + cbxProgramComPort.Items.Add("?"); + } + + // Collect and add all com-ports from device manager to items + var comPorts = SerialPort.GetPortNames().ToList(); + foreach (var comPort in comPorts.Where(comPort => !cbxProgramComPort.Items.Contains(comPort))) + { + cbxProgramComPort.Items.Add(comPort); + } + + cbxProgramComPort.Text = cbxProgramComPort.Items[_comPortIdx].ToString(); + var itemContent = _fm2014Config.Address ?? 1; + for (var idx = 0; idx < cbxFM2014Address.MaxDropDownItems; idx++) + { + if (!cbxFM2014Address.Items[idx].ToString().Equals(itemContent.ToString())) continue; + + _addressIdx = idx; + cbxFM2014Address.SelectedItem = cbxFM2014Address.Items[idx]; + break; + } + + itemContent = _fm2014Config.CommonCurrentOutputDisplayRangeNominal_percent; + for (var idx = 0; idx < cbxToleranceDisplayRange.MaxDropDownItems; idx++) + { + if (!cbxToleranceDisplayRange.Items[idx].ToString().Equals(itemContent.ToString())) continue; + + _currentOutputDisplayRange_percent = idx; + cbxToleranceDisplayRange.SelectedItem = cbxToleranceDisplayRange.Items[idx]; + break; + } + // Restore baudrate FM2014.Baudrate = _fm2014Config.Baudrate; } @@ -198,8 +211,8 @@ namespace Sensus.MiniPrf.Ui tbxDutPulsesPerCm.Text = ""; lblScaleRefToDut.Text = Resources.StrLblScaleRefToDut; tbxScaleRefToDut.Text = ""; - lblAttenuation.Text = Resources.StrLblAttenuation; - btnSaveRegulationSetup.Text = Resources.StrBtnSaveRegulationSetup; + lblToleranceDisplayAttenuation.Text = Resources.StrLblAttenuation; + btnSaveSetupToFm2014.Text = Resources.StrBtnSaveRegulationSetup; // Manual REF Calibration group box gbxManualRefCalibration.Text = Resources.StrGbxManualRefCalibration; @@ -240,29 +253,25 @@ namespace Sensus.MiniPrf.Ui /// /// - Initial. /// - /// + /// /// - Update FM2014 properties. /// - private void StoreFM2014Settings() + private void StoreProgramConfiguration() { - _fm2014Config.SerialPort = cbxFM2014ComPort.Text; - if (int.TryParse(cbxFM2014Address.SelectedItem.ToString(), out var address)) + + if (_fm2014Config == null) + return; + + Invoke(new Action(() => { - _fm2014Config.Address = address; - if (Fm2014 != null) - Fm2014.Address = address; + _programConfigSetupHasChanged = false; - } + _fm2014Config.SharedSerialPort = cbxProgramComPort.Text; + _fm2014Config.Address = _addressIdx; + _fm2014Config.CommonCurrentOutputDisplayRangeNominal_percent = _currentOutputDisplayRange_percent; - if (int.TryParse(cbxFM2014TolerancePercent.SelectedItem.ToString(), out var tolerancePercent) - && (tolerancePercent == 3 || tolerancePercent == 5)) - { - _fm2014Config.TolerancePercent = tolerancePercent; - if (Fm2014 != null) - Fm2014.Tolerance_percent = tolerancePercent; - } - - _fm2014Config.Update(); + _fm2014Config.Update(); + })); } private void FrmMainMiniPrf_Load(Object sender, EventArgs e) @@ -321,7 +330,7 @@ namespace Sensus.MiniPrf.Ui private void SetFM2014AccessLocked() { // Disable all buttons - btnSaveRegulationSetup.Enabled = false; + btnSaveSetupToFm2014.Enabled = false; btnManualRefCalibration.Enabled = false; btnDutToRefRegulation.Enabled = false; btnFM2014Connect.Enabled = false; @@ -332,10 +341,10 @@ namespace Sensus.MiniPrf.Ui tbxDutPulsesPerCm.ReadOnly = true; // Disable setting selections - cbxAttenuation.Enabled = false; + cbxToleranceDisplayAttenuation.Enabled = false; cbxFM2014Address.Enabled = false; - cbxFM2014ComPort.Enabled = false; - cbxFM2014TolerancePercent.Enabled = false; + cbxProgramComPort.Enabled = false; + cbxToleranceDisplayRange.Enabled = false; cbxMeasuredDutPulses.Enabled = false; } @@ -344,27 +353,30 @@ namespace Sensus.MiniPrf.Ui /// private void SetFM2014AccessEnabled() { - // Enable save setup depending on changed properties - btnSaveRegulationSetup.Enabled = _regulationSetupHasChanged; + Invoke(new Action(() => + { + // Enable save setup depending on changed properties + btnSaveSetupToFm2014.Enabled = _fm2014RegulationSetupHasChanged; - // Enable buttons and display correct information - btnManualRefCalibration.Enabled = true; - btnDutToRefRegulation.Enabled = true; - btnFM2014Connect.Enabled = true; - btnManualRefCalibration.Text = Resources.StrBtnStartCalibration; - btnDutToRefRegulation.Text = Resources.StrBtnStartRegulation; + // Enable buttons and display correct information + btnManualRefCalibration.Enabled = true; + btnDutToRefRegulation.Enabled = true; + btnFM2014Connect.Enabled = true; + btnManualRefCalibration.Text = Resources.StrBtnStartCalibration; + btnDutToRefRegulation.Text = Resources.StrBtnStartRegulation; - // Enable manual input - tbxVolumeMeasuredLiters.ReadOnly = false; - tbxRefPulsesPerCm.ReadOnly = false; - tbxDutPulsesPerCm.ReadOnly = false; + // Enable manual input + tbxVolumeMeasuredLiters.ReadOnly = false; + tbxRefPulsesPerCm.ReadOnly = false; + tbxDutPulsesPerCm.ReadOnly = false; - // Enable setting selections - cbxAttenuation.Enabled = true; - cbxFM2014Address.Enabled = true; - cbxFM2014ComPort.Enabled = true; - cbxFM2014TolerancePercent.Enabled = true; - cbxMeasuredDutPulses.Enabled = true; + // Enable setting selections + cbxToleranceDisplayAttenuation.Enabled = true; + cbxFM2014Address.Enabled = true; + cbxProgramComPort.Enabled = true; + cbxToleranceDisplayRange.Enabled = true; + cbxMeasuredDutPulses.Enabled = true; + })); } /// @@ -377,7 +389,7 @@ namespace Sensus.MiniPrf.Ui SetFM2014AccessLocked(); btnFM2014Connect.Enabled = true; cbxFM2014Address.Enabled = true; - cbxFM2014ComPort.Enabled = true; + cbxProgramComPort.Enabled = true; return; } SetFM2014AccessEnabled(); @@ -398,9 +410,13 @@ namespace Sensus.MiniPrf.Ui { try { + if (_programConfigSetupHasChanged) + StoreProgramConfiguration(); + Init(); - if (string.IsNullOrEmpty(cbxFM2014ComPort?.SelectedItem?.ToString()) || - cbxFM2014ComPort.SelectedItem.ToString().Equals("?")) + + if (string.IsNullOrEmpty(cbxProgramComPort?.SelectedItem?.ToString()) || + cbxProgramComPort.SelectedItem.ToString().Equals("?")) { var text = Resources.StrErrorMsgComPortNotAssigned; MessageBox.Show(text, Resources.StrError, MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -408,8 +424,6 @@ namespace Sensus.MiniPrf.Ui return; } - StoreFM2014Settings(); - ActionControl(true); if (Fm2014 != null) @@ -435,10 +449,11 @@ namespace Sensus.MiniPrf.Ui ActionControl(false); LogErrorText(Resources.StrErrorMsgFM2014AddressInvalid); } - if (int.TryParse(cbxFM2014TolerancePercent.SelectedItem.ToString(), out var tolerancePercent) - && (tolerancePercent == 3 || tolerancePercent == 5)) + if (int.TryParse(cbxToleranceDisplayRange.SelectedItem.ToString(), out var tolerancePercent) + && (tolerancePercent == FM2014.CURRENT_OUTPUT_DISPLAY_RANGE_STANDARD_NOMINAL_percent || + tolerancePercent == FM2014.CURRENT_OUTPUT_DISPLAY_RANGE_EXTENDED_NOMINAL_percent)) { - Fm2014.Tolerance_percent = tolerancePercent; + Fm2014.CurrentOutputDisplayRangeNominal_percent = tolerancePercent; } else { @@ -447,7 +462,7 @@ namespace Sensus.MiniPrf.Ui } lblActualProcess.Text = Resources.StrMsgConnecting; - Fm2014.Connect(cbxFM2014ComPort.SelectedItem.ToString()); + Fm2014.Connect(cbxProgramComPort.SelectedItem.ToString()); Task.Factory.StartNew(() => { @@ -546,11 +561,11 @@ namespace Sensus.MiniPrf.Ui /// private void DutToRefRegulationSetupHasChanged() { - _regulationSetupHasChanged = true; + _fm2014RegulationSetupHasChanged = true; Invoke(new Action(() => { - btnSaveRegulationSetup.Enabled = true; + btnSaveSetupToFm2014.Enabled = true; btnDutToRefRegulation.Enabled = true; tbxRefFrequencyHz.BackColor = ColorStandardDisplayField; @@ -589,7 +604,7 @@ namespace Sensus.MiniPrf.Ui { tbxScaleRefToDut.BackColor = ColorProcessFailed; tbxScaleRefToDut.Text = Resources.StrError; - btnSaveRegulationSetup.Enabled = false; + btnSaveSetupToFm2014.Enabled = false; btnDutToRefRegulation.Enabled = false; retVal = false; } @@ -702,7 +717,7 @@ namespace Sensus.MiniPrf.Ui /// /// Feedback from FM2014being parsed to GUI /// - /// + /// /// - Initial. /// private void DataReceived_Handler(Object sender, ProcessExecEventArgs e) @@ -721,12 +736,20 @@ namespace Sensus.MiniPrf.Ui // Data dispatcher var resp = (CmdResponse)e.SpecificInfoObj; + // Used as marker for error, null means measurement is in range or status or health is good + var statusColor = ColorStandardInputField; + + // Color the output for the user display for quick check capability + if (e.StatusReturn == StatusReturn.MeasurementOutOfRange) + statusColor = ColorProcessFailed; + else if (e.StatusReturn == StatusReturn.MeasurementInRange) + statusColor = ColorSuccess; + if (e.StatusReturn == StatusReturn.Failed) { LogErrorText(resp.AnswerStr); //ErrorHandler(resp.CmdName); } - else if (resp.IntValue == null && resp.DoubleValue == null) { LogText(resp.AnswerStr); @@ -751,22 +774,14 @@ namespace Sensus.MiniPrf.Ui tbxDutPulsesPerCm.Text = $@"{resp.IntValue:D}"; break; case CmdName.CMD_MEAS_SET_ATTN: - var idx = cbxAttenuation.FindString($@"{resp.IntValue}"); - cbxAttenuation.SelectedIndex = idx; + var idx = cbxToleranceDisplayAttenuation.FindString($@"{resp.IntValue}"); + cbxToleranceDisplayAttenuation.SelectedIndex = idx; break; case CmdName.CMD_GET_REF_FREQU: tbxRefFrequencyHz.Text = $@"{resp.IntValue:D}"; tbxRefFrequencyDirectHz.Text = $@"{resp.IntValue:D}"; - if (resp.IntValue < 1 || resp.IntValue > 254) - { - tbxRefFrequencyHz.BackColor = ColorProcessFailed; - tbxActualFlowRateCmPerHour.BackColor = ColorProcessFailed; - } - else - { - tbxRefFrequencyHz.BackColor = ColorStandardDisplayField; - tbxActualFlowRateCmPerHour.BackColor = ColorStandardDisplayField; - } + tbxRefFrequencyHz.BackColor = statusColor; + tbxActualFlowRateCmPerHour.BackColor = statusColor; break; case CmdName.CMD_RST_MEAS: // Immediately lock all buttons and input fields until reset is finished @@ -786,16 +801,7 @@ namespace Sensus.MiniPrf.Ui case CmdName.CMD_GET_UDTLC: case CmdName.CMD_GET_DTLC: tbxActualMeasuredToleranceDutToRef.Text = $@"{resp.DoubleValue:F2}"; - if (resp.DoubleValue < -Fm2014.Tolerance_percent || - resp.DoubleValue > Fm2014.Tolerance_percent) - { - tbxActualMeasuredToleranceDutToRef.BackColor = ColorProcessFailed; - } - else - { - tbxActualMeasuredToleranceDutToRef.BackColor = ColorStandardDisplayField; - } - + tbxActualMeasuredToleranceDutToRef.BackColor = statusColor; break; case CmdName.CMD_REF_SET_SCALE: tbxScaleRefToDut.Text = $@"{resp.DoubleValue:F4}"; @@ -882,7 +888,6 @@ namespace Sensus.MiniPrf.Ui UInt32 refPulses_per_cm = 1000; UInt16 dutPulses_per_cm = 100; UInt16 doublePulseDeadtime_ms = 0; - Byte currentOutputAttenuation = 1; if (int.TryParse(tbxRefPulsesPerCm.Text, out var pulses_per_cm) && FM2014.PULSES_PER_CM_REGULATION_SETUP_MIN <= pulses_per_cm && FM2014.REF_PULSES_PER_CM_REGULATION_INPUT_MAX >= pulses_per_cm) @@ -896,22 +901,8 @@ namespace Sensus.MiniPrf.Ui dutPulses_per_cm = (UInt16)pulses_per_cm; } - //if (int.TryParse(tbxDoublePulseDeadtime.Text, out var deadtime_ms) && - // FM2014.DOUBLE_PULSE_DEADTIME_MIN_ms <= deadtime_ms && - // FM2014.DOUBLE_PULSE_DEADTIME_MAX_ms >= deadtime_ms) - //{ - // doublePulseDeadtime_ms = (UInt16)deadtime_ms; - //} - - if (byte.TryParse(cbxAttenuation.SelectedItem.ToString(), out var attenuation) && - attenuation >= FM2014.CURRENT_OUTPUT_ATTENUATION_MIN && - attenuation <= FM2014.CURRENT_OUTPUT_ATTENUATION_MAX) - { - currentOutputAttenuation = attenuation; - } - if (FM2014.RegulationMeasurement(refPulses_per_cm, dutPulses_per_cm, doublePulseDeadtime_ms, - currentOutputAttenuation)) + _toleranceDisplayAttenuation)) { _autoProgressBar = true; ActionControl(true); @@ -970,31 +961,6 @@ namespace Sensus.MiniPrf.Ui })); } - /// - /// Attenuation item has changed. - /// - /// - /// - Initial. - /// - private void cbxAttenuation_SelectedIndexChanged(Object sender, EventArgs e) - { - - Invoke(new Action(() => - { - if (Fm2014 != null) - { - if (byte.TryParse(cbxAttenuation.SelectedItem.ToString(), out var attenuation) && - attenuation >= FM2014.CURRENT_OUTPUT_ATTENUATION_MIN && - attenuation <= FM2014.CURRENT_OUTPUT_ATTENUATION_MAX && - Fm2014.CurrentOutputAttenuation != attenuation) - { - _regulationSetupHasChanged = true; - btnSaveRegulationSetup.Enabled = true; - } - } - })); - } - /// /// Selected COM port, tolerance display settings or address item has changed. /// These values can be setup before any connection to the FM2014 has been established. Therefore, those @@ -1007,14 +973,14 @@ namespace Sensus.MiniPrf.Ui { Invoke(new Action(() => { - if (_toleranceIdx != cbxFM2014TolerancePercent.SelectedIndex || + if (_currentOutputDisplayRange_percent != cbxToleranceDisplayRange.SelectedIndex || _addressIdx != cbxFM2014Address.SelectedIndex || - _comPortIdx != cbxFM2014ComPort.SelectedIndex) + _comPortIdx != cbxProgramComPort.SelectedIndex) { - _toleranceIdx = cbxFM2014TolerancePercent.SelectedIndex; + _currentOutputDisplayRange_percent = cbxToleranceDisplayRange.SelectedIndex; _addressIdx = cbxFM2014Address.SelectedIndex; - _comPortIdx = cbxFM2014ComPort.SelectedIndex; - StoreFM2014Settings(); + _comPortIdx = cbxProgramComPort.SelectedIndex; + StoreProgramConfiguration(); } })); } @@ -1031,8 +997,8 @@ namespace Sensus.MiniPrf.Ui { if (Fm2014 != null && FM2014.StoreAllConfigurations()) { - _regulationSetupHasChanged = false; - btnSaveRegulationSetup.Enabled = false; + _fm2014RegulationSetupHasChanged = false; + btnSaveSetupToFm2014.Enabled = false; } } @@ -1126,7 +1092,7 @@ namespace Sensus.MiniPrf.Ui if (string.IsNullOrEmpty(tbxRefPulsesPerCm.Text)) { tbxRefPulsesPerCm.BackColor = ColorProcessFailed; - btnSaveRegulationSetup.Enabled = false; + btnSaveSetupToFm2014.Enabled = false; btnDutToRefRegulation.Enabled = false; return; } @@ -1215,7 +1181,7 @@ namespace Sensus.MiniPrf.Ui if (string.IsNullOrEmpty(tbxDutPulsesPerCm.Text)) { tbxDutPulsesPerCm.BackColor = ColorProcessFailed; - btnSaveRegulationSetup.Enabled = false; + btnSaveSetupToFm2014.Enabled = false; btnDutToRefRegulation.Enabled = false; return; } @@ -1375,12 +1341,37 @@ namespace Sensus.MiniPrf.Ui })); } + /// + /// FM2014 current attenuation item has changed: + /// - This will dispatch the new value to all FM2014s. + /// + /// + /// - Initial. + /// + private void cbxToleranceDisplayAttenuation_SelectedIndexChanged(Object sender, EventArgs e) + { + + Invoke(new Action(() => + { + if (byte.TryParse(cbxToleranceDisplayAttenuation.SelectedItem.ToString(), out var attenuation) && + attenuation >= FM2014.CURRENT_OUTPUT_ATTENUATION_MIN && + attenuation <= FM2014.CURRENT_OUTPUT_ATTENUATION_MAX && + _toleranceDisplayAttenuation != attenuation) + { + _fm2014RegulationSetupHasChanged = true; + _toleranceDisplayAttenuation = attenuation; + Fm2014.CurrentOutputAttenuation = attenuation; + btnSaveSetupToFm2014.Enabled = true; + } + })); + } + /// /// Select next control on enter key pressed /// /// /// - private void cbxAttenuation_KeyDown(Object sender, KeyEventArgs e) + private void cbxToleranceDisplayAttenuation_KeyDown(Object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) {