Models/CalibrationConfig.cs

@@ -24,5 +24,17 @@ namespace AciTester.Models
 
         [ObservableProperty]
         private float temperatureProtect = 40.0f;   // D1084
+
+
+
+        // 新增校准开关状态
+        [ObservableProperty]
+        private bool flowCalibrationEnabled;          // M1300
+
+        [ObservableProperty]
+        private bool pumpPressureCalibrationEnabled;  // M1302
+
+        [ObservableProperty]
+        private bool impactorPressureCalibrationEnabled; // M1303
     }
 }

Models/PlcConfiguration.cs

@@ -69,6 +69,11 @@ namespace AciTester.Models
         public ushort ConstantTempStartCoil { get; set; } = 4;       // M4
         public ushort DefrostStartCoil { get; set; } = 19;           // M19
 
+
+
+        public ushort FlowCalibrationCoil { get; set; } = 1300;          // M1300
+        public ushort PumpPressureCalibCoil { get; set; } = 1302;       // M1302
+
     }
 
     /// <summary>

ViewModels/ConfigViewModel.cs

@@ -43,6 +43,17 @@ namespace AciTester.ViewModels
                 var protect = await _plcService.ReadFloatAsync(_config.FlowProtectReg);
                 _calib.FlowLowLimit = protect - 5; // 示例，实际根据协议解析
                 _calib.FlowHighLimit = protect + 5;
+
+
+                // 读取线圈状态（新增）
+                _calib.FlowCalibrationEnabled = await _plcService.ReadCoilAsync(_config.FlowCalibrationCoil);
+                _calib.PumpPressureCalibrationEnabled = await _plcService.ReadCoilAsync(_config.PumpPressureCalibCoil);
+                _calib.ImpactorPressureCalibrationEnabled = await _plcService.ReadCoilAsync(_config.ImpactorPressureCalibCoil);
+
+
+
+
+
             }
             catch (System.Exception ex)
             {
@@ -64,6 +75,19 @@ namespace AciTester.ViewModels
                 await _plcService.WriteMultipleRegistersAsync(_config.PumpPressureCalibReg, _calib.PumpPressureCalibration);
                 await _plcService.WriteMultipleRegistersAsync(_config.ImpactorPressureCalibReg, _calib.ImpactorPressureCalibration);
                 // 写入流量保护值（需根据实际协议拆分高低限）
+
+
+
+
+                await _plcService.WriteCoilAsync(_config.FlowCalibrationCoil, _calib.FlowCalibrationEnabled);
+                await _plcService.WriteCoilAsync(_config.PumpPressureCalibCoil, _calib.PumpPressureCalibrationEnabled);
+                await _plcService.WriteCoilAsync(_config.ImpactorPressureCalibCoil, _calib.ImpactorPressureCalibrationEnabled);
+
+
+
+
+
+
                 MessageBox.Show("配置保存成功", "提示");
                 // 可选：触发重新校准
                 await _plcService.WriteCoilAsync(_config.ImpactorPressureCalibCoil, true);

ViewModels/MainViewModel.cs

@@ -75,18 +75,20 @@ namespace AciTester.ViewModels
             _plcService = new ModbusTcpPlcService(_config);
             _reportService = new ExcelReportService();
 
+            // NGI 装置三 - 依据《中国药典》2025年版通则0951 表3
+            // 包含预分离器 + Stage 1 ~ 7 + MOC，共9个收集部件
             Stages = new ObservableCollection<StageData>
-            {
+{
-                new StageData { StageName = "Stage 0", CutoffDiameter = 9.0 },
+    new StageData { StageName = "预分离器", CutoffDiameter = 12.80 },  // 不计入粒径分布
-                new StageData { StageName = "Stage 1", CutoffDiameter = 5.8 },
+    new StageData { StageName = "Stage 1", CutoffDiameter = 14.30 },
-                new StageData { StageName = "Stage 2", CutoffDiameter = 4.7 },
+    new StageData { StageName = "Stage 2", CutoffDiameter = 4.88 },
-                new StageData { StageName = "Stage 3", CutoffDiameter = 3.3 },
+    new StageData { StageName = "Stage 3", CutoffDiameter = 2.185 },
-                new StageData { StageName = "Stage 4", CutoffDiameter = 2.1 },
+    new StageData { StageName = "Stage 4", CutoffDiameter = 1.207 },
-                new StageData { StageName = "Stage 5", CutoffDiameter = 1.1 },
+    new StageData { StageName = "Stage 5", CutoffDiameter = 0.608 },
-                new StageData { StageName = "Stage 6", CutoffDiameter = 0.7 },
+    new StageData { StageName = "Stage 6", CutoffDiameter = 0.323 },
-                new StageData { StageName = "Stage 7", CutoffDiameter = 0.4 },
+    new StageData { StageName = "Stage 7", CutoffDiameter = 0.206 },
-                new StageData { StageName = "Filter", CutoffDiameter = 0.0 }
+    new StageData { StageName = "MOC", CutoffDiameter = 0.070 }
-            };
+};
 
             ConnectCommand = new AsyncRelayCommand(ConnectAsync);
             DisconnectCommand = new RelayCommand(Disconnect);
@@ -438,11 +440,100 @@ namespace AciTester.ViewModels
             }
         }
 
