huangsucan/ADP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

N36600修改

Browse Source
This commit is contained in:
hsc
2026-07-15 17:21:18 +08:00
parent 8e44be4894
commit 0ed080f63c
5 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
DeviceCommand/Devices/N36600.cs
View File

@@ -229,26 +229,9 @@ namespace DeviceCommand.Device
return await WriteReadAsync($"MEAS:VAP?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
/// 3.5.5 查询通道输出端子上测得的电池容量
/// </summary>
public virtual async Task<string> 查询测得电池容量(CancellationToken ct = default)
{
// 修正：去除前缀冒号
return await WriteReadAsync($"MEAS:CAP?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
/// 3.5.6 查询通道输出端子上测得的恒流输出时间长度 (单位: ms)
/// </summary>
public virtual async Task<string> 查询恒流输出时间长度(CancellationToken ct = default)
{
// 修正：去除前缀冒号
return await WriteReadAsync($"MEAS:TIM:CC?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
/// 3.5.7 查询通道输出端子上测得的输出时间长度
/// 3.5.5 查询通道输出端子上测得的输出时间长度
/// </summary>
public virtual async Task<string> 查询总输出时间长度(CancellationToken ct = default)
{
@@ -286,7 +269,7 @@ namespace DeviceCommand.Device
{
// 修正：去除前缀冒号
string 状态 = 开启 ? "ON" : "OFF";
await SendAsync($"OUTP:TIM {状态}{SCPIDelimiter}", ct);
await SendAsync($"OUTP:TIME {状态}{SCPIDelimiter}", ct);
}
/// <summary>
@@ -295,7 +278,7 @@ namespace DeviceCommand.Device
public virtual async Task 设置定时器时间(double 秒数, CancellationToken ct = default)
{
// 修正：去除前缀冒号
string cmd = string.Format(CultureInfo.InvariantCulture, "OUTP:TIM:DATA {0:F1}{1}", 秒数, SCPIDelimiter);
string cmd = string.Format(CultureInfo.InvariantCulture, "OUTP:TIME:DATA {0:F1}{1}", 秒数, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -400,7 +383,14 @@ namespace DeviceCommand.Device
string cmd = string.Format(CultureInfo.InvariantCulture, "VOLT:LIM {0:F3}{1}", 电压, SCPIDelimiter);
await SendAsync(cmd, ct);
}
/// <summary>
/// 3.7.2.9 清除电压上限限制（恢复为设备物理允许的最大电压值）
/// </summary>
public virtual async Task 清除电压上限限制(CancellationToken ct = default)
{
// 发送 MAXimum 设为最大值以达到“清除限制”的效果
await SendAsync($"VOLT:LIMIT MAX{SCPIDelimiter}", ct); // 对应手册 3.7.2.8
}
/// <summary>
/// 3.7.3.1 设置输出功率值 (W)
/// </summary>