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

CAN卡添加

Browse Source
This commit is contained in:
hsc
2026-07-01 17:37:30 +08:00
parent f27045153c
commit 63f43853fa
13 changed files with 1841 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
DeviceCommand/Devices/N36600.cs
View File

@@ -172,7 +172,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 快捷设置电压电流(double 电压, double 电流, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":APPLY {0:F3},{1:F3}{2}", 电压, 电流, SCPIDelimiter);
// 修正：去除前缀冒号，规范应用 APPL 短格式
string cmd = string.Format(CultureInfo.InvariantCulture, "APPL {0:F3},{1:F3}{2}", 电压, 电流, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -181,7 +182,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询快捷电压电流设定(CancellationToken ct = default)
{
return await WriteReadAsync($":APPLY?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"APPL?{SCPIDelimiter}", SCPIDelimiter, ct);
}
#endregion
@@ -194,7 +196,8 @@ namespace DeviceCommand.Device
[Monitorable("低压直流电源电流")]
public virtual async Task<string> 查询实际电流(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:CURRent?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号，改用标准 MEAS:CURR?
return await WriteReadAsync($"MEAS:CURR?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -203,16 +206,18 @@ namespace DeviceCommand.Device
[Monitorable("低压直流电源功率")]
public virtual async Task<string> 查询实际功率(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:POWer?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号，改用标准 MEAS:POW?
return await WriteReadAsync($"MEAS:POW?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
/// 3.5.3 查询通道输出端子上测得的直流电压值 (V)
/// </summary
/// </summary>
[Monitorable("低压直流电源电压")]
public virtual async Task<string> 查询实际电压(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:VOLTage?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号，改用标准 MEAS:VOLT?
return await WriteReadAsync($"MEAS:VOLT?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -220,7 +225,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询电压电流功率数组(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:VAP?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"MEAS:VAP?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -228,7 +234,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询测得电池容量(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:CAPAcity?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"MEAS:CAP?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -236,7 +243,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询恒流输出时间长度(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:TIMEr:CC?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"MEAS:TIM:CC?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -244,7 +252,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询总输出时间长度(CancellationToken ct = default)
{
return await WriteReadAsync($":MEASure:TIME:OUTPut?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"MEAS:TIME:OUTP?{SCPIDelimiter}", SCPIDelimiter, ct);
}
#endregion
@@ -256,8 +265,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置DC输出(bool 开启, CancellationToken ct = default)
{
// 修正：去除前缀冒号，改用 OUTP 短格式
string 状态 = 开启 ? "ON" : "OFF";
await SendAsync($":OUTPut {状态}{SCPIDelimiter}", ct);
await SendAsync($"OUTP {状态}{SCPIDelimiter}", ct);
}
/// <summary>
@@ -265,7 +275,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询DC输出状态(CancellationToken ct = default)
{
return await WriteReadAsync($":OUTPut?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"OUTP?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -273,8 +284,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置定时器状态(bool 开启, CancellationToken ct = default)
{
// 修正：去除前缀冒号
string 状态 = 开启 ? "ON" : "OFF";
await SendAsync($":OUTPut:TIMEr {状态}{SCPIDelimiter}", ct);
await SendAsync($"OUTP:TIM {状态}{SCPIDelimiter}", ct);
}
/// <summary>
@@ -282,7 +294,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置定时器时间(double 秒数, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":OUTPut:TIMEr:DATA {0:F1}{1}", 秒数, SCPIDelimiter);
// 修正：去除前缀冒号
string cmd = string.Format(CultureInfo.InvariantCulture, "OUTP:TIM:DATA {0:F1}{1}", 秒数, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -291,8 +304,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置输出模式优先(bool 是CV优先, CancellationToken ct = default)
{
// 修正：去除前缀冒号
string 模式 = 是CV优先 ? "CV" : "CC";
await SendAsync($":OUTPut:MODE {模式}{SCPIDelimiter}", ct);
await SendAsync($"OUTP:MODE {模式}{SCPIDelimiter}", ct);
}
#endregion
@@ -304,7 +318,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 清除电流保护状态(CancellationToken ct = default)
{
await SendAsync($":CURRent:PROTection:CLEar{SCPIDelimiter}", ct);
// 修正：去除前缀冒号
await SendAsync($"CURR:PROT:CLE{SCPIDelimiter}", ct);
}
/// <summary>
@@ -312,8 +327,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置电流保护使能(bool 启用, CancellationToken ct = default)
{
// 修正：去除前缀冒号，将 STATE 改为更常用的 STAT 简写
string 状态 = 启用 ? "ON" : "OFF";
await SendAsync($":CURRent:PROTection:STATE {状态}{SCPIDelimiter}", ct);
await SendAsync($"CURR:PROT:STAT {状态}{SCPIDelimiter}", ct);
}
/// <summary>
@@ -321,7 +337,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置过流保护值(double 电流, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":CURRent:PROTection {0:F3}{1}", 电流, SCPIDelimiter);
// 修正：去除前缀冒号。按 NGI 通用指令树，加上层级限制或者直接作用于 CURR:PROT
string cmd = string.Format(CultureInfo.InvariantCulture, "CURR:PROT {0:F3}{1}", 电流, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -330,7 +347,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置电流(double 电流, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":CURRent {0:F3}{1}", 电流, SCPIDelimiter);
// 修正：去除前缀冒号，改用标准 CURR 短格式
string cmd = string.Format(CultureInfo.InvariantCulture, "CURR {0:F3}{1}", 电流, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -339,7 +357,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 清除电压保护状态(CancellationToken ct = default)
{
await SendAsync($":VOLTage:PROTection:CLEar{SCPIDelimiter}", ct);
// 修正：去除前缀冒号
await SendAsync($"VOLT:PROT:CLE{SCPIDelimiter}", ct);
}
/// <summary>
@@ -347,8 +366,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置电压保护使能(bool 启用, CancellationToken ct = default)
{
// 修正：去除前缀冒号
string 状态 = 启用 ? "ON" : "OFF";
await SendAsync($":VOLTage:PROTection:STATE {状态}{SCPIDelimiter}", ct);
await SendAsync($"VOLT:PROT:STAT {状态}{SCPIDelimiter}", ct);
}
/// <summary>
@@ -356,7 +376,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置过压保护值(double 电压, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":VOLTage:PROTection {0:F3}{1}", 电压, SCPIDelimiter);
// 修正：去除前缀冒号
string cmd = string.Format(CultureInfo.InvariantCulture, "VOLT:PROT {0:F3}{1}", 电压, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -365,7 +386,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置电压(double 电压, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":VOLTage {0:F3}{1}", 电压, SCPIDelimiter);
// 修正：去除前缀冒号，改用标准 VOLT 短格式
string cmd = string.Format(CultureInfo.InvariantCulture, "VOLT {0:F3}{1}", 电压, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -374,7 +396,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置电压上限限制(double 电压, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":VOLTage:LIMIT {0:F3}{1}", 电压, SCPIDelimiter);
// 修正：去除前缀冒号
string cmd = string.Format(CultureInfo.InvariantCulture, "VOLT:LIM {0:F3}{1}", 电压, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -383,7 +406,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置功率(double 功率, CancellationToken ct = default)
{
string cmd = string.Format(CultureInfo.InvariantCulture, ":POWer {0:F3}{1}", 功率, SCPIDelimiter);
// 修正：去除前缀冒号，改用标准 POW 短格式
string cmd = string.Format(CultureInfo.InvariantCulture, "POW {0:F3}{1}", 功率, SCPIDelimiter);
await SendAsync(cmd, ct);
}
@@ -392,8 +416,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置恒功率输出使能(bool 启用, CancellationToken ct = default)
{
// 修正：去除前缀冒号
string 状态 = 启用 ? "ON" : "OFF";
await SendAsync($":POWer:STATE {状态}{SCPIDelimiter}", ct);
await SendAsync($"POW:STAT {状态}{SCPIDelimiter}", ct);
}
#endregion
@@ -405,8 +430,9 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 设置蜂鸣器状态(bool 开启, CancellationToken ct = default)
{
// 修正：去除前缀冒号
string 状态 = 开启 ? "ON" : "OFF";
await SendAsync($":SYSTem:BEEPer:STATE {状态}{SCPIDelimiter}", ct);
await SendAsync($"SYST:BEEP:STAT {状态}{SCPIDelimiter}", ct);
}
/// <summary>
@@ -414,7 +440,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 蜂鸣器鸣叫(CancellationToken ct = default)
{
await SendAsync($":SYSTem:BEEPer{SCPIDelimiter}", ct);
// 修正：去除前缀冒号
await SendAsync($"SYST:BEEP{SCPIDelimiter}", ct);
}
/// <summary>
@@ -422,7 +449,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询错误记录数量(CancellationToken ct = default)
{
return await WriteReadAsync($":SYSTem:ERRor:COUNT?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"SYST:ERR:COUN?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -430,7 +458,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task<string> 查询错误信息(CancellationToken ct = default)
{
return await WriteReadAsync($":SYSTem:ERRor?{SCPIDelimiter}", SCPIDelimiter, ct);
// 修正：去除前缀冒号
return await WriteReadAsync($"SYST:ERR?{SCPIDelimiter}", SCPIDelimiter, ct);
}
/// <summary>
@@ -438,7 +467,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 切换本地控制模式(CancellationToken ct = default)
{
await SendAsync($":SYSTem:LOCal{SCPIDelimiter}", ct);
// 修正：去除前缀冒号
await SendAsync($"SYST:LOC{SCPIDelimiter}", ct);
}
/// <summary>
@@ -446,7 +476,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 切换远程控制模式(CancellationToken ct = default)
{
await SendAsync($":SYSTem:REMote{SCPIDelimiter}", ct);
// 修正：去除前缀冒号
await SendAsync($"SYST:REM{SCPIDelimiter}", ct);
}
/// <summary>
@@ -454,7 +485,8 @@ namespace DeviceCommand.Device
/// </summary>
public virtual async Task 远程控制模式锁定(CancellationToken ct = default)
{
await SendAsync($":SYSTem:RWLock{SCPIDelimiter}", ct);
// 修正：去除前缀冒号
await SendAsync($"SYST:RWL{SCPIDelimiter}", ct);
}
#endregion