1

source/ACSingleStore/ACSingleStore.csproj

@@ -112,6 +112,12 @@
     </Compile>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServoAxisInfo.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ServoAxisInfo.Designer.cs">
+      <DependentUpon>ServoAxisInfo.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="FrmAxisDebug.resx">
     <EmbeddedResource Include="FrmAxisDebug.resx">
       <DependentUpon>FrmAxisDebug.cs</DependentUpon>
       <DependentUpon>FrmAxisDebug.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
@@ -146,6 +152,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
       <DesignTime>True</DesignTime>
     </Compile>
     </Compile>
+    <EmbeddedResource Include="ServoAxisInfo.resx">
+      <DependentUpon>ServoAxisInfo.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

source/ACSingleStore/FrmStoreBox.cs

@@ -157,9 +157,7 @@ namespace OnlineStore.ACSingleStore
 
 
             btnOutStore.Enabled = isOpen;
             btnOutStore.Enabled = isOpen;
             btnInStore.Enabled = isOpen; 
             btnInStore.Enabled = isOpen; 
-            启动ToolStripMenuItem.Enabled = !isOpen;
-            停止ToolStripMenuItem.Enabled = isOpen;
-            复位ToolStripMenuItem.Enabled = isOpen;
+       
             btnStoreStart.Enabled = !isOpen;
             btnStoreStart.Enabled = !isOpen;
             btnSotreReset.Enabled = isOpen;
             btnSotreReset.Enabled = isOpen;
             btnStoreStop.Enabled = isOpen;
             btnStoreStop.Enabled = isOpen;
@@ -185,31 +183,31 @@ namespace OnlineStore.ACSingleStore
             //忙碌状态不读取状态
             //忙碌状态不读取状态
             if (!store.storeRunStatus.Equals(StoreRunStatus.Busy))
             if (!store.storeRunStatus.Equals(StoreRunStatus.Busy))
             {
             {
-                if (chbAutoRead.Checked)
-                {
-                    string portName = GetPortName();
-                    int SlvAddr = GetSlaveAddr();
+                //if (chbAutoRead.Checked)
+                //{
+                //    string portName = GetPortName();
+                //    int SlvAddr = GetSlaveAddr();
 
 
-                    //判断私服是否打开、
-                    if (ACServerManager.ServerOnStatus(portName, SlvAddr))
-                    {
-                        lblServerOn.Text = "伺服ON";
-                        int lOutPulse = ACServerManager.GetTargetPosition(portName, SlvAddr);
-                        lblOutPulse.Text = string.Format("{0:d}", lOutPulse);
-                        int lCountPulse = ACServerManager.GetActualtPosition(portName, SlvAddr);
-                        lblCountPulse.Text = string.Format("{0:d}", lCountPulse);
-                    }
-                    else
-                    {
-                        lblServerOn.Text = "伺服OFF";
-                    }
-                }
+                //    //判断私服是否打开、
+                //    if (ACServerManager.ServerOnStatus(portName, SlvAddr))
+                //    {
+                //        lblServerOn.Text = "伺服ON";
+                //        int lOutPulse = ACServerManager.GetTargetPosition(portName, SlvAddr);
+                //        lblOutPulse.Text = string.Format("{0:d}", lOutPulse);
+                //        int lCountPulse = ACServerManager.GetActualtPosition(portName, SlvAddr);
+                //        lblCountPulse.Text = string.Format("{0:d}", lCountPulse);
+                //    }
+                //    else
+                //    {
+                //        lblServerOn.Text = "伺服OFF";
+                //    }
+                //}
             }
             }
 
 
             //ReadPosistion();
             //ReadPosistion();
             if (store.storeRunStatus > StoreRunStatus.Wait)
             if (store.storeRunStatus > StoreRunStatus.Wait)
             {
             {
-                if (启动ToolStripMenuItem.Enabled.Equals(true))
+                if (btnStoreStart.Enabled.Equals(true))
                 {
                 {
                     StoreOpenStatus(true);
                     StoreOpenStatus(true);
                 }
                 }
@@ -217,7 +215,7 @@ namespace OnlineStore.ACSingleStore
                 lblThisSta.Text = store.GetRunStr();
                 lblThisSta.Text = store.GetRunStr();
                
                
                 //复位按钮状态显示
                 //复位按钮状态显示
-                if (复位ToolStripMenuItem.Enabled == false)
+                if (btnSotreReset.Enabled == false)
                 {
                 {
                     if ((store.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || store.storeRunStatus.Equals(StoreRunStatus.Reset))
                     if ((store.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || store.storeRunStatus.Equals(StoreRunStatus.Reset))
                         && store.alarmType.Equals(StoreAlarmType.None))
                         && store.alarmType.Equals(StoreAlarmType.None))
@@ -225,9 +223,9 @@ namespace OnlineStore.ACSingleStore
                     }
                     }
                     else
                     else
                     {
                     {
-                        if (复位ToolStripMenuItem.Enabled.Equals(false))
+                        if (btnSotreReset.Enabled.Equals(false))
                         {
                         {
-                            复位ToolStripMenuItem.Enabled = true;
+                            btnSotreReset.Enabled = true;
                         }
                         }
                     }
                     }
                 }
                 }
