From caa49c716f329f567e42a7f82de8161e1d01c9d6 Mon Sep 17 00:00:00 2001
From: xyy <544939200@qq.com>
Date: Tue, 26 May 2026 17:17:09 +0800
Subject: [PATCH]

---
 App.config                   |  8 ++++----
 Resources/Strings.en-US.xaml |  2 +-
 Window1.xaml                 |  8 ++++----
 Window2.xaml                 | 14 +++++++-------
 Window4.xaml                 | 14 +++++---------
 Window5.xaml.cs              |  2 +-
 6 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/App.config b/App.config
index 1943119..e93f8b6 100644
--- a/App.config
+++ b/App.config
@@ -2,13 +2,13 @@
 <configuration>
 	<appSettings>
 		<!--压力PLC-->
-		<!--<add key="PLC1_IP" value="192.168.1.11"/>-->
-		<add key="PLC1_IP" value="127.0.0.1"/>
+		<add key="PLC1_IP" value="192.168.1.10"/>
+		<!--<add key="PLC1_IP" value="127.0.0.1"/>-->
 		<add key="PLC1_Port" value="502"/>
 
 		<!--二氧化碳PLC-->
-		<!--<add key="PLC2_IP" value="192.168.1.10"/>-->
-		<add key="PLC1_IP" value="127.0.0.1"/>
+		<add key="PLC2_IP" value="192.168.1.10"/>
+		<!--<add key="PLC1_IP" value="127.0.0.1"/>-->
 
 		<add key="PLC2_Port" value="502"/>
 
diff --git a/Resources/Strings.en-US.xaml b/Resources/Strings.en-US.xaml
index 54bc30b..647c8f8 100644
--- a/Resources/Strings.en-US.xaml
+++ b/Resources/Strings.en-US.xaml
@@ -13,7 +13,7 @@
     <system:String x:Key="RealTimeDisplay">Adjust the set pressure, and the corresponding flow rate at this time</system:String>
     <system:String x:Key="CurrentTest">Set the pressure：</system:String>
     <system:String x:Key="Setting">Setting</system:String>
-    <system:String x:Key="TriggerDisplacement">Calibration pressure</system:String>
+    <system:String x:Key="TriggerDisplacement">Calibration</system:String>
     <system:String x:Key="CurrentPosition">Real-time traffic flow：</system:String>
 
     <system:String x:Key="RealTimePressure">Real-time Pressure：</system:String>
diff --git a/Window1.xaml b/Window1.xaml
index 3a3edae..2e40f9f 100644
--- a/Window1.xaml
+++ b/Window1.xaml
@@ -89,7 +89,7 @@
                 <StackPanel Orientation="Horizontal" Margin="0,10" Width="550">
                     <TextBlock Text="{DynamicResource CurrentTest}" VerticalAlignment="Center" Foreground="Black"/>
 
-                    <TextBox x:Name="SettingPaTextBox" Width="120" Margin="10,0" Style="{StaticResource MyTextBoxStyle}"                         
+                    <TextBox x:Name="SettingPaTextBox" Width="140" Margin="10,0" Style="{StaticResource MyTextBoxStyle}"                         
         IsReadOnly="True"
                              InputScope="Number"    PreviewTextInput="SettingPaTextBox_PreviewTextInput"  />
 
@@ -100,9 +100,9 @@
 
                 <StackPanel Orientation="Horizontal" Margin="0,10" Width="554">
                     <TextBlock Text="{DynamicResource RealTimePressure}" VerticalAlignment="Center" Foreground="Black"/>
-                    <TextBox x:Name="RealTimePressureTextBox" Width="120" Margin="10,0" Style="{StaticResource MyTextBoxStyle}" IsReadOnly="True" IsEnabled="True"/>
-                    <TextBlock Text="pa" VerticalAlignment="Center"  Foreground="Black"/>
-                    <Button Name="btnjiaozhun" Content="{DynamicResource TriggerDisplacement}" Width="180" Style="{StaticResource MyButtonStyle}" Click="Button_Click"/>
+                    <TextBox x:Name="RealTimePressureTextBox" Width="140" Margin="32,0" Style="{StaticResource MyTextBoxStyle}" IsReadOnly="True" IsEnabled="True"/>
+                    <TextBlock Text="pa" VerticalAlignment="Center" Margin="-20"   Foreground="Black"/>
+                    <Button Name="btnjiaozhun" Content="{DynamicResource TriggerDisplacement}" Width="150"  Style="{StaticResource MyButtonStyle}" Click="Button_Click"/>
                 </StackPanel>
             </StackPanel>
 
diff --git a/Window2.xaml b/Window2.xaml
index 11c8ee3..19cb84a 100644
--- a/Window2.xaml
+++ b/Window2.xaml
@@ -92,8 +92,8 @@
                     <TextBlock Text="{DynamicResource Peak force test result(N)}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin1}"/>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBox Name="RealTimePressureTextBox" Width="80" Style="{StaticResource MyTextBoxStyle}" Margin="0" IsEnabled="false"/>
