From 625eb4cda5ccaa4bd8bb80641924e23b00df12df Mon Sep 17 00:00:00 2001
From: rain <rain888899@outlook.com>
Date: Mon, 18 May 2026 10:11:12 +0800
Subject: [PATCH] test

---
 Models/PlcConfiguration.cs     |  2 +-
 ViewModels/StationViewModel.cs |  6 +++---
 Views/MainWindow.xaml          |  7 ++++++-
 appsettings.json               | 10 +++-------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Models/PlcConfiguration.cs b/Models/PlcConfiguration.cs
index c241900..8047141 100644
--- a/Models/PlcConfiguration.cs
+++ b/Models/PlcConfiguration.cs
@@ -7,7 +7,7 @@
         public byte SlaveId { get; set; }
 
         // 硬度
-        public ushort HardnessValue { get; set; }
+        //public ushort HardnessValue { get; set; }
         public ushort HardnessStartCoil { get; set; }
 
         public ushort HardnessCompleteCoil { get; set; }
diff --git a/ViewModels/StationViewModel.cs b/ViewModels/StationViewModel.cs
index 926b559..337d32c 100644
--- a/ViewModels/StationViewModel.cs
+++ b/ViewModels/StationViewModel.cs
@@ -310,7 +310,7 @@ namespace TabletTester2025.ViewModels
                 switch (CurrentTest)
                 {
                     case TestType.Hardness:
-                        HardnessValue = await _plc.ReadFloatAsync(_plcConfig.HardnessValue);
+                        HardnessPoSun = await _plc.ReadFloatAsync(_plcConfig.HardnessPoSun);
                         break;
                     case TestType.Disintegration:
                         DisintegrationTemp = await _plc.ReadFloatAsync(_plcConfig.DisintegrationTemp);
@@ -833,9 +833,9 @@ namespace TabletTester2025.ViewModels
                         completed = await _plc.ReadCoilAsync(_plcConfig.HardnessCompleteCoil);
                     }
 
-                    double val = await _plc.ReadFloatAsync(_plcConfig.HardnessValue);
+                    double val = await _plc.ReadFloatAsync(_plcConfig.HardnessPoSun);
                     _hardnessResults.Add(val);
-                    HardnessValue = val;
+                    HardnessPoSun = val;
 
                     await Task.Delay(1000);
                 }
diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml
index ff8f915..907a70c 100644
--- a/Views/MainWindow.xaml
+++ b/Views/MainWindow.xaml
@@ -268,12 +268,17 @@
 
                                 <GroupBox Header="测试参数设置" Grid.Row="0" Margin="0,5">
                                     <UniformGrid Columns="2" Rows="2" Margin="10">
+                    
+                                        <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
+                                            <TextBlock Text="测试次数" Width="180" VerticalAlignment="Center"/>
+                                            <TextBox Text="{Binding HardnessTestCount, UpdateSourceTrigger=PropertyChanged}" Width="120"  />
+                                        </StackPanel>
                                         <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
                                             <TextBlock Text="硬度速度输入(mm/min)" Width="180" VerticalAlignment="Center"/>
                                             <TextBox Text="{Binding HardnessSudu, UpdateSourceTrigger=PropertyChanged}" Width="120"  />
                                         </StackPanel>
                                         <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
-                                            <TextBlock Text="硬度位移输入(mm/min)" Width="180" VerticalAlignment="Center"/>
+                                            <TextBlock Text="硬度位移输入(mm)" Width="180" VerticalAlignment="Center"/>
                                             <TextBox Text="{Binding HardnessWeiyi, UpdateSourceTrigger=PropertyChanged}" Width="120"  />
                                         </StackPanel>
                                         <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
diff --git a/appsettings.json b/appsettings.json
index 38abc6e..3932dcd 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -7,7 +7,7 @@
     "IpAddress": "192.168.1.10",
     "Port": 502,
     "SlaveId": 1,
-    "HardnessValue": 72, //最大力采集
+    //"HardnessValue": 72,
     "HardnessStartCoil": 70, //硬度工位1启动测试M70
 
     "HardnessStartStop": 73, // 硬度停止
@@ -21,6 +21,7 @@
     "HardnessSudu": 300, // 硬度速度输入mm/min
     "HardnessWeiyi": 310, // 硬度位移输入mm/min
     "HardnessPoSun": 400, // 硬度破损判定输入N
+    "HardnessMax": 72, //最大力采集
 
 
 
@@ -39,7 +40,6 @@
     "DisintegrationMovingUpCoil": 30,
     "DisintegrationStartCoil": 50,
     "DisintegrationStopCoil": 53,
-    "DisintegrationResetCoil": 100,
     "DisintegrationSpeed": 330,
     "DisintegrationTime": 420,
     "DisintegrationCompleteCoils": [ 200, 201, 202, 203, 204, 205 ],
@@ -50,16 +50,12 @@
     "DissolutionStartCoil": 40,
     "Dissolution1StartCoil": 40,
     "Dissolution1StopCoil": 43,
-    "Dissolution1ResetCoil": 105,
     "Dissolution1SampleAckCoil": 44,
     "Dissolution2StartCoil": 30,
     "Dissolution2StopCoil": 33,
-    "Dissolution2ResetCoil": 110,
     "Dissolution2SampleAckCoil": 34,
     "Dissolution1Time": 430,
-    "Dissolution2Time": 440,
-    "Dissolution1SampleInterval": 432,
-    "Dissolution2SampleInterval": 442
+    "Dissolution2Time": 440
   },
   "PharmaStandard": {
     "HardnessMin_N": 40,