@@ -236,10 +234,10 @@ namespace OnlineStore.ACSingleStore
                     if ((store.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || store.storeRunStatus.Equals(StoreRunStatus.Reset))
                     if ((store.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || store.storeRunStatus.Equals(StoreRunStatus.Reset))
                         && store.alarmType.Equals(StoreAlarmType.None))
                         && store.alarmType.Equals(StoreAlarmType.None))
                     {
                     {
-                        if (启动ToolStripMenuItem.Enabled)
+                        if (btnStoreStart.Enabled)
                         {
                         {
-                            启动ToolStripMenuItem.Enabled = false;
-                            复位ToolStripMenuItem.Enabled = false;
+                            btnStoreStart.Enabled = false;
+                            btnSotreReset.Enabled = false;
                         }
                         }
                     }
                     }
                 }
                 }
@@ -339,8 +337,7 @@ namespace OnlineStore.ACSingleStore
                 lblCountPulse1.Text = string.Format("{0:d}", lCountPulse1);
                 lblCountPulse1.Text = string.Format("{0:d}", lCountPulse1);
                 txtMiddleTarget.Text = store.Config.Middle_Axis.TargetPosition.ToString();
                 txtMiddleTarget.Text = store.Config.Middle_Axis.TargetPosition.ToString();
                 if ( store.Config.Middle_Axis.IsSameAxis(portName,SlvAddr))
                 if ( store.Config.Middle_Axis.IsSameAxis(portName,SlvAddr))
-                {
-                    lblOutPulse.Text = lblOutPulse1.Text;
+                { 
                     lblCountPulse.Text = lblCountPulse1.Text;
                     lblCountPulse.Text = lblCountPulse1.Text;
                 }
                 }
             }
             }
@@ -354,8 +351,7 @@ namespace OnlineStore.ACSingleStore
                 lblCountPulse2.Text = string.Format("{0:d}", lCountPulse2);
                 lblCountPulse2.Text = string.Format("{0:d}", lCountPulse2);
                 txtInoutTarget.Text = store.Config.InOut_Axis.TargetPosition.ToString();
                 txtInoutTarget.Text = store.Config.InOut_Axis.TargetPosition.ToString();
                 if ( store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
                 if ( store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
-                {
-                    lblOutPulse.Text = lblOutPulse2.Text;
+                { 
                     lblCountPulse.Text = lblCountPulse2.Text;
                     lblCountPulse.Text = lblCountPulse2.Text;
                 }
                 }
             }
             }
@@ -368,8 +364,7 @@ namespace OnlineStore.ACSingleStore
                 lblCountPulse3.Text = string.Format("{0:d}", lCountPulse3);
                 lblCountPulse3.Text = string.Format("{0:d}", lCountPulse3);
                 txtUpdownTarget.Text = store.Config.UpDown_Axis.TargetPosition.ToString();
                 txtUpdownTarget.Text = store.Config.UpDown_Axis.TargetPosition.ToString();
                 if ( store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr))
                 if ( store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr))
-                {
-                    lblOutPulse.Text = lblOutPulse3.Text;
+                { 
                     lblCountPulse.Text = lblCountPulse3.Text;
                     lblCountPulse.Text = lblCountPulse3.Text;
                 }
                 }
             }
             }
@@ -966,8 +961,7 @@ namespace OnlineStore.ACSingleStore
         private void 复位ToolStripMenuItem_Click(object sender, EventArgs e)
         private void 复位ToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
             this.store.Reset();
             this.store.Reset();
-            复位ToolStripMenuItem.Enabled = false;
-            复位ToolStripMenuItem.Enabled = false;
+            btnSotreReset.Enabled = false; 
         }
         }
 
 
         private void 查看IOToolStripMenuItem_Click(object sender, EventArgs e)
         private void 查看IOToolStripMenuItem_Click(object sender, EventArgs e)
@@ -979,23 +973,19 @@ namespace OnlineStore.ACSingleStore
         {
         {
             this.richTextBox1.Text = "";
             this.richTextBox1.Text = "";
         }
         }
-
         private void 开启DEBUGToolStripMenuItem_Click(object sender, EventArgs e)
         private void 开启DEBUGToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
             if (LogUtil.debug_opened == false)
             if (LogUtil.debug_opened == false)
-            {
-                开启DEBUGToolStripMenuItem.Text = "关闭DEBUG";
+            { 
                 btnLogDebug.Text = "关闭DEBUG";
                 btnLogDebug.Text = "关闭DEBUG";
                 LogUtil.debug_opened = true;
                 LogUtil.debug_opened = true;
             }
             }
             else
             else
-            {
-                开启DEBUGToolStripMenuItem.Text = "开启DEBUG";
+            { 
                 btnLogDebug.Text = "开启DEBUG";
                 btnLogDebug.Text = "开启DEBUG";
                 LogUtil.debug_opened = false;
                 LogUtil.debug_opened = false;
             }
             }
         }
         }
