Unlock progress UI:
- UnlockProgressDialog with dark-themed progress ring, phase indicator, elapsed
time, and cancel/close buttons (non-modal, draggable borderless window)
- UnlockProgressViewModel with event-driven progress tracking via IUnlockService
- Triggers on pump selection (manual or K-Line auto-detect), not test start
UnlockService rewrite:
- Persistent CAN senders that outlive the unlock sequence (StopSenders on pump change)
- Concurrent K-Line fast unlock: awaits session Connected, sends RAM timer shortcut
({02 88 02 03 A8 01 00}), verifies via CAN TestUnlock before skipping wait
- Fix Type 1 verification (Value == 0 means unlocked, was inverted)
K-Line fast unlock support:
- IKwpService.TryFastUnlockAsync / KwpService implementation
Additional features:
- ILocalizationService with ES/EN resource dictionaries and runtime switching
- Safety dialogs: VoltageWarning, OilPumpConfirm, RpmSafetyWarning
- SettingsDialog for app configuration
- BenchService enhancements, ConfigurationService improvements, PDF report updates
- All UI strings localized via DynamicResource
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
291 lines
12 KiB
C#
291 lines
12 KiB
C#
using System;
|
|
using System.Collections.ObjectModel;
|
|
using System.Linq;
|
|
using CommunityToolkit.Mvvm.ComponentModel;
|
|
using CommunityToolkit.Mvvm.Input;
|
|
using HC_APTBS.Infrastructure.Kwp;
|
|
using HC_APTBS.Models;
|
|
using HC_APTBS.Services;
|
|
|
|
namespace HC_APTBS.ViewModels.Dialogs
|
|
{
|
|
/// <summary>
|
|
/// ViewModel for the application settings dialog.
|
|
/// Loads a local copy of every <see cref="AppSettings"/> property so that
|
|
/// Cancel discards all changes.
|
|
/// </summary>
|
|
public sealed partial class SettingsViewModel : ObservableObject
|
|
{
|
|
private readonly IConfigurationService _config;
|
|
private readonly ILocalizationService _loc;
|
|
|
|
// ── Dialog result ─────────────────────────────────────────────────────
|
|
|
|
/// <summary>True when the user clicked Accept.</summary>
|
|
public bool Accepted { get; private set; }
|
|
|
|
/// <summary>Raised to close the owning dialog window.</summary>
|
|
public event Action? RequestClose;
|
|
|
|
// ── Collections ───────────────────────────────────────────────────────
|
|
|
|
/// <summary>Available language codes for the language dropdown.</summary>
|
|
public ObservableCollection<string> AvailableLanguages { get; } = new() { "ESP", "ENG" };
|
|
|
|
/// <summary>RPM-voltage lookup table, editable via DataGrid.</summary>
|
|
public ObservableCollection<RpmVoltageRelation> Relations { get; } = new();
|
|
|
|
/// <summary>Available FTDI device serial numbers for K-Line port selection.</summary>
|
|
public ObservableCollection<string> AvailablePorts { get; } = new();
|
|
|
|
// ── General ───────────────────────────────────────────────────────────
|
|
|
|
[ObservableProperty] private string _selectedLanguage = "ESP";
|
|
[ObservableProperty] private int _daysKeepLogs = 7;
|
|
|
|
// ── Safety ────────────────────────────────────────────────────────────
|
|
|
|
[ObservableProperty] private int _tempMax = 45;
|
|
[ObservableProperty] private int _tempMin = 35;
|
|
[ObservableProperty] private int _securityRpmLimit = 2500;
|
|
[ObservableProperty] private int _maxPressureBar = 26;
|
|
[ObservableProperty] private double _toleranceUpExtension = 0.08;
|
|
[ObservableProperty] private double _tolerancePfpExtension = 0.1;
|
|
[ObservableProperty] private bool _defaultIgnoreTin = true;
|
|
|
|
// ── PID ───────────────────────────────────────────────────────────────
|
|
|
|
[ObservableProperty] private double _pidP = 0.1;
|
|
[ObservableProperty] private double _pidI = 0.1;
|
|
[ObservableProperty] private double _pidD = 0.04;
|
|
[ObservableProperty] private int _pidLoopMs = 250;
|
|
|
|
// ── Motor ─────────────────────────────────────────────────────────────
|
|
|
|
[ObservableProperty] private int _encoderResolution = 4096;
|
|
[ObservableProperty] private double _voltageForMaxRpm = 10;
|
|
[ObservableProperty] private int _maxRpm = 2500;
|
|
[ObservableProperty] private bool _rightRelayValue = true;
|
|
|
|
// ── Company ───────────────────────────────────────────────────────────
|
|
|
|
[ObservableProperty] private string _companyName = string.Empty;
|
|
[ObservableProperty] private string _companyInfo = string.Empty;
|
|
[ObservableProperty] private string _reportLogoPath = string.Empty;
|
|
|
|
// ── K-Line ────────────────────────────────────────────────────────────
|
|
|
|
[ObservableProperty] private string _selectedKLinePort = string.Empty;
|
|
|
|
// ── Advanced (refresh intervals) ──────────────────────────────────────
|
|
|
|
[ObservableProperty] private int _refreshBenchInterfaceMs = 20;
|
|
[ObservableProperty] private int _refreshWhileReadingMs = 1500;
|
|
[ObservableProperty] private int _refreshCanBusReadMs = 2;
|
|
[ObservableProperty] private int _refreshPumpRequestMs = 250;
|
|
[ObservableProperty] private int _refreshPumpParamsMs = 4;
|
|
[ObservableProperty] private int _blinkIntervalMs = 1000;
|
|
[ObservableProperty] private int _flasherIntervalMs = 800;
|
|
|
|
// ── Constructor ───────────────────────────────────────────────────────
|
|
|
|
/// <param name="configService">Configuration service for loading/saving settings.</param>
|
|
/// <param name="localizationService">Localization service for language switching.</param>
|
|
public SettingsViewModel(IConfigurationService configService, ILocalizationService localizationService)
|
|
{
|
|
_config = configService;
|
|
_loc = localizationService;
|
|
|
|
var s = configService.Settings;
|
|
|
|
// General
|
|
_selectedLanguage = s.Language;
|
|
_daysKeepLogs = s.DaysKeepLogs;
|
|
|
|
// Safety
|
|
_tempMax = s.TempMax;
|
|
_tempMin = s.TempMin;
|
|
_securityRpmLimit = s.SecurityRpmLimit;
|
|
_maxPressureBar = s.MaxPressureBar;
|
|
_toleranceUpExtension = s.ToleranceUpExtension;
|
|
_tolerancePfpExtension = s.TolerancePfpExtension;
|
|
_defaultIgnoreTin = s.DefaultIgnoreTin;
|
|
|
|
// PID
|
|
_pidP = s.PidP;
|
|
_pidI = s.PidI;
|
|
_pidD = s.PidD;
|
|
_pidLoopMs = s.PidLoopMs;
|
|
|
|
// Motor
|
|
_encoderResolution = s.EncoderResolution;
|
|
_voltageForMaxRpm = s.VoltageForMaxRpm;
|
|
_maxRpm = s.MaxRpm;
|
|
_rightRelayValue = s.RightRelayValue;
|
|
|
|
// Company
|
|
_companyName = s.CompanyName;
|
|
_companyInfo = s.CompanyInfo;
|
|
_reportLogoPath = s.ReportLogoPath;
|
|
|
|
// K-Line
|
|
_selectedKLinePort = s.KLinePort;
|
|
|
|
// Advanced
|
|
_refreshBenchInterfaceMs = s.RefreshBenchInterfaceMs;
|
|
_refreshWhileReadingMs = s.RefreshWhileReadingMs;
|
|
_refreshCanBusReadMs = s.RefreshCanBusReadMs;
|
|
_refreshPumpRequestMs = s.RefreshPumpRequestMs;
|
|
_refreshPumpParamsMs = s.RefreshPumpParamsMs;
|
|
_blinkIntervalMs = s.BlinkIntervalMs;
|
|
_flasherIntervalMs = s.FlasherIntervalMs;
|
|
|
|
// Deep-copy the RPM-voltage relation table
|
|
foreach (var r in s.Relations)
|
|
Relations.Add(new RpmVoltageRelation(r.Voltage, r.Rpm));
|
|
|
|
// Enumerate connected FTDI devices
|
|
EnumerateFtdiDevices();
|
|
}
|
|
|
|
// ── Commands ──────────────────────────────────────────────────────────
|
|
|
|
/// <summary>Copies all local values back to AppSettings, saves, and closes.</summary>
|
|
[RelayCommand]
|
|
private void Accept()
|
|
{
|
|
var s = _config.Settings;
|
|
|
|
// General
|
|
s.DaysKeepLogs = DaysKeepLogs;
|
|
|
|
// Safety
|
|
s.TempMax = TempMax;
|
|
s.TempMin = TempMin;
|
|
s.SecurityRpmLimit = SecurityRpmLimit;
|
|
s.MaxPressureBar = MaxPressureBar;
|
|
s.ToleranceUpExtension = ToleranceUpExtension;
|
|
s.TolerancePfpExtension = TolerancePfpExtension;
|
|
s.DefaultIgnoreTin = DefaultIgnoreTin;
|
|
|
|
// PID
|
|
s.PidP = PidP;
|
|
s.PidI = PidI;
|
|
s.PidD = PidD;
|
|
s.PidLoopMs = PidLoopMs;
|
|
|
|
// Motor
|
|
s.EncoderResolution = EncoderResolution;
|
|
s.VoltageForMaxRpm = VoltageForMaxRpm;
|
|
s.MaxRpm = MaxRpm;
|
|
s.RightRelayValue = RightRelayValue;
|
|
s.Relations = Relations.Select(r => new RpmVoltageRelation(r.Voltage, r.Rpm)).ToList();
|
|
|
|
// Company
|
|
s.CompanyName = CompanyName;
|
|
s.CompanyInfo = CompanyInfo;
|
|
s.ReportLogoPath = ReportLogoPath;
|
|
|
|
// K-Line
|
|
s.KLinePort = SelectedKLinePort;
|
|
|
|
// Advanced
|
|
s.RefreshBenchInterfaceMs = RefreshBenchInterfaceMs;
|
|
s.RefreshWhileReadingMs = RefreshWhileReadingMs;
|
|
s.RefreshCanBusReadMs = RefreshCanBusReadMs;
|
|
s.RefreshPumpRequestMs = RefreshPumpRequestMs;
|
|
s.RefreshPumpParamsMs = RefreshPumpParamsMs;
|
|
s.BlinkIntervalMs = BlinkIntervalMs;
|
|
s.FlasherIntervalMs = FlasherIntervalMs;
|
|
|
|
// Language — switch if changed (also persists via LocalizationService)
|
|
if (SelectedLanguage != _loc.CurrentLanguage)
|
|
_loc.SetLanguage(SelectedLanguage);
|
|
|
|
_config.SaveSettings();
|
|
|
|
Accepted = true;
|
|
RequestClose?.Invoke();
|
|
}
|
|
|
|
/// <summary>Discards changes and closes.</summary>
|
|
[RelayCommand]
|
|
private void Cancel()
|
|
{
|
|
Accepted = false;
|
|
RequestClose?.Invoke();
|
|
}
|
|
|
|
/// <summary>Opens a file dialog to select a company logo image.</summary>
|
|
[RelayCommand]
|
|
private void BrowseLogo()
|
|
{
|
|
var dlg = new Microsoft.Win32.OpenFileDialog
|
|
{
|
|
Title = _loc.GetString("Dialog.Settings.BrowseLogoTitle"),
|
|
Filter = "Image files|*.png;*.jpg;*.jpeg;*.bmp|All files|*.*"
|
|
};
|
|
|
|
if (!string.IsNullOrEmpty(ReportLogoPath))
|
|
{
|
|
try { dlg.InitialDirectory = System.IO.Path.GetDirectoryName(ReportLogoPath); }
|
|
catch { /* ignore invalid path */ }
|
|
}
|
|
|
|
if (dlg.ShowDialog() == true)
|
|
ReportLogoPath = dlg.FileName;
|
|
}
|
|
|
|
/// <summary>Re-enumerates connected FTDI devices into <see cref="AvailablePorts"/>.</summary>
|
|
[RelayCommand]
|
|
private void RefreshPorts()
|
|
{
|
|
EnumerateFtdiDevices();
|
|
}
|
|
|
|
/// <summary>Appends a new empty row to the RPM-voltage relation table.</summary>
|
|
[RelayCommand]
|
|
private void AddRelation()
|
|
{
|
|
Relations.Add(new RpmVoltageRelation(0.0, 0));
|
|
}
|
|
|
|
/// <summary>Removes the selected row from the RPM-voltage relation table.</summary>
|
|
[RelayCommand]
|
|
private void RemoveRelation(RpmVoltageRelation? relation)
|
|
{
|
|
if (relation != null)
|
|
Relations.Remove(relation);
|
|
}
|
|
|
|
// ── Helpers ───────────────────────────────────────────────────────────
|
|
|
|
/// <summary>
|
|
/// Populates <see cref="AvailablePorts"/> with serial numbers of connected
|
|
/// FTDI devices. Fails silently if the FTDI driver DLL is not present.
|
|
/// </summary>
|
|
private void EnumerateFtdiDevices()
|
|
{
|
|
AvailablePorts.Clear();
|
|
try
|
|
{
|
|
uint count = FtdiInterface.GetDevicesCount();
|
|
if (count == 0) return;
|
|
|
|
var list = new FT_DEVICE_INFO_NODE[count];
|
|
FtdiInterface.GetDeviceList(list);
|
|
|
|
foreach (var device in list)
|
|
{
|
|
if (!string.IsNullOrEmpty(device.SerialNumber))
|
|
AvailablePorts.Add(device.SerialNumber);
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
// FTDI DLL not loaded or no devices — leave list empty.
|
|
}
|
|
}
|
|
}
|
|
}
|