修改方法配置文件极性键值，解决后处理和空闲中状态变换问题

GcDevicePc/AppInit.cs

@@ -761,7 +761,7 @@ namespace GcDevicePc
                     globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.show_MethodName = "SingleAnal.ini";
                 }
 
-                //SignalDataToHw.methodconfig = InitGetConfig(tmpfile);
+                SignalDataToHw.methodconfig = InitGetConfig(tmpfile);
                 SendDataToZB.methodconfig = InitGetConfig(tmpfile);
             }
             else

GcDevicePc/ConfigMethod/MethodMain.cs

@@ -18,6 +18,7 @@ namespace GcDevicePc.ConfigMethod
     {
 
         public delegate void SendUpdateCMD(bool flag);
+        public delegate void Up_MethodMain();
 
         private Point dwPoint;
         private bool moveFlag;
@@ -367,6 +368,7 @@ namespace GcDevicePc.ConfigMethod
 
 
         }
+        public event Up_MethodMain upmethod;
 
         public event SendUpdateCMD sendupdatecmd;
         private void savebth_Click(object sender, EventArgs e)
@@ -383,6 +385,7 @@ namespace GcDevicePc.ConfigMethod
 
             if (this.updateflag)
             {
+                upmethod();
                 if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 1)
                 {
                     string message = "方法运行中，请先停止后再提交";

GcDevicePc/GCBuffer/GCMethodConfig.cs

@@ -1482,6 +1482,7 @@ namespace GcDevicePc.GCBuffer
                 tcd[cFront].sTcdLoc = methodconfigini.GetProfileString(sAppName, "TCD");
                 //tcd[cFront].fSigValve = methodconfigini.GetProfileFloat(sAppName, "信号值", fDefault);
                 //tcd[cFront].u16Electric = methodconfigini.GetProfileInt(sAppName, "桥电路", iDefault);
+                tcd[cFront].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性设定值", iDefault);
                 tcd[cFront].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性", iDefault);
                 //tcd[cFront].u16AutoZeroSet = methodconfigini.GetProfileInt(sAppName, "自动调零", iDefault);
                 tcd[cFront].fHeaterTempSet = methodconfigini.GetProfileFloat(sAppName, "加热器设定温度", fDefault);
@@ -1496,6 +1497,7 @@ namespace GcDevicePc.GCBuffer
                 tcd[cInter].sTcdLoc = methodconfigini.GetProfileString(sAppName, "TCD");
                 //tcd[cInter].fSigValve = methodconfigini.GetProfileFloat(sAppName, "信号值", fDefault);
                 //tcd[cInter].u16Electric = methodconfigini.GetProfileInt(sAppName, "桥电路", iDefault);
+                tcd[cInter].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性设定值", iDefault);
                 tcd[cInter].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性", iDefault);
                 //tcd[cInter].u16AutoZeroSet = methodconfigini.GetProfileInt(sAppName, "自动调零", iDefault);
                 tcd[cInter].fHeaterTempSet = methodconfigini.GetProfileFloat(sAppName, "加热器设定温度", fDefault);
@@ -1510,6 +1512,7 @@ namespace GcDevicePc.GCBuffer
                 tcd[cBehind].sTcdLoc = methodconfigini.GetProfileString(sAppName, "TCD");
                 //tcd[cBehind].fSigValve = methodconfigini.GetProfileFloat(sAppName, "信号值", fDefault);
                 //tcd[cBehind].u16Electric = methodconfigini.GetProfileInt(sAppName, "桥电路", iDefault);
+                tcd[cBehind].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性设定值", iDefault);
                 tcd[cBehind].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性", iDefault);
                 //tcd[cBehind].u16AutoZeroSet = methodconfigini.GetProfileInt(sAppName, "自动调零", iDefault);
                 tcd[cBehind].fHeaterTempSet = methodconfigini.GetProfileFloat(sAppName, "加热器设定温度", fDefault);
@@ -1541,6 +1544,7 @@ namespace GcDevicePc.GCBuffer
                 savemethodconfig.WriteProfileString(sAppName, "TCD", tcd[cFront].sTcdLoc);
                 //savemethodconfig.WriteProfileFloat(sAppName, "信号值", tcd[cFront].fSigValve);
                 //savemethodconfig.WriteProfileInt(sAppName, "桥电路", tcd[cFront].u16Electric);
+                savemethodconfig.WriteProfileInt(sAppName, "极性设定值", tcd[cFront].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "极性", tcd[cFront].u16Polarity);
                 //savemethodconfig.WriteProfileInt(sAppName, "自动调零", tcd[cFront].u16AutoZeroSet);
                 savemethodconfig.WriteProfileFloat(sAppName, "加热器设定温度", tcd[cFront].fHeaterTempSet);
@@ -1555,6 +1559,7 @@ namespace GcDevicePc.GCBuffer
                 savemethodconfig.WriteProfileString(sAppName, "TCD", tcd[cInter].sTcdLoc);
                 //savemethodconfig.WriteProfileFloat(sAppName, "信号值", tcd[cInter].fSigValve);
                 //savemethodconfig.WriteProfileInt(sAppName, "桥电路", tcd[cInter].u16Electric);
+                savemethodconfig.WriteProfileInt(sAppName, "极性设定值", tcd[cInter].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "极性", tcd[cInter].u16Polarity);
                 //savemethodconfig.WriteProfileInt(sAppName, "自动调零", tcd[cInter].u16AutoZeroSet);
                 savemethodconfig.WriteProfileFloat(sAppName, "加热器设定温度", tcd[cInter].fHeaterTempSet);
@@ -1569,6 +1574,7 @@ namespace GcDevicePc.GCBuffer
                 savemethodconfig.WriteProfileString(sAppName, "TCD", tcd[cBehind].sTcdLoc);
                 //savemethodconfig.WriteProfileFloat(sAppName, "信号值",tcd[cBehind].fSigValve);
                 //savemethodconfig.WriteProfileInt(sAppName, "桥电路",tcd[cBehind].u16Electric);
+                savemethodconfig.WriteProfileInt(sAppName, "极性设定值", tcd[cBehind].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "极性", tcd[cBehind].u16Polarity);
                 //savemethodconfig.WriteProfileInt(sAppName, "自动调零", tcd[cBehind].u16AutoZeroSet);
                 savemethodconfig.WriteProfileFloat(sAppName, "加热器设定温度", tcd[cBehind].fHeaterTempSet);
@@ -1598,6 +1604,7 @@ namespace GcDevicePc.GCBuffer
                 //fid[cFront].sFid = methodconfigini.GetProfileString(sAppName, "检测器位置");
                 fid[cFront].u16KeyFire = methodconfigini.GetProfileInt(sAppName, "自动点火", iDefault);
                 fid[cFront].u16Zero = methodconfigini.GetProfileInt(sAppName, "归零", iDefault);
+                fid[cFront].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性设定值", iDefault);
                 fid[cFront].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性", iDefault);
                 fid[cFront].u16Sensitive = methodconfigini.GetProfileInt(sAppName, "灵敏度", iDefault);
                 fid[cFront].u16KeyHeater = methodconfigini.GetProfileInt(sAppName, "加热器开关", iDefault);
@@ -1616,6 +1623,7 @@ namespace GcDevicePc.GCBuffer
                 //fid[cInter].sFid = methodconfigini.GetProfileString(sAppName, "检测器位置");
                 fid[cInter].u16KeyFire = methodconfigini.GetProfileInt(sAppName, "自动点火", iDefault);
                 fid[cInter].u16Zero = methodconfigini.GetProfileInt(sAppName, "归零", iDefault);
+                fid[cInter].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性设定值", iDefault);
                 fid[cInter].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性", iDefault);
                 fid[cInter].u16Sensitive = methodconfigini.GetProfileInt(sAppName, "灵敏度", iDefault);
                 fid[cInter].u16KeyHeater = methodconfigini.GetProfileInt(sAppName, "加热器开关", iDefault);
@@ -1634,6 +1642,7 @@ namespace GcDevicePc.GCBuffer
                 //fid[cBehind].sFid = methodconfigini.GetProfileString(sAppName, "检测器位置");
                 fid[cBehind].u16KeyFire = methodconfigini.GetProfileInt(sAppName, "自动点火", iDefault);
                 fid[cBehind].u16Zero = methodconfigini.GetProfileInt(sAppName, "归零", iDefault);
+                fid[cBehind].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性设定值", iDefault);
                 fid[cBehind].u16Polarity = methodconfigini.GetProfileInt(sAppName, "极性", iDefault);
                 fid[cBehind].u16Sensitive = methodconfigini.GetProfileInt(sAppName, "灵敏度", iDefault);
                 fid[cBehind].u16KeyHeater = methodconfigini.GetProfileInt(sAppName, "加热器开关", iDefault);
@@ -1665,6 +1674,7 @@ namespace GcDevicePc.GCBuffer
                 //savemethodconfig.WriteProfileString(sAppName, "检测器位置", fid[cFront].sFid);
                 savemethodconfig.WriteProfileInt(sAppName, "自动点火", fid[cFront].u16KeyFire);
                 savemethodconfig.WriteProfileInt(sAppName, "归零", fid[cFront].u16Zero);
+                savemethodconfig.WriteProfileInt(sAppName, "极性设定值", fid[cFront].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "极性", fid[cFront].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "灵敏度", fid[cFront].u16Sensitive);
                 savemethodconfig.WriteProfileInt(sAppName, "加热器开关", fid[cFront].u16KeyHeater);
@@ -1683,6 +1693,7 @@ namespace GcDevicePc.GCBuffer
                 //savemethodconfig.WriteProfileString(sAppName, "检测器位置",fid[cInter].sFid);
                 savemethodconfig.WriteProfileInt(sAppName, "自动点火", fid[cInter].u16KeyFire);
                 savemethodconfig.WriteProfileInt(sAppName, "归零", fid[cInter].u16Zero);
+                savemethodconfig.WriteProfileInt(sAppName, "极性设定值", fid[cInter].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "极性", fid[cInter].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "灵敏度", fid[cInter].u16Sensitive);
                 savemethodconfig.WriteProfileInt(sAppName, "加热器开关", fid[cInter].u16KeyHeater);
@@ -1701,6 +1712,7 @@ namespace GcDevicePc.GCBuffer
                 //savemethodconfig.WriteProfileString(sAppName, "检测器位置", fid[cBehind].sFid);
                 savemethodconfig.WriteProfileInt(sAppName, "自动点火", fid[cBehind].u16KeyFire);
                 savemethodconfig.WriteProfileInt(sAppName, "归零", fid[cBehind].u16Zero);
+                savemethodconfig.WriteProfileInt(sAppName, "极性设定值", fid[cBehind].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "极性", fid[cBehind].u16Polarity);
                 savemethodconfig.WriteProfileInt(sAppName, "灵敏度", fid[cBehind].u16Sensitive);
                 savemethodconfig.WriteProfileInt(sAppName, "加热器开关", fid[cBehind].u16KeyHeater);

GcDevicePc/GCBuffer/PCBuffer.cs

@@ -122,7 +122,8 @@ namespace GcDevicePc.GCBuffer
             gcpcinfo.pcworkinfo.info_log = false;
             gcpcinfo.pcworkinfo.error_log = false;
             gcpcinfo.pcworkinfo.hmi_log = false;
-
+            gcpcinfo.pcworkinfo.sendtoZb = false;
+            gcpcinfo.pcworkinfo.sendtohw = false;
             gcpcinfo.moduleinfo.ip = "";
 
             gcpcinfo.outputinfo.port = 0;
@@ -145,7 +146,7 @@ namespace GcDevicePc.GCBuffer
                     int senddatatohw = ini.ReadInteger("StartUp", "SendDataToHw");
                     int senddatatozb = ini.ReadInteger("StartUp", "SendDataToZB");
                     gcpcinfo.pcfolderinfo.DataFolder = ini.ReadString("DataFolder", "历史数据");
-
+                    
                     gcpcinfo.pcworkinfo.hmimac = ini.ReadString("NetWorkConfig", "MAC地址");
 
                     if (opensys == 1)

GcDevicePc/MDIBase.Designer.cs

@@ -74,6 +74,7 @@
             this.AdjustStat = new System.Windows.Forms.ToolStripStatusLabel();
             this.workProgress = new System.Windows.Forms.ToolStripProgressBar();
             this.timer2 = new System.Windows.Forms.Timer(this.components);
+            this.数据路径ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip.SuspendLayout();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -233,7 +234,8 @@
             this.DataMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.HistoryDataMenu,
             this.CalibrationMenu,
-            this.HistoryPicMenu});
+            this.HistoryPicMenu,
+            this.数据路径ToolStripMenuItem});
             this.DataMainMenu.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
             this.DataMainMenu.Name = "DataMainMenu";
             this.DataMainMenu.Size = new System.Drawing.Size(86, 25);