-
         private void btnClearLog_Click(object sender, EventArgs e)
         private void btnClearLog_Click(object sender, EventArgs e)
         {
         {
             //this.richTextBox1.Text = "";
             //this.richTextBox1.Text = "";
@@ -1143,22 +1133,16 @@ namespace OnlineStore.ACSingleStore
 
 
         private void btnGetAlarm_Click(object sender, EventArgs e)
         private void btnGetAlarm_Click(object sender, EventArgs e)
         {
         {
-            int value = ACServerManager.GetAlarmStatus(GetPortName(), GetSlaveAddr());
-            this.txtAlarmStatus.Text = value.ToString();
-        }
-
-        private void button1_Click_1(object sender, EventArgs e)
-        {
-            int value = ACServerManager.GetBusyStatus(GetPortName(), GetSlaveAddr());
-            this.txtBusyStatus.Text = value.ToString(); 
+            string PortName = txtAxisDeviceName.Text;
+            short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
+            txtServoStatue.Text = ACServerManager.ServerOnStatus(PortName, SlvAddr).ToString();
+            this.txtAlarmStatus.Text = ACServerManager.GetAlarmStatus(PortName, SlvAddr).ToString();
+            this.txtBusyStatus.Text = ACServerManager.GetBusyStatus(PortName, SlvAddr).ToString();
+            this.txtHomeStatus.Text = ACServerManager.GetHomeEndStatus(PortName, SlvAddr).ToString();
+            this.txtHomeSingle.Text = ACServerManager.GetHomeSingle(PortName, SlvAddr).ToString();
+            this.txtLimit1.Text = ACServerManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
+            this.txtLimit2.Text = ACServerManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
         }
         }
-         
-        private void button2_Click(object sender, EventArgs e)
-        {
-            int value = ACServerManager.GetHomeEndStatus(GetPortName(), GetSlaveAddr());
-            this.txtHomeStatus.Text = value.ToString();
-        } 
-
         private void chbAuto_CheckedChanged(object sender, EventArgs e)
         private void chbAuto_CheckedChanged(object sender, EventArgs e)
         {
         {
             if (!LoadOk)
             if (!LoadOk)
@@ -1208,7 +1192,7 @@ namespace OnlineStore.ACSingleStore
                 {
                 {
                     this.timer1.Enabled = false;
                     this.timer1.Enabled = false;
                 }
                 }
-                if (this.停止ToolStripMenuItem.Enabled)
+                if (this.btnStoreStop.Enabled)
                 {
                 {
                     stop_button_Click(null, null);
                     stop_button_Click(null, null);
                 }
                 }
@@ -1259,23 +1243,7 @@ namespace OnlineStore.ACSingleStore
             {
             {
                 ExitApp();
                 ExitApp();
             }
             }
-        } 
-
-        private void 学习二维码ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            //IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
-            //CodeLibrary.FrmCodeDecode frm = new FrmCodeDecode();
-            //frm.ShowDialog();
-            //IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
-        }
-
-        private void btnReadHomeSingle_Click(object sender, EventArgs e)
-        {
-            int value = ACServerManager.GetHomeSingle(GetPortName(), GetSlaveAddr());
-            this.txtHomeSingle.Text = value.ToString();
-        }
-       
-
+        }  
         private void btnTempInit_Click(object sender, EventArgs e)
         private void btnTempInit_Click(object sender, EventArgs e)
         {
         {
             string port = txtTempPort.Text.ToString();
             string port = txtTempPort.Text.ToString();
@@ -1464,16 +1432,6 @@ namespace OnlineStore.ACSingleStore
             LogUtil.logBox = this.richTextBox1;
             LogUtil.logBox = this.richTextBox1;
         }
         }
 
 
-        private void btnReadLimit1_Click(object sender, EventArgs e)
-        {
-            int value = ACServerManager.GetLimitPositiveSingle(GetPortName(), GetSlaveAddr());
-            this.txtLimit1.Text = value.ToString();
-        }
-
-        private void btnReadLimit2_Click(object sender, EventArgs e)
-        {
-            int value = ACServerManager.GetLimitNegativeSingle(GetPortName(), GetSlaveAddr());
-            this.txtLimit2.Text = value.ToString();
-        }
+      
     }
     }
 }
 }

source/ACSingleStore/FrmStoreBox.resx

@@ -120,9 +120,6 @@
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 16</value>
     <value>17, 16</value>
   </metadata>
   </metadata>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>107, 16</value>
-  </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>227, 16</value>
     <value>227, 16</value>
   </metadata>
   </metadata>

source/ACSingleStore/ServoAxisInfo.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace OnlineStore.ACSingleStore
+{
+    public partial class ServoAxisInfo : UserControl
+    {
+        public ServoAxisInfo()
+        {
+            InitializeComponent();
+        }
+    }
+}

source/ACSingleStore/ServoAxisInfo.resx

+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file