-                        <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="5,0,0,0"/>
+                        <TextBox Name="RealTimePressureTextBox" Width="100" Style="{StaticResource MyTextBoxStyle}" Margin="0" IsEnabled="false"/>
+                        <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="0,0,0,0"/>
                     </StackPanel>
 
                     <Button  Name="btnlianjiekou"  Grid.Column="2" Content="{DynamicResource Deformation2}" Width="250" Style="{StaticResource MyButtonStyle}" Click="Button_Click" HorizontalAlignment="Left"/>
@@ -110,8 +110,8 @@
                     <TextBlock Text="{DynamicResource TestResults}" VerticalAlignment="Center" Foreground="Black"  Margin="{DynamicResource Margin2}"/>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBox Name="NoseTxt" Width="80" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsEnabled="false"  Margin="-50"  />
-                        <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="50,0,0,0"/>
+                        <TextBox Name="NoseTxt" Width="100" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsEnabled="false"  Margin="-60"  />
+                        <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="60,0,0,0"/>
                     </StackPanel>
 
                     <Button Name="btnjiaozhun" Grid.Column="2" Content="{DynamicResource Calibration}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_1" HorizontalAlignment="Left"/>
@@ -128,8 +128,8 @@
                     <TextBlock Text="{DynamicResource Deformation1}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin3}"/>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" Width="Auto">
-                        <TextBox Name="FowlTxt1" Width="100" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsReadOnly="True" Margin="-35" />
-                        <TextBlock Text="L/min" VerticalAlignment="Center" Foreground="Black" Margin="40,0,0,0"/>
+                        <TextBox Name="FowlTxt1" Width="100" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsReadOnly="True" Margin="-55" />
+                        <TextBlock Text="L/min" VerticalAlignment="Center" Foreground="Black" Margin="60,0,0,0"/>
                     </StackPanel>
 
                     <Button Name="btnsetting" Grid.Column="2" Content="{DynamicResource Deformation4}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7" HorizontalAlignment="Center"/>
@@ -145,7 +145,7 @@
                 <Button Content="{DynamicResource Deformation6}" Style="{StaticResource MyButtonStyle}" Width="180" Click="Button_Click_2" />
 
 
-                <TextBox Name="AirTxt" Width="80" Margin="10,0" Style="{StaticResource MyTextBoxStyle}"  IsEnabled="False"/>
+                <TextBox Name="AirTxt" Width="120" Margin="10,0" Style="{StaticResource MyTextBoxStyle}"  IsEnabled="False"/>
                 <TextBlock Text="hpa" VerticalAlignment="Center"  Foreground="Black"/>
             </StackPanel>
 
diff --git a/Window4.xaml b/Window4.xaml
index db91059..c72c067 100644
--- a/Window4.xaml
+++ b/Window4.xaml
@@ -190,7 +190,7 @@
                  Style="{StaticResource MyTextBoxStyle}" 
                  IsReadOnly="True"
                  PreviewTextInput="ClostTxt_PreviewTextInput"
-                 Width="80"/>
+                 Width="100"/>
 
                         <TextBlock Text="L/min" 
                    VerticalAlignment="Center" 
@@ -220,7 +220,7 @@
                  Style="{StaticResource MyTextBoxStyle}" 
                  Text="???" 
                  IsEnabled="False"
-                 Width="80"/>
+                 Width="100"/>
                         <TextBlock Text="pa" 
                    VerticalAlignment="Center" 
                    Margin="10,0,0,0"
@@ -248,7 +248,7 @@
                  Style="{StaticResource MyTextBoxStyle}" 
                  Text="???"  
                  IsEnabled="False"
-                 Width="80"/>
+                 Width="100"/>
                         <TextBlock Text="L/min" 
                    VerticalAlignment="Center" 
                    Margin="10,0,0,0"
@@ -277,7 +277,7 @@
                  Style="{StaticResource MyTextBoxStyle}" 
                  Text="???" 
                  IsEnabled="False"
-                 Width="80"/>
+                 Width="100"/>
                         <TextBlock Text="L/min" 
                    VerticalAlignment="Center" 
                    Margin="10,0,0,0"
@@ -292,12 +292,8 @@
             Margin="42,10,42,10"/>
                 </Grid>
 
-
-
-
-
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
-                    <TextBlock Text="{DynamicResource setFlow112}"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
+                    <TextBlock Text="{DynamicResource setFlow112}"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="-10 0 50 0"/>
                     <TextBox Name="saveFlowOutTxt" Style="{StaticResource MyTextBoxStyle}" Text="???" Width="120" IsEnabled="False"/>
                     <TextBlock Text="pa" VerticalAlignment="Center" Margin="10,0,0,0"/>
                     <TextBlock Text="{DynamicResource setFlow12}"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
diff --git a/Window5.xaml.cs b/Window5.xaml.cs
index bc0b108..cecfbae 100644
--- a/Window5.xaml.cs
+++ b/Window5.xaml.cs
@@ -1479,7 +1479,7 @@ namespace ShanghaiEnvironmentalTechnology
                 // 验证并写入频率系数值
                 await WriteRegisterWithValidation(
                     inputControl: frequencyTxt,
-                    registerAddress: 368,  // 频率系数寄存器地址（根据实际地址修改）
+                    registerAddress: 3680,  // 频率系数寄存器地址（根据实际地址修改）
                     minValue: 0.1f,        // 频率系数最小0.1
                     maxValue: 10f          // 频率系数最大10
                 );