diff --git a/DeviceCommand/Devices/ANEVH80.cs b/DeviceCommand/Devices/ANEVH80.cs index 8252766..239febb 100644 --- a/DeviceCommand/Devices/ANEVH80.cs +++ b/DeviceCommand/Devices/ANEVH80.cs @@ -2,17 +2,27 @@ using DeviceCommand.Base; using Model.Models; using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; +using System.Text.RegularExpressions; +using System.Threading; using System.Threading.Tasks; namespace DeviceCommand.Devices { /// - /// ANEVH80 电子负载(一对三控制),基于 TCP 通信,使用 SCPI 指令集。 - /// 用于被测产品的放电/带载测试,可模拟真实负载工况。 + /// ANEVH 操作模式枚举 + /// + public enum ANEVH操作模式_枚举 + { + /// 定值模式 + FIXED, + /// 序列测试模式 + LIST + } + + /// + /// ANEVH 系列双向可编程直流电源(一拖三),基于 TCP 通信,使用 SCPI 指令集。 + /// 作为高压源载一体机使用:同时具备直流电源输出(SOURce)与电子负载(SINK)能力。 /// [ACPCommand] public class ANEVH80 : Tcp @@ -29,15 +39,321 @@ namespace DeviceCommand.Devices } /// - /// 占位符方法,预留后续负载控制操作(如设置负载模式、设置电流等)。 - /// 当前实现为查询频率测量值。 + /// 从设备返回的 SCPI 响应字符串中提取数值部分并转换为 double。 + /// 支持科学计数法(如 2.48E-03),结果保留两位小数。 + /// + /// 设备返回的原始字符串 + /// 提取到的数值(保留两位小数),解析失败时返回 0 + private static double ExtractDouble(string raw) + { + if (string.IsNullOrWhiteSpace(raw)) return 0; + + // 从响应中提取第一个数值(含正负号、小数点、科学计数法),可自动忽略单位后缀与命令头 + var match = Regex.Match(raw, @"[+-]?(?:\d+\.?\d*|\.\d+)(?:[Ee][+-]?\d+)?"); + return match.Success && double.TryParse(match.Value, NumberStyles.Float, CultureInfo.InvariantCulture, out double val) + ? Math.Round(val, 2) + : 0; + } + + #region 1. 系统与公共指令 + + /// + /// 清除错误队列 (*CLS) /// /// 异步取消令牌 - /// 查询到的频率值,解析失败返回 0.0 - public virtual async Task 占位符(CancellationToken ct = default) + public virtual async Task 清除错误队列Async(CancellationToken ct = default) { - string resp = await WriteReadAsync($"MEAS:FREQ?{ScpiDelimiter}", ScpiDelimiter, ct); - return double.TryParse(resp, NumberStyles.Any, CultureInfo.InvariantCulture, out double val) ? val : 0.0; + await SendAsync($"*CLS{ScpiDelimiter}", ct); } + + /// + /// 重设仪器为出厂默认状态 (*RST) + /// + /// 异步取消令牌 + public virtual async Task 复位Async(CancellationToken ct = default) + { + await SendAsync($"*RST{ScpiDelimiter}", ct); + } + + /// + /// 查询仪器识别码 (*IDN?) + /// + /// 异步取消令牌 + /// 设备标识字符串(厂商,型号,序列号,固件版本) + public virtual async Task 查询设备信息Async(CancellationToken ct = default) + { + return await WriteReadAsync($"*IDN?{ScpiDelimiter}", ScpiDelimiter, ct); + } + + /// + /// 查询错误信息 (SYST:ERR?) + /// + /// 异步取消令牌 + /// 错误信息字符串 + public virtual async Task 查询错误信息Async(CancellationToken ct = default) + { + return await WriteReadAsync($"SYST:ERR?{ScpiDelimiter}", ScpiDelimiter, ct); + } + + #endregion + + #region 2. 输出控制 (OUTPut 子系统) + + /// + /// 设置输出开关状态 (OUTP ON / OFF) + /// + /// true: 开启输出, false: 关闭输出 + /// 异步取消令牌 + public virtual async Task 设置输出开关Async(bool isOn, CancellationToken ct = default) + { + string state = isOn ? "ON" : "OFF"; + await SendAsync($"OUTP {state}{ScpiDelimiter}", ct); + } + + /// + /// 设置操作模式 (OUTP:MODE) + /// + /// 操作模式枚举 (FIXED: 定值 | LIST: 序列测试) + /// 异步取消令牌 + public virtual async Task 设置操作模式Async(ANEVH操作模式_枚举 mode, CancellationToken ct = default) + { + await SendAsync($"OUTP:MODE {mode}{ScpiDelimiter}", ct); + } + + #endregion + + #region 3. 源模式参数设置 (SOURce 子系统) + + /// + /// 设置源输出电压 (SOUR:VOLT) + /// + /// 电压值 (单位: V) + /// 异步取消令牌 + public virtual async Task 设置电压Async(double voltage, CancellationToken ct = default) + { + string valStr = voltage.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:VOLT {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 查询源设定电压 (SOUR:VOLT?) + /// + /// 异步取消令牌 + /// 设定电压值 (单位: V) + public virtual async Task 查询设定电压Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"SOUR:VOLT?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + /// + /// 设置源正向限流 (SOUR:CURR) + /// + /// 电流值 (单位: A,正值) + /// 异步取消令牌 + public virtual async Task 设置电流Async(double current, CancellationToken ct = default) + { + string valStr = current.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:CURR {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 查询源设定电流 (SOUR:CURR?) + /// + /// 异步取消令牌 + /// 设定电流值 (单位: A) + public virtual async Task 查询设定电流Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"SOUR:CURR?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + /// + /// 设置源正向限功率 (SOUR:POW) + /// + /// 功率值 (单位: W,正值) + /// 异步取消令牌 + public virtual async Task 设置功率Async(double power, CancellationToken ct = default) + { + string valStr = power.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:POW {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 查询源设定功率 (SOUR:POW?) + /// + /// 异步取消令牌 + /// 设定功率值 (单位: W) + public virtual async Task 查询设定功率Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"SOUR:POW?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + /// + /// 设置电压上升斜率 (SOUR:VOLT:SLEW:POS) + /// + /// 电压上升速率 (单位: V/ms) + /// 异步取消令牌 + public virtual async Task 设置电压上升斜率Async(double slewRate, CancellationToken ct = default) + { + string valStr = slewRate.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:VOLT:SLEW:POS {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 设置电压下降斜率 (SOUR:VOLT:SLEW:NEG) + /// + /// 电压下降速率 (单位: V/ms) + /// 异步取消令牌 + public virtual async Task 设置电压下降斜率Async(double slewRate, CancellationToken ct = default) + { + string valStr = slewRate.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:VOLT:SLEW:NEG {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 设置电流上升斜率 (SOUR:CURR:SLEW:POS) + /// + /// 电流上升速率 (单位: A/ms) + /// 异步取消令牌 + public virtual async Task 设置电流上升斜率Async(double slewRate, CancellationToken ct = default) + { + string valStr = slewRate.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:CURR:SLEW:POS {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 设置电流下降斜率 (SOUR:CURR:SLEW:NEG) + /// + /// 电流下降速率 (单位: A/ms) + /// 异步取消令牌 + public virtual async Task 设置电流下降斜率Async(double slewRate, CancellationToken ct = default) + { + string valStr = slewRate.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:CURR:SLEW:NEG {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 设置过压保护值 (SOUR:VOLT:PROT) + /// + /// 过压保护阈值 (单位: V) + /// 异步取消令牌 + public virtual async Task 设置过压保护Async(double voltage, CancellationToken ct = default) + { + string valStr = voltage.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:VOLT:PROT {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 设置过流保护值 (SOUR:CURR:PROT) + /// + /// 过流保护阈值 (单位: A) + /// 异步取消令牌 + public virtual async Task 设置过流保护Async(double current, CancellationToken ct = default) + { + string valStr = current.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:CURR:PROT {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 设置过功率保护值 (SOUR:POW:PROT) + /// + /// 过功率保护阈值 (单位: W) + /// 异步取消令牌 + public virtual async Task 设置过功率保护Async(double power, CancellationToken ct = default) + { + string valStr = power.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SOUR:POW:PROT {valStr}{ScpiDelimiter}", ct); + } + + #endregion + + #region 4. 负载模式参数设置 (SINK 子系统) + + /// + /// 设置负载吸收电流 (SINK:CURR) + /// + /// 负载电流值 (单位: A) + /// 异步取消令牌 + public virtual async Task 设置负载电流Async(double current, CancellationToken ct = default) + { + string valStr = current.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SINK:CURR {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 查询负载设定电流 (SINK:CURR?) + /// + /// 异步取消令牌 + /// 负载电流设定值 (单位: A) + public virtual async Task 查询负载电流Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"SINK:CURR?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + + + /// + /// 设置负载吸收功率 (SINK:POW) + /// + /// 负载功率值 (单位: W) + /// 异步取消令牌 + public virtual async Task 设置负载功率Async(double power, CancellationToken ct = default) + { + string valStr = power.ToString("0.###", CultureInfo.InvariantCulture); + await SendAsync($"SINK:POWer {valStr}{ScpiDelimiter}", ct); + } + + /// + /// 查询负载设定功率 (SINK:POW?) + /// + /// 异步取消令牌 + /// 负载功率设定值 (单位: W) + public virtual async Task 查询负载功率Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"SINK:POWer?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + #endregion + + #region 5. 测量查询 (MEASure 子系统) + + /// + /// 查询测量电压 (MEAS:VOLT?) + /// + /// 异步取消令牌 + /// 实际输出电压 (单位: V,保留两位小数) + public virtual async Task 读取电压Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"MEAS:VOLT?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + /// + /// 查询测量电流 (MEAS:CURR?) + /// + /// 异步取消令牌 + /// 实际输出电流 (单位: A,保留两位小数,正值为源模式,负值为负载模式) + public virtual async Task 读取电流Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"MEAS:CURR?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + /// + /// 查询测量功率 (MEAS:POW?) + /// + /// 异步取消令牌 + /// 实际输出功率 (单位: W,保留两位小数) + public virtual async Task 读取功率Async(CancellationToken ct = default) + { + string resp = await WriteReadAsync($"MEAS:POW?{ScpiDelimiter}", ScpiDelimiter, ct); + return ExtractDouble(resp); + } + + #endregion } } diff --git a/DeviceEditModule/ViewModels/ANEVH80ViewModel.cs b/DeviceEditModule/ViewModels/ANEVH80ViewModel.cs index 790c795..077a79e 100644 --- a/DeviceEditModule/ViewModels/ANEVH80ViewModel.cs +++ b/DeviceEditModule/ViewModels/ANEVH80ViewModel.cs @@ -11,7 +11,7 @@ using UIShare.ViewModelBase; namespace DeviceEditModule.ViewModels { /// - /// ANEVH80 电子负载 控制面板 ViewModel + /// ANEVH 高压源载一体机 控制面板 ViewModel /// public class ANEVH80ViewModel : NavigateViewModelBase, IDisposable { @@ -26,26 +26,60 @@ namespace DeviceEditModule.ViewModels private bool _isBusy; public bool IsBusy { get => _isBusy; set => SetProperty(ref _isBusy, value); } - #region 输入参数 + #region 输入参数 — 源模式 + private double _voltage; + public double Voltage { get => _voltage; set => SetProperty(ref _voltage, value); } + private double _current; + public double Current { get => _current; set => SetProperty(ref _current, value); } + private double _power; + public double Power { get => _power; set => SetProperty(ref _power, value); } + #endregion + #region 输入参数 — 负载(SINK)参数 + private double _sinkCurrent; + public double SinkCurrent { get => _sinkCurrent; set => SetProperty(ref _sinkCurrent, value); } + private double _sinkPower; + public double SinkPower { get => _sinkPower; set => SetProperty(ref _sinkPower, value); } #endregion #region 测量结果 - private double _measuredValue; - public double MeasuredValue { get => _measuredValue; set => SetProperty(ref _measuredValue, value); } + private double _measuredVoltage; + public double MeasuredVoltage { get => _measuredVoltage; set => SetProperty(ref _measuredVoltage, value); } + private double _measuredCurrent; + public double MeasuredCurrent { get => _measuredCurrent; set => SetProperty(ref _measuredCurrent, value); } + private double _measuredPower; + public double MeasuredPower { get => _measuredPower; set => SetProperty(ref _measuredPower, value); } private string _responseLog = ""; public string ResponseLog { get => _responseLog; set => SetProperty(ref _responseLog, value); } #endregion #region 命令 - public ICommand QueryIdn { get; } public ICommand Measure { get; } + public ICommand QueryIdn { get; } public ICommand Reset { get; } + public ICommand OutOn { get; } public ICommand OutOff { get; } + public ICommand SetV { get; } public ICommand SetI { get; } public ICommand SetP { get; } + public ICommand SetSinkI { get; } public ICommand SetSinkP { get; } + public ICommand QMeas { get; } #endregion public ANEVH80ViewModel(IContainerProvider cp) : base(cp) { _dm = cp.Resolve(); - QueryIdn = new DelegateCommand(async () => await Exec(async () => Log("IDN: 占位符设备"))); - Measure = new DelegateCommand(async () => await Exec(async () => { MeasuredValue = await _dev!.占位符(Ct()); Log($"测量值={MeasuredValue}"); })); + QueryIdn = new DelegateCommand(async () => await Exec(async () => Log("IDN:" + await _dev!.查询设备信息Async(Ct())))); + Reset = new DelegateCommand(async () => await Exec(async () => { await _dev!.复位Async(Ct()); Log("设备已复位"); })); + OutOn = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置输出开关Async(true, Ct()); Log("输出已开启"); })); + OutOff = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置输出开关Async(false, Ct()); Log("输出已关闭"); })); + SetV = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置电压Async(Voltage, Ct()); Log($"电压={Voltage}V"); })); + SetI = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置电流Async(Current, Ct()); Log($"电流={Current}A"); })); + SetP = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置功率Async(Power, Ct()); Log($"功率={Power}W"); })); + SetSinkI = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置负载电流Async(SinkCurrent, Ct()); Log($"负载电流={SinkCurrent}A"); })); + SetSinkP = new DelegateCommand(async () => await Exec(async () => { await _dev!.设置负载功率Async(SinkPower, Ct()); Log($"负载功率={SinkPower}W"); })); + QMeas = new DelegateCommand(async () => await Exec(async () => + { + MeasuredVoltage = await _dev!.读取电压Async(Ct()); + MeasuredCurrent = await _dev!.读取电流Async(Ct()); + MeasuredPower = await _dev!.读取功率Async(Ct()); + Log($"测量→V:{MeasuredVoltage} I:{MeasuredCurrent} P:{MeasuredPower}"); + })); Initialize(); } diff --git a/DeviceEditModule/Views/ANEVH80View.xaml b/DeviceEditModule/Views/ANEVH80View.xaml index 2f46d6c..6e27102 100644 --- a/DeviceEditModule/Views/ANEVH80View.xaml +++ b/DeviceEditModule/Views/ANEVH80View.xaml @@ -25,7 +25,7 @@ - - - -