+        //private void CalculateResult()
+        //{
+        //    double totalMass = 0;
+        //    foreach (var stage in Stages)
+        //        totalMass += stage.NetWeight;
+
+        //    if (totalMass <= 0)
+        //    {
+        //        MessageBox.Show("总质量为零，无法计算", "警告", MessageBoxButton.OK, MessageBoxImage.Warning);
+        //        return;
+        //    }
+
+        //    // 1. 计算各级占比和累积分布（8个层级）
+        //    double[] diamArray = new double[8];
+        //    for (int i = 0; i < 8; i++)
+        //        diamArray[i] = Stages[i].CutoffDiameter;
+
+        //    double[] percentages = new double[8];
+        //    double[] cumulatives = new double[8];
+        //    double sum = 0;
+        //    for (int i = 0; i < 8; i++)
+        //    {
+        //        percentages[i] = Stages[i].NetWeight / totalMass * 100;
+        //        sum += percentages[i];
+        //        cumulatives[i] = sum;
+        //    }
+
+        //    // 2. 插值函数（与之前相同，但只使用8个点）
+        //    double Interpolate(double targetCum)
+        //    {
+        //        if (targetCum <= cumulatives[0]) return diamArray[0];
+        //        if (targetCum >= cumulatives[7]) return diamArray[7];
+        //        for (int i = 0; i < 7; i++)
+        //        {
+        //            if (cumulatives[i] <= targetCum && cumulatives[i + 1] >= targetCum)
+        //            {
+        //                double d1 = diamArray[i];
+        //                double d2 = diamArray[i + 1];
+        //                double c1 = cumulatives[i];
+        //                double c2 = cumulatives[i + 1];
+        //                double logD1 = Math.Log(d1);
+        //                double logD2 = Math.Log(d2);
+        //                double logD = logD1 + (targetCum - c1) * (logD2 - logD1) / (c2 - c1);
+        //                return Math.Exp(logD);
+        //            }
+        //        }
+        //        return diamArray[7];
+        //    }
+
+        //    double d10 = Interpolate(10);
+        //    double d50 = Interpolate(50);
+        //    double d90 = Interpolate(90);
+
+        //    // 3. GSD (D84/D16)
+        //    double d16 = Interpolate(16);
+        //    double d84 = Interpolate(84);
+        //    double gsd = (d16 > 0 && d84 > 0) ? d84 / d16 : 0;
+
+        //    // 4. 微细粒子剂量(FPD)和分数(FPF)
+        //    // NGI中，截止直径 ≤ 5μm 的层级为 Stage 3~7 以及 MOC（Stage 3的D50=2.82μm，Stage 7=0.34μm，全部≤5μm）
+        //    // 因此统计 Stage 3,4,5,6,7 和 MOC 的质量
+        //    double fineMass = 0;
+        //    for (int i = 2; i < 8; i++) // i=2 对应Stage 3（数组索引从0开始）
+        //        fineMass += Stages[i].NetWeight;
+
+        //    double fpd = fineMass * 1000; // mg
+        //    double fpf = (fineMass / totalMass) * 100;
+
+        //    // 5. 赋值给 CurrentResult
+        //    CurrentResult = new TestResult
+        //    {
+        //        TestTime = DateTime.Now,
+        //        TotalMass = totalMass,
+        //        FineParticleDose = fpd,
+        //        FineParticleFraction = fpf,
+        //        Stages = Stages.ToList(),
+        //        FlowRate = CurrentFlow,
+        //        Temperature = RealTime.Temperature,
+        //        DifferentialPressure = RealTime.DifferentialPressure,
+        //        D10 = d10,
+        //        D50 = d50,
+        //        D90 = d90,
+        //        GSD = gsd
+        //    };
+
+        //    MessageBox.Show($"计算完成\n总质量: {totalMass:F4} g\n微细粒子剂量: {fpd:F2} mg\n微细粒子分数: {fpf:F2}%\nD50: {d50:F2} μm",
+        //        "计算结果", MessageBoxButton.OK, MessageBoxImage.Information);
+        //}
         private void CalculateResult()
         {
+            // 排除预分离器（索引0），只计算 Stage 1 ~ MOC（索引1~8）
             double totalMass = 0;
-            foreach (var stage in Stages)
+            for (int i = 1; i < 9; i++)
-                totalMass += stage.NetWeight;
+                totalMass += Stages[i].NetWeight;
 
             if (totalMass <= 0)
             {
@@ -450,30 +541,32 @@ namespace AciTester.ViewModels
                 return;
             }
 
-            // 1. 计算各级占比和累积分布
+            // 提取 Stage 1 ~ MOC 的直径和质量（索引1~8）
-            // 注意：Stages[0] ~ Stages[7] 对应 Stage0~Stage7，Stages[8] 是 Filter
+            double[] diamArray = new double[8];
-            // 截止直径数组（与 Stages 的顺序一致）
+            double[] netWeights = new double[8];
-            double[] diamArray = new double[9];
+            for (int i = 0; i < 8; i++)
-            for (int i = 0; i < 9; i++)
-                diamArray[i] = Stages[i].CutoffDiameter;
-
-            // 占比和累积分布
-            double[] percentages = new double[9];
-            double[] cumulatives = new double[9];
-            double sum = 0;
-            for (int i = 0; i < 9; i++)
             {
-                percentages[i] = Stages[i].NetWeight / totalMass * 100;
+                diamArray[i] = Stages[i + 1].CutoffDiameter;
+                netWeights[i] = Stages[i + 1].NetWeight;
+            }
+
+            // 计算占比和累积分布
+            double[] percentages = new double[8];
+            double[] cumulatives = new double[8];
+            double sum = 0;
+            for (int i = 0; i < 8; i++)
+            {
+                percentages[i] = netWeights[i] / totalMass * 100;
                 sum += percentages[i];
                 cumulatives[i] = sum;
             }
 
-            // 2. 插值函数：给定累积百分比，返回对应的粒径（对数线性插值）
+            // 插值函数（只针对8个数据点）
             double Interpolate(double targetCum)
             {
                 if (targetCum <= cumulatives[0]) return diamArray[0];
-                if (targetCum >= cumulatives[8]) return diamArray[8];
+                if (targetCum >= cumulatives[7]) return diamArray[7];
-                for (int i = 0; i < 8; i++)
+                for (int i = 0; i < 7; i++)
                 {
                     if (cumulatives[i] <= targetCum && cumulatives[i + 1] >= targetCum)
                     {
@@ -487,31 +580,27 @@ namespace AciTester.ViewModels
                         return Math.Exp(logD);
                     }
                 }
-                return diamArray[8];
+                return diamArray[7];
             }
 
             double d10 = Interpolate(10);
             double d50 = Interpolate(50);
             double d90 = Interpolate(90);
 
-            // 3. 计算 GSD（几何标准偏差）：GSD = D84 / D16（如果可用）
+            // GSD
             double d16 = Interpolate(16);
             double d84 = Interpolate(84);
             double gsd = (d16 > 0 && d84 > 0) ? d84 / d16 : 0;
 
-            // 4. 计算微细粒子剂量和分数（原有逻辑）
+            // FPD: Stage 3 ~ MOC（索引3~8）
             double fineMass = 0;
-            foreach (var stage in Stages)
+            for (int i = 3; i < 9; i++)
-            {
+                fineMass += Stages[i].NetWeight;
-                if (stage.CutoffDiameter <= 5.0 && stage.CutoffDiameter > 0)
-                    fineMass += stage.NetWeight;
-            }
-            fineMass += Stages[8].NetWeight; // Filter
 
-            double fpd = fineMass * 1000; // mg
+            double fpd = fineMass * 1000;
             double fpf = (fineMass / totalMass) * 100;
 
-            // 5. 赋值给 CurrentResult
+            // 保存结果
             CurrentResult = new TestResult
             {
                 TestTime = DateTime.Now,
@@ -522,7 +611,6 @@ namespace AciTester.ViewModels
                 FlowRate = CurrentFlow,
                 Temperature = RealTime.Temperature,
                 DifferentialPressure = RealTime.DifferentialPressure,
-                // 新增粒径参数
                 D10 = d10,
                 D50 = d50,
                 D90 = d90,

Views/ConfigWindow.xaml

@@ -1,7 +1,7 @@
 <Window x:Class="AciTester.Views.ConfigWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="参数校准配置 - Ctrl+P" Height="450" Width="500"
+        Title="参数校准配置 - Ctrl+P" Height="550" Width="520"
         WindowStartupLocation="CenterOwner">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -11,31 +11,38 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+
+        <!-- 流量校准 -->
         <GroupBox Header="流量校准" Grid.Row="0">
             <StackPanel Orientation="Horizontal" Margin="5">
                 <TextBlock Text="流量系数:" Width="80" VerticalAlignment="Center"/>
                 <TextBox Text="{Binding Calibration.FlowCalibration}" Width="100"/>
-                <!--<TextBlock Text="保护低限:" Margin="20,0,0,0"/>
+                <TextBlock Text="   保护低限:" Margin="20,0,0,0"/>
                 <TextBox Text="{Binding Calibration.FlowLowLimit}" Width="80"/>
                 <TextBlock Text="高限:" Margin="5,0,0,0"/>
-                <TextBox Text="{Binding Calibration.FlowHighLimit}" Width="80"/>-->
+                <TextBox Text="{Binding Calibration.FlowHighLimit}" Width="80"/>
             </StackPanel>
         </GroupBox>
+
+        <!-- 温度校准 -->
         <GroupBox Header="温度校准" Grid.Row="1" Margin="0,10">
             <StackPanel Orientation="Horizontal" Margin="5">
                 <TextBlock Text="温度系数:" Width="80"/>
                 <TextBox Text="{Binding Calibration.TemperatureCalibration}" Width="100"/>
             </StackPanel>
         </GroupBox>
+
+        <!-- 压力校准(泵端) -->
         <GroupBox Header="压力校准(泵端)" Grid.Row="2">
             <StackPanel Orientation="Horizontal" Margin="5">
                 <TextBlock Text="泵端压力系数:" Width="120"/>
                 <TextBox Text="{Binding Calibration.PumpPressureCalibration}" Width="100"/>
             </StackPanel>
         </GroupBox>
+
+        <!-- 压力校准(撞击器端) -->
         <GroupBox Header="压力校准(撞击器端)" Grid.Row="3" Margin="0,10">
             <StackPanel Orientation="Horizontal" Margin="5">
                 <TextBlock Text="撞击器端压力系数:" Width="140"/>
@@ -43,16 +50,28 @@
             </StackPanel>
         </GroupBox>
 
+        <!-- 温度保护 -->
         <GroupBox Header="温度保护" Grid.Row="4" Margin="0,10">
             <StackPanel Orientation="Horizontal" Margin="5">
                 <TextBlock Text="温度保护值(℃):" Width="120"/>
                 <TextBox Text="{Binding Calibration.TemperatureProtect}" Width="100"/>
             </StackPanel>
         </GroupBox>
-        <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10">
+
+        <!-- 校准开关（新增） -->
+        <GroupBox Header="校准开关" Grid.Row="5" Margin="0,10">
+            <StackPanel>
+                <CheckBox IsChecked="{Binding Calibration.FlowCalibrationEnabled}" Content="流量校准 (M1300)" Margin="5"/>
+                <CheckBox IsChecked="{Binding Calibration.PumpPressureCalibrationEnabled}" Content="压力校准负压泵端 (M1302)" Margin="5"/>
+                <CheckBox IsChecked="{Binding Calibration.ImpactorPressureCalibrationEnabled}" Content="压力校准撞击器端 (M1303)" Margin="5"/>
+            </StackPanel>
+        </GroupBox>
+
+        <!-- 按钮区域（原 Grid.Row="4" 调整为 Row="6"） -->
+        <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10">
             <Button Command="{Binding LoadConfigCommand}" Content="读取" Width="80" Margin="5"/>
             <Button Command="{Binding SaveConfigCommand}" Content="保存" Width="80" Margin="5"/>
-            <Button Click="CloseWindow"  Content="关闭" Width="80" Margin="5"/>
+            <Button Click="CloseWindow" Content="关闭" Width="80" Margin="5"/>
         </StackPanel>
     </Grid>
 </Window>

Views/MainWindow.xaml

@@ -238,7 +238,7 @@
               IsReadOnly="False"
               Loaded="StagesDataGrid_Loaded"
               FontSize="13"
-              RowHeight="34"
+              RowHeight="28"
               FocusVisualStyle="{x:Null}"
               GridLinesVisibility="None"
               SelectionMode="Single"