cgx/CSI-H238M
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
GukSang.Jin
2026-01-29 15:47:31 +08:00
parent 4638e4c094
commit cb4010bf05
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CSI-H238M/CSI-H238M/Resources/LanguageResources.cs
View File

@@ -158,7 +158,10 @@ namespace COFTester.Resources
// 实时位置显示
["LiftPosition"] = "升降位置",
["HorizontalPosition"] = "水平位置"
["HorizontalPosition"] = "水平位置",
// 手动控制参数标题
["ManualControlParameters"] = "手动控制参数"
},
["en-US"] = new Dictionary<string, string>
@@ -303,7 +306,10 @@ namespace COFTester.Resources
// Real-time Position Display
["LiftPosition"] = "Lift Position",
["HorizontalPosition"] = "Horizontal Position"
["HorizontalPosition"] = "Horizontal Position",
// Manual Control Parameters Title
["ManualControlParameters"] = "Manual Control Parameters"
}
};
@@ -441,6 +447,7 @@ namespace COFTester.Resources
public string DirectionLeft => GetString("DirectionLeft");
public string LiftPosition => GetString("LiftPosition");
public string HorizontalPosition => GetString("HorizontalPosition");
public string ManualControlParameters => GetString("ManualControlParameters");
private string GetString(string key)
{
@@ -581,6 +588,7 @@ namespace COFTester.Resources
OnPropertyChanged(nameof(DirectionLeft));
OnPropertyChanged(nameof(LiftPosition));
OnPropertyChanged(nameof(HorizontalPosition));
OnPropertyChanged(nameof(ManualControlParameters));
}
public event PropertyChangedEventHandler? PropertyChanged;

28
CSI-H238M/CSI-H238M/Services/ModbusService.cs
View File

@@ -205,14 +205,14 @@ namespace COFTester.Services
/// <summary>
/// 重置傳感器，發送重置命令(2)
/// </summary>
public virtual void ResetSensors()
public virtual async void ResetSensors()
{
try
{
if (_modbusMaster != null && _isConnected)
{
System.Diagnostics.Debug.WriteLine("[Modbus] 發送重置命令 (2)");
WriteControlRegisterAsync((ushort)ModbusControlCommand.Reset).Wait();
await WriteControlRegisterAsync((ushort)ModbusControlCommand.Reset);
}
}
catch (Exception ex)
@@ -224,14 +224,14 @@ namespace COFTester.Services
/// <summary>
/// 零點標定，向 M1300 寫入命令 1
/// </summary>
public virtual void ZeroCalibration()
public virtual async void ZeroCalibration()
{
try
{
if (_modbusMaster != null && _isConnected)
{
System.Diagnostics.Debug.WriteLine("[Modbus] 發送零點標定命令 (1) 到 M1300");
WriteCalibrationRegisterAsync((ushort)ModbusCalibrationCommand.ZeroCalibration).Wait();
await WriteCalibrationRegisterAsync((ushort)ModbusCalibrationCommand.ZeroCalibration);
}
}
catch (Exception ex)
@@ -243,14 +243,14 @@ namespace COFTester.Services
/// <summary>
/// 拉力校準，向 M1300 寫入命令 2
/// </summary>
public virtual void ForceCalibration()
public virtual async void ForceCalibration()
{
try
{
if (_modbusMaster != null && _isConnected)
{
System.Diagnostics.Debug.WriteLine("[Modbus] 發送拉力校準命令 (2) 到 M1300");
WriteCalibrationRegisterAsync((ushort)ModbusCalibrationCommand.ForceCalibration).Wait();
await WriteCalibrationRegisterAsync((ushort)ModbusCalibrationCommand.ForceCalibration);
}
}
catch (Exception ex)
@@ -262,14 +262,14 @@ namespace COFTester.Services
/// <summary>
/// 復歸，向 M1300 寫入命令 3
/// </summary>
public virtual void ReturnToOrigin()
public virtual async void ReturnToOrigin()
{
try
{
if (_modbusMaster != null && _isConnected)
{
System.Diagnostics.Debug.WriteLine("[Modbus] 發送復歸命令 (3) 到 M1300");
WriteCalibrationRegisterAsync((ushort)ModbusCalibrationCommand.Return).Wait();
await WriteCalibrationRegisterAsync((ushort)ModbusCalibrationCommand.Return);
}
}
catch (Exception ex)
@@ -283,7 +283,7 @@ namespace COFTester.Services
/// </summary>
/// <param name="direction">方向：Up, Down, Right, Left</param>
/// <param name="start">true=开始移动, false=停止移动</param>
public virtual void DirectionControl(string direction, bool start)
public virtual async void DirectionControl(string direction, bool start)
{
try
{
@@ -302,7 +302,7 @@ namespace COFTester.Services
string action = start ? "開始" : "停止";
System.Diagnostics.Debug.WriteLine($"[Modbus] 方向控制: {direction} {action} - 寫入寄存器 M{(ushort)register} = {value}");
WriteDirectionRegisterAsync((ushort)register, value).Wait();
await WriteDirectionRegisterAsync((ushort)register, value);
}
}
catch (Exception ex)
@@ -315,7 +315,7 @@ namespace COFTester.Services
/// 开始指定方向的测试 - 写入1到对应寄存器
/// M0=上升, M1=下降, M2=向右, M3=向左
/// </summary>
public virtual void StartDirectionTest(string direction)
public virtual async void StartDirectionTest(string direction)
{
try
{
@@ -331,7 +331,7 @@ namespace COFTester.Services
};
System.Diagnostics.Debug.WriteLine($"[Modbus] 开始测试: {direction} - 寫入寄存器 M{(ushort)register} = 1");
WriteDirectionRegisterAsync((ushort)register, 1).Wait();
await WriteDirectionRegisterAsync((ushort)register, 1);
}
}
catch (Exception ex)
@@ -343,7 +343,7 @@ namespace COFTester.Services
/// <summary>
/// 停止指定方向的测试 - 写入0到对应寄存器
/// </summary>
public virtual void StopDirectionTest(string direction)
public virtual async void StopDirectionTest(string direction)
{
try
{
@@ -359,7 +359,7 @@ namespace COFTester.Services
};
System.Diagnostics.Debug.WriteLine($"[Modbus] 停止测试: {direction} - 寫入寄存器 M{(ushort)register} = 0");
WriteDirectionRegisterAsync((ushort)register, 0).Wait();
await WriteDirectionRegisterAsync((ushort)register, 0);
}
}
catch (Exception ex)