更新配置

This commit is contained in:
GukSang.Jin
2026-01-19 09:02:22 +08:00
parent 42fe094061
commit e121308ea3
3 changed files with 18 additions and 30 deletions

View File

@@ -7,19 +7,16 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<NoWarn>$(NoWarn);NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NModbus" Version="3.0.81" />
<PackageReference Include="NModbus.Serial" Version="3.0.81" />
<PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.2" />
<PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
<PackageReference Include="System.IO.Ports" Version="8.0.0" />
</ItemGroup>
<!-- 複製配置文件到輸出目錄 -->
<ItemGroup>
<None Include="..\config.json" CopyToOutputDirectory="PreserveNewest" />
<!-- 降级 SkiaSharp 相关包 -->
</ItemGroup>
</Project>

View File

@@ -99,18 +99,18 @@ namespace COFTester.ViewModels
if (mode == "SIMULATED")
{
// 模擬模式直接連接
StatusMessage = "模模式 - 正在接...";
StatusMessage = "模模式 - 正在接...";
await ConnectAsync();
}
else if (mode == "MODBUSTCP" || mode == "MODBUSRTU" || mode == "MODBUSASCII")
{
// Modbus 模式自動嘗試連接
StatusMessage = $"正在自動連接 {ConnectionInfo}...";
StatusMessage = $"正在自动连接 {ConnectionInfo}...";
await ConnectAsync();
}
else
{
StatusMessage = $"通信模式: {_config.CommunicationMode} - 請點擊連接";
StatusMessage = $"通信模式: {_config.CommunicationMode} - 请点击连接";
}
}
@@ -276,7 +276,7 @@ namespace COFTester.ViewModels
"MODBUSRTU" => $"RTU: {_config.ModbusRtu.PortName} @ {_config.ModbusRtu.BaudRate}",
"MODBUSASCII" => $"ASCII: {_config.ModbusRtu.PortName} @ {_config.ModbusRtu.BaudRate}",
"SERIALPORT" => $"串口: {_config.SerialPort.PortName} @ {_config.SerialPort.BaudRate}",
"SIMULATED" => "模模式",
"SIMULATED" => "模模式",
_ => "未知模式"
};
}

View File

@@ -57,26 +57,17 @@
"AutoSaveResults": true,
"DefaultTestParameters": {
"Standard": "ASTM D1894",
"SledMass": 200.0,
"TestSpeed": 150.0,
"TestDuration": 30.0,
"SamplingRate": 100.0,
"SledMass": 200,
"TestSpeed": 150,
"TestDuration": 30,
"TestStroke": 150,
"StaticCalcStart": 0,
"StaticCalcEnd": 5,
"KineticCalcStart": 10,
"KineticCalcEnd": 150,
"SampleWidth": 25,
"SamplingRate": 100,
"MaterialType": "Plastic Film",
"Operator": "Default"
},
"_comments": {
"CommunicationMode": "可選值: Simulated, ModbusTCP, ModbusRTU, ModbusASCII, SerialPort",
"ControlRegister": "控制命令寄存器: 0=停止, 1=開始, 2=重置",
"RegisterMap": {
"Force": "0-1 (Float, 只讀) - 力值 N",
"Displacement": "2-3 (Float, 只讀) - 位移 mm",
"Control": "10 (UInt16, 讀寫) - 控制命令",
"Status": "12 (UInt16, 只讀) - 設備狀態",
"SledMass": "20-21 (Float, 寫入) - 滑塊質量 g",
"TestSpeed": "22-23 (Float, 寫入) - 測試速度 mm/min",
"TestDuration": "24-25 (Float, 寫入) - 測試時長 s",
"TestStroke": "26-27 (Float, 寫入) - 測試行程 mm",
"SamplingRate": "28-29 (Float, 寫入) - 採樣頻率 Hz"
}
}
}
}