diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/MainForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/MainForm.cs
index 3efee52..b227d76 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/MainForm.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/MainForm.cs
@@ -1,5 +1,7 @@
+using Modbus.Device;
 using Sunny.UI;
 using System.Diagnostics;
+using System.Net.Sockets;
 using System.Timers;
 using 外科辅料和患者防护罩激光抗性测试仪.Data;
 
@@ -10,6 +12,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         private Stopwatch pressStopwatch;
         private const int LONG_PRESS_THRESHOLD = 1000; // 1000毫秒=1秒
 
+
         System.Timers.Timer Timer;
         System.Timers.Timer _datetimeTimer;
 
@@ -19,6 +22,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             InitializeComponent();
             InitDateTimeTimer();
             pressStopwatch = new Stopwatch();
+
         }
 
         private void InitDateTimeTimer()
@@ -52,6 +56,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             uiLabel6.Text = currentDateTime;
         }
 
+   
 
         private void SwitchToForm<T>() where T : Form, new()
         {
@@ -140,5 +145,6 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         {
             this.SwitchToForm<ReportForm>();//测试报告
         }
+
     }
 }
diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs
index ab2d947..e0fa09b 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/Model/PrimaryIgnitionModel.cs
@@ -15,7 +15,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪.Model
         public float? FireDate { get; set; }
         public float? yuhui { get; set; }
         public float? yuyan { get; set; }
-        public bool Iszixi { get; set; }
+        public string Iszixi { get; set; }
 
         public double? costTime { get; set; }
         public DateTime? Testtime { get; set; }
diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs
index 67025a1..af3e9b7 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PenetrationForm.cs
@@ -62,7 +62,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         {
             var timer = new System.Windows.Forms.Timer()
             {
-                Interval = 200,
+                Interval = 500,
             };
             timer.Tick += async (s, e) =>
             {
@@ -1009,7 +1009,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         private void PenetrationForm_Load(object sender, EventArgs e)
         {
 
-            string plcIp = "192.168.1.10";
+            string plcIp = "192.168.1.10";           
             //string plcIp = "127.0.0.1";
             bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
             if (!initSuccess)
@@ -1028,7 +1028,10 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
             }
             ma = new Function(_modbusMaster);
 
-            this.comkou.DataSource = SerialPort.GetPortNames();
+            //this.comkou.DataSource = SerialPort.GetPortNames();
+            this.comkou.Items.Clear();
+            this.comkou.Items.Add("COM2");
+            this.comkou.SelectedIndex = 0;
 
             _readtimer = InitTimer();
             if (_modbusMaster != null)
diff --git a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs
index 8fd19fc..161a470 100644
--- a/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs
+++ b/外科辅料和患者防护罩激光抗性测试仪/外科辅料和患者防护罩激光抗性测试仪/PrimaryIgnitionForm.cs
@@ -97,7 +97,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         {
             var timer = new System.Windows.Forms.Timer()
             {
-                Interval = 100,
+                Interval = 500,
             };
             timer.Tick += async (s, e) =>
             {
@@ -331,7 +331,7 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
         private float firetime = 0;
         private float yy = 0;
         private float yh = 0;
-        private bool iszixi = false;
+        private string iszixi = string.Empty;
         private double costtime = 0;
 
         private bool _isCurrentRecordAdded = true;//重复添加标记
@@ -365,13 +365,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         //}
                         bool[] fire1 = await ReadModbusCoilAsync(280, 1);
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
-                        if (fire1 != null && fire1.Length > 0 && !fire1[0])
+                        if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            //iszixi = true;//自熄
+                            iszixi = "true";
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            //iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 90, 2);
                         costtime = time[0];//总测试时长
@@ -396,11 +398,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 90, 2);
                         costtime = time[0];//总测试时长
@@ -426,12 +428,13 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
+                        
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 90, 2);
                         costtime = time[0];//总测试时长
                     }
@@ -456,11 +459,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
+                        }
+                        else
+                        {
+                            iszixi = "null";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 90, 2);
                         costtime = time[0];//总测试时长
@@ -496,11 +503,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 92, 2);
                         costtime = time[0];//总测试时长
@@ -526,11 +533,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 92, 2);
                         costtime = time[0];//总测试时长
@@ -556,11 +563,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 92, 2);
                         costtime = time[0];//总测试时长
@@ -583,11 +590,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
+                        }
+                        else
+                        {
+                            iszixi = "null";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 92, 2);
                         costtime = time[0];//总测试时长
@@ -620,11 +631,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 94, 2);
                         costtime = time[0];//总测试时长
@@ -648,11 +659,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 94, 2);
                         costtime = time[0];//总测试时长
@@ -675,11 +686,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 94, 2);
                         costtime = time[0];//总测试时长
@@ -703,11 +714,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
+                        }
+                        else
+                        {
+                            iszixi = "null";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 94, 2);
                         costtime = time[0];//总测试时长
@@ -739,11 +754,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 96, 2);
                         costtime = time[0];//总测试时长
@@ -766,11 +781,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 96, 2);
                         costtime = time[0];//总测试时长
@@ -793,11 +808,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 96, 2);
                         costtime = time[0];//总测试时长
@@ -820,11 +835,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
+                        }
+                        else
+                        {
+                            iszixi = "null";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 96, 2);
                         costtime = time[0];//总测试时长
@@ -856,11 +875,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 98, 2);
                         costtime = time[0];//总测试时长
@@ -883,11 +902,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 98, 2);
                         costtime = time[0];//总测试时长
@@ -910,11 +929,11 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 98, 2);
                         costtime = time[0];//总测试时长
@@ -939,11 +958,15 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
                         bool[] fire2 = await ReadModbusCoilAsync(281, 1);
                         if (fire1 != null && fire1.Length > 0 && fire1[0])
                         {
-                            iszixi = true;//自熄
+                            iszixi = "true";//自熄
                         }
                         else if (fire2 != null && fire2.Length > 0 && fire2[0])
                         {
-                            iszixi = false;
+                            iszixi = "false";
+                        }
+                        else
+                        {
+                            iszixi = "null";
                         }
                         ushort[] time = _modbusMaster?.ReadHoldingRegisters(1, 98, 2);
                         costtime = time[0];//总测试时长
@@ -1224,12 +1247,12 @@ namespace 外科辅料和患者防护罩激光抗性测试仪
 
         private void uiButton11_Click(object sender, EventArgs e)
         {
-            ma?.BtnClickFunctionForNew(Function.ButtonType.复归型, 271);
+            ma?.BtnClickFunctionForNew(Function.ButtonType.切换型, 271);//未自熄
         }
 
         private void uiButton12_Click(object sender, EventArgs e)
         {
-            ma?.BtnClickFunctionForNew(Function.ButtonType.复归型, 270);
+            ma?.BtnClickFunctionForNew(Function.ButtonType.切换型, 270);//自熄
         }
 
         private void uiButton13_Click(object sender, EventArgs e)