更新
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
public ushort HardnessPressure { get; set; }
|
public ushort HardnessPressure { get; set; }
|
||||||
// 脆碎度
|
// 脆碎度
|
||||||
public ushort FriabilityStartCoil { get; set; }
|
public ushort FriabilityStartCoil { get; set; }
|
||||||
|
public ushort FriabilityRpm { get; set; }
|
||||||
public ushort FriabilityRounds { get; set; }
|
public ushort FriabilityRounds { get; set; }
|
||||||
public ushort FriabilityRoundsBox { get; set; } // 兼容旧配置字段
|
public ushort FriabilityRoundsBox { get; set; } // 兼容旧配置字段
|
||||||
public ushort FriabilityTestTime { get; set; }
|
public ushort FriabilityTestTime { get; set; }
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ namespace TabletTester2025
|
|||||||
await LoadHardnessDamageThresholdAsync();
|
await LoadHardnessDamageThresholdAsync();
|
||||||
|
|
||||||
// 脆碎度
|
// 脆碎度
|
||||||
|
await LoadPlcFloatToTextBoxAsync(ResolveFriabilityRpmRegister(), FriabilityRpmBox);
|
||||||
await LoadPlcIntToTextBoxAsync(ResolveFriabilityRoundsRegister(), FriabilityRoundsBox);
|
await LoadPlcIntToTextBoxAsync(ResolveFriabilityRoundsRegister(), FriabilityRoundsBox);
|
||||||
|
|
||||||
// 崩解
|
// 崩解
|
||||||
@@ -70,7 +71,8 @@ namespace TabletTester2025
|
|||||||
p.HardnessTestCount = int.Parse(HardnessCountBox.Text);
|
p.HardnessTestCount = int.Parse(HardnessCountBox.Text);
|
||||||
double hardnessPressure = ParseFiniteDouble(HardnessPressureBox.Text, "加压压力");
|
double hardnessPressure = ParseFiniteDouble(HardnessPressureBox.Text, "加压压力");
|
||||||
int hardnessDamageThreshold = ParsePositiveInt(HardnessDamageThresholdBox.Text, "硬度破损判定");
|
int hardnessDamageThreshold = ParsePositiveInt(HardnessDamageThresholdBox.Text, "硬度破损判定");
|
||||||
p.FriabilityTargetRpm = ParseFiniteDouble(FriabilityRpmBox.Text, "脆碎度转速");
|
double friabilityRpm = ParseFiniteDouble(FriabilityRpmBox.Text, "脆碎度转速");
|
||||||
|
p.FriabilityTargetRpm = friabilityRpm;
|
||||||
p.FriabilityTargetTimeMin = ParseFiniteDouble(FriabilityTimeBox.Text, "脆碎度试验时间");
|
p.FriabilityTargetTimeMin = ParseFiniteDouble(FriabilityTimeBox.Text, "脆碎度试验时间");
|
||||||
p.FriabilityTargetRounds = ParsePositiveInt(FriabilityRoundsBox.Text, "脆碎圈数");
|
p.FriabilityTargetRounds = ParsePositiveInt(FriabilityRoundsBox.Text, "脆碎圈数");
|
||||||
p.FriabilityMaxLossPercent = ParseFiniteDouble(FriabilityMaxLossBox.Text, "最大失重率");
|
p.FriabilityMaxLossPercent = ParseFiniteDouble(FriabilityMaxLossBox.Text, "最大失重率");
|
||||||
@@ -92,6 +94,7 @@ namespace TabletTester2025
|
|||||||
ValidateParameters(p);
|
ValidateParameters(p);
|
||||||
await WriteHardnessPressureAsync(hardnessPressure);
|
await WriteHardnessPressureAsync(hardnessPressure);
|
||||||
await WriteHardnessDamageThresholdAsync(hardnessDamageThreshold);
|
await WriteHardnessDamageThresholdAsync(hardnessDamageThreshold);
|
||||||
|
await WriteFriabilityRpmAsync(friabilityRpm);
|
||||||
App.CurrentPharmaParams = p;
|
App.CurrentPharmaParams = p;
|
||||||
App.SaveCurrentPharmaParameters();
|
App.SaveCurrentPharmaParameters();
|
||||||
|
|
||||||
@@ -275,6 +278,20 @@ namespace TabletTester2025
|
|||||||
catch { textBox.Text = ""; }
|
catch { textBox.Text = ""; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static async Task WriteFriabilityRpmAsync(double value)
|
||||||
|
{
|
||||||
|
ushort registerAddress = ResolveFriabilityRpmRegister();
|
||||||
|
if (registerAddress == 0)
|
||||||
|
throw new InvalidOperationException("脆碎度转速PLC寄存器地址未配置。");
|
||||||
|
|
||||||
|
await App.PlcService.WriteFloatAsync(registerAddress, (float)value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ushort ResolveFriabilityRpmRegister()
|
||||||
|
{
|
||||||
|
return App.PlcConfig.FriabilityRpm != 0 ? App.PlcConfig.FriabilityRpm : (ushort)320;
|
||||||
|
}
|
||||||
|
|
||||||
private static ushort ResolveFriabilityRoundsRegister()
|
private static ushort ResolveFriabilityRoundsRegister()
|
||||||
{
|
{
|
||||||
if (App.PlcConfig.FriabilityRounds != 0)
|
if (App.PlcConfig.FriabilityRounds != 0)
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
"HardnessMax": 72, //最大力采集
|
"HardnessMax": 72, //最大力采集
|
||||||
"HardnessShishilizhi": 1314, //力显示
|
"HardnessShishilizhi": 1314, //力显示
|
||||||
|
|
||||||
|
"FriabilityRpm": 320, // 脆碎度转速 r/min
|
||||||
"FriabilityRounds": 410, // 脆碎圈数
|
"FriabilityRounds": 410, // 脆碎圈数
|
||||||
"FriabilityRoundsBox": 410, // 兼容旧字段:脆碎圈数
|
"FriabilityRoundsBox": 410, // 兼容旧字段:脆碎圈数
|
||||||
"DisintegrationSeconds": 420, //崩解时间
|
"DisintegrationSeconds": 420, //崩解时间
|
||||||
|
|||||||
Reference in New Issue
Block a user