csi_team/CSI-Z420-Tablet-Multi-Function-Tester
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
GukSang.Jin
2026-05-19 19:37:13 +08:00
parent 1e1f1e930e
commit b2286cd514
5 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/PlcConfiguration.cs
View File

@@ -54,6 +54,8 @@
// 溶出 // 溶出
public ushort DissolutionRpm { get; set; } public ushort DissolutionRpm { get; set; }
public ushort Dissolution1Speed { get; set; }
public ushort Dissolution2Speed { get; set; }
public ushort DissolutionPercent { get; set; } public ushort DissolutionPercent { get; set; }
public ushort Dissolution1Percent { get; set; } public ushort Dissolution1Percent { get; set; }
public ushort Dissolution2Percent { get; set; } public ushort Dissolution2Percent { get; set; }

2
Services/PlcSimulator.cs
View File

@@ -22,6 +22,8 @@ namespace TabletTester2025.Services
412 => 5.0f + (float)_rand.NextDouble() * 2, // 脆碎度前重 412 => 5.0f + (float)_rand.NextDouble() * 2, // 脆碎度前重
414 => 4.9f + (float)_rand.NextDouble() * 2, // 后重 414 => 4.9f + (float)_rand.NextDouble() * 2, // 后重
300 => 37.0f, // 温度 300 => 37.0f, // 温度
340 => 50f, // 溶出速度1(r/min)
350 => 50f, // 溶出速度2(r/min)
400 => 50 + (float)_rand.NextDouble() * 30, // 转速 400 => 50 + (float)_rand.NextDouble() * 30, // 转速
402 => 70 + (float)_rand.NextDouble() * 30, // 溶出度% 402 => 70 + (float)_rand.NextDouble() * 30, // 溶出度%
404 => 70 + (float)_rand.NextDouble() * 30, // 溶出2溶出度% 404 => 70 + (float)_rand.NextDouble() * 30, // 溶出2溶出度%

8
Views/ShowData.xaml
View File

@@ -125,6 +125,14 @@
<Border Style="{StaticResource CardStyle}"> <Border Style="{StaticResource CardStyle}">
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource GroupTitle}" Text="⚙ 溶出测试参数"/> <TextBlock Style="{StaticResource GroupTitle}" Text="⚙ 溶出测试参数"/>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="溶出速度1(r/min)"/>
<TextBox Style="{StaticResource SettingTextBox}" Name="txt_Dissolution1Speed"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="溶出速度2(r/min)"/>
<TextBox Style="{StaticResource SettingTextBox}" Name="txt_Dissolution2Speed"/>
</StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="溶出1时间设置(min)"/> <TextBlock Style="{StaticResource SettingLabel}" Text="溶出1时间设置(min)"/>
<TextBox Style="{StaticResource SettingTextBox}" Name="txt_DissolutionTime"/> <TextBox Style="{StaticResource SettingTextBox}" Name="txt_DissolutionTime"/>

2
Views/ShowData.xaml.cs
View File

@@ -154,6 +154,8 @@ namespace 片剂四用仪.Views
new PlcParamMapping("txt_DisintegrationSpeed", AddressOrDefault(plcConfig.DisintegrationSpeed, 330), PlcParamType.Float), new PlcParamMapping("txt_DisintegrationSpeed", AddressOrDefault(plcConfig.DisintegrationSpeed, 330), PlcParamType.Float),
new PlcParamMapping("txt_DisintegrationTime", AddressOrDefault(plcConfig.DisintegrationTime, 420), PlcParamType.Int), new PlcParamMapping("txt_DisintegrationTime", AddressOrDefault(plcConfig.DisintegrationTime, 420), PlcParamType.Int),
new PlcParamMapping("txt_Dissolution1Speed", AddressOrDefault(plcConfig.Dissolution1Speed, 340), PlcParamType.Float),
new PlcParamMapping("txt_Dissolution2Speed", AddressOrDefault(plcConfig.Dissolution2Speed, 350), PlcParamType.Float),
new PlcParamMapping("txt_DissolutionTime", AddressOrDefault(plcConfig.Dissolution1Time, 430), PlcParamType.Int), new PlcParamMapping("txt_DissolutionTime", AddressOrDefault(plcConfig.Dissolution1Time, 430), PlcParamType.Int),
new PlcParamMapping("txt_Dissolution2Time", AddressOrDefault(plcConfig.Dissolution2Time, 440), PlcParamType.Int), new PlcParamMapping("txt_Dissolution2Time", AddressOrDefault(plcConfig.Dissolution2Time, 440), PlcParamType.Int),
new PlcParamMapping("txt_Dissolution1SamplingInterval", AddressOrDefault(plcConfig.Dissolution1SampleInterval, 432), PlcParamType.Float), new PlcParamMapping("txt_Dissolution1SamplingInterval", AddressOrDefault(plcConfig.Dissolution1SampleInterval, 432), PlcParamType.Float),

2
appsettings.json
View File

@@ -52,6 +52,8 @@
"DisintegrationTime": 420, "DisintegrationTime": 420,
"DisintegrationCompleteCoils": [ 200, 201, 202, 203, 204, 205 ], "DisintegrationCompleteCoils": [ 200, 201, 202, 203, 204, 205 ],
"DissolutionRpm": 400, "DissolutionRpm": 400,
"Dissolution1Speed": 340,
"Dissolution2Speed": 350,
"DissolutionPercent": 402, "DissolutionPercent": 402,
"Dissolution1Percent": 402, "Dissolution1Percent": 402,
"Dissolution2Percent": 0, "Dissolution2Percent": 0,