@@ -242,21 +244,21 @@
             // HistoryDataMenu
             // 
             this.HistoryDataMenu.Name = "HistoryDataMenu";
-            this.HistoryDataMenu.Size = new System.Drawing.Size(144, 26);
+            this.HistoryDataMenu.Size = new System.Drawing.Size(180, 26);
             this.HistoryDataMenu.Text = "数据查询";
             this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click);
             // 
             // CalibrationMenu
             // 
             this.CalibrationMenu.Name = "CalibrationMenu";
-            this.CalibrationMenu.Size = new System.Drawing.Size(144, 26);
+            this.CalibrationMenu.Size = new System.Drawing.Size(180, 26);
             this.CalibrationMenu.Text = "数据校准";
             this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click);
             // 
             // HistoryPicMenu
             // 
             this.HistoryPicMenu.Name = "HistoryPicMenu";
-            this.HistoryPicMenu.Size = new System.Drawing.Size(144, 26);
+            this.HistoryPicMenu.Size = new System.Drawing.Size(180, 26);
             this.HistoryPicMenu.Text = "历史谱图";
             this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click);
             // 
@@ -437,6 +439,13 @@
             this.timer2.Interval = 1000;
             this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
             // 
+            // 数据路径ToolStripMenuItem
+            // 
+            this.数据路径ToolStripMenuItem.Name = "数据路径ToolStripMenuItem";
+            this.数据路径ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.数据路径ToolStripMenuItem.Text = "数据路径";
+            this.数据路径ToolStripMenuItem.Click += new System.EventHandler(this.数据路径ToolStripMenuItem_Click);
+            // 
             // MDIBase
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -507,6 +516,7 @@
         private System.Windows.Forms.ToolStripMenuItem 单位换算ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 自动校准ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem testToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 数据路径ToolStripMenuItem;
     }
 }
 

GcDevicePc/MDIBase.cs

@@ -82,7 +82,7 @@ namespace GcDevicePc
         CKvocUpdata2 dataVoc2 = new CKvocUpdata2();
         CKvocUpdata3 dataVoc3 = new CKvocUpdata3();
 
-        private DataOutput wtd624xOutput = new DataOutput();
+        //private DataOutput wtd624xOutput = new DataOutput();
 
         private SignalDataToHw signalDataTohw = new SignalDataToHw();
         private SendDataToZB signalDataTozb = new SendDataToZB();
@@ -947,7 +947,7 @@ namespace GcDevicePc
                 BackgroundWorker worker = sender as BackgroundWorker;
                 for (int i = 0; i < 100; i++)
                 {
-                    if (globaldata.m_hmibuffer.gcinfo.hmistatus == 0)
+                    if (globaldata.m_hmibuffer.gcinfo.hmistatus == 0 || globaldata.m_hmibuffer.gcinfo.methodstatus == 0 || globaldata.m_hmibuffer.gcinfo.methodstatus == 7 || globaldata.m_hmibuffer.gcinfo.methodstatus == 2 || globaldata.m_hmibuffer.gcinfo.methodstatus == 3)
                     {
                         if (globaldata.OS_STOP)
                         {
@@ -1252,9 +1252,9 @@ namespace GcDevicePc
 
                     if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw)
                     {
-                        //signalDataTohw.DataToHwStart();
+                        signalDataTohw.DataToHwStart();
 
-                        signalDataTozb.DataToZBStart();
+                        //signalDataTozb.DataToZBStart();
                     }
                     if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
                     {
@@ -2089,6 +2089,11 @@ namespace GcDevicePc
             hmiopt.TCD_Switch(port);
         }
 
+        private void upMethodMain()
+        {
+            hmiopt.WriteStopVal();
+        }
+
         /// <summary>
         /// 调试运行表接口
         /// </summary>
@@ -2511,6 +2516,7 @@ namespace GcDevicePc
                     myformb = new MethodMain(true);
 
                     myformb.sendupdatecmd += new MethodMain.SendUpdateCMD(SendPCCMD);
+                    myformb.upmethod += new MethodMain.Up_MethodMain(upMethodMain);
                     myformb.SetGCConfig(globaldata.m_hwconfig, methodconfig);
                     myformb.Show();
 
@@ -2521,6 +2527,8 @@ namespace GcDevicePc
                     myformb = new MethodMain(true);
 
                     myformb.sendupdatecmd += new MethodMain.SendUpdateCMD(SendPCCMD);
+                    myformb.upmethod += new MethodMain.Up_MethodMain(upMethodMain);
+
                     myformb.SetGCConfig(globaldata.m_hwconfig, methodconfig);
                     myformb.Show();
                 }
@@ -2564,7 +2572,7 @@ namespace GcDevicePc
                 //MethodMain myform = new MethodMain(true, false);
                 //myform.SetGCConfig(globaldata.m_hwconfig, methodconfig);
                 //myform.Show();
-                Console.WriteLine("前 " + globaldata.m_hmibuffer.gcinfo.methodstatus);
+                //Console.WriteLine("前 " + globaldata.m_hmibuffer.gcinfo.methodstatus);
                 if (myformbb == null)
                 {
                     myformbb = new MethodMain(true, false);
@@ -2622,7 +2630,7 @@ namespace GcDevicePc
                 }
             }
 
-            Console.WriteLine(" 后 "+ globaldata.m_hmibuffer.gcinfo.methodstatus);
+            //Console.WriteLine(" 后 "+ globaldata.m_hmibuffer.gcinfo.methodstatus);
         }
 
         WaveTotalForm total;
@@ -3255,6 +3263,7 @@ namespace GcDevicePc
             {
                 string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
                 IniFile iniFile = new IniFile(file);
+
                 //iniFile.ReadSection("").
                 if (iniFile.ReadString("Version", "VersionType") == "0")
                 {
@@ -3326,11 +3335,15 @@ namespace GcDevicePc
             testsjshow.Show();
         }
 
-        //private void debugSubMenu_Click(object sender, EventArgs e)
-        //{
+        private void 数据路径ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        //private void debugSubMenu_Click(object sender, EventArgs e)        
         //    try
         //    {
-        //        _424XTest test = new _424XTest();
+        //        _424XTest test = new _424XTest()；
         //        test.Show();
         //    }
         //    catch (Exception ex)

GcDevicePc/ProThread/CKvocUpdata.cs

@@ -65,8 +65,6 @@ namespace GcDevicePc.ProThread
                                     time = 0;
                                     globaldata.startclear1 = false;
                                 }
-
-
                                 else
                                 {
 

GcDevicePc/ProThread/GcDataTh.cs

@@ -1026,7 +1026,7 @@ namespace GcDevicePc.ProThread
             int ret = -1;
             try
             {
-                ret = GetHmiPowerHoldingReg(1151, 6, ref hmipower);
+                ret = GetHmiPowerHoldingReg(1150, 6, ref hmipower);
             }
             catch (Exception e)
             {

GcDevicePc/ProThread/HMIControl.cs

@@ -108,9 +108,26 @@ namespace GcDevicePc.ProThread
         public int WriteStopVal()
         {
             int ret = -1;
+            int count = 0;
             if (this.setflag)
+            {
+                //ret = m_modbus.WriteSingleCoil(31, (ushort)65280, this.strIP, this.netPost);
+                //Console.WriteLine("0");
+
                 ret = m_modbus.WriteSingleCoil(31, (ushort)65280, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
+                    ret = m_modbus.WriteSingleCoil(31, (ushort)65280, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
+
             return ret;
+
+
         }
 
         public int WriteEndVal()