1 增加轴是否运动到位接口

2 固高卡增加在HSIO口输出电平或者脉冲接口

Rs.Motion/Base/IAxis.cs

@@ -124,6 +124,12 @@ namespace Rs.Motion.Base
             return ErrorCode.Ok;
         }
 
+        public virtual ErrorCode IsArrived(out bool bIsArrived)
+        {
+            bIsArrived = false;
+            return ErrorCode.Ok;
+        }
+
         public virtual ErrorCode IsInPosition(out bool bIsInPosition)
         {
             bIsInPosition = false;
@@ -172,7 +178,7 @@ namespace Rs.Motion.Base
             return ErrorCode.Ok;
         }
 
-        public virtual ErrorCode ComparePulse(ushort channel)
+        public virtual ErrorCode ComparePulse(ushort channel,bool dp=true)
         {
             return ErrorCode.Ok;
         }

Rs.Motion/GugaoPulse/GugaoPulseAxis.cs

@@ -385,7 +385,8 @@ namespace Rs.Motion.GugaoPulse
             }
             else
             {
-                LogHelper.MoveLog($"acc={trapPrm.acc},dec={trapPrm.dec},targetpos={dfPos},maxvel={fMaxVel}");
+                m_dfCommandPosition = dfPosVal;
+                LogHelper.MoveLog($"acc={trapPrm.acc},dec={trapPrm.dec},targetpos={m_dfCommandPosition},maxvel={fMaxVel}");
                 return ErrorCode.Ok;
             }
         }
@@ -752,13 +753,11 @@ namespace Rs.Motion.GugaoPulse
         /// <returns></returns>
         public void DefaultHome(object obj)
         {
-            MessageQueue.Instance.Insert($"{Config.AxisName} go home");
             if (!SafeCheck())
             {
                 MessageQueue.Instance.Insert($"{Config.AxisName} go home unsafe");
                 return;
             }  
-               
             MessageQueue.Instance.Insert($"{Config.AxisName} go home");
             //判断是否在原点
             GetOrgStatus(out bool bOrg);
@@ -794,10 +793,10 @@ namespace Rs.Motion.GugaoPulse
             homePrm.acc = ((homeSpeedPulse / 1000.0) / (Config.AccTime * 1000.0));
             homePrm.dec = ((homeSpeedPulse / 1000.0) / (Config.AccTime * 1000.0));
             //homePrm.pad1_1 = 0;
-            homePrm.homeOffset = (int)Config.HomeOffset;
+            homePrm.homeOffset = (int)dfHome_offset;
             homePrm.searchHomeDistance = 0;
             homePrm.searchIndexDistance = 0;
-            homePrm.edge = 0;
+            homePrm.edge = (short)(Config.HomeOrgLogic == 0 ? 1 : 0);
             apiResult = mc_pulse.GT_GoHome((short)Config.CardId, (short)Config.AxisId, ref homePrm);
 
            // LogHelper.Debug($"axis {Config.AxisName} start home ,homedir={Config.HomeDir},homemode={Config.HomeMode}");
@@ -810,8 +809,10 @@ namespace Rs.Motion.GugaoPulse
             timer.Restart();
             while (HomeStatus != EHomeStatus.Finished && HomeStatus != EHomeStatus.Abort && timer.ElapsedMilliseconds < 2 * 60 * 1000)
             {
+               
                 mc_pulse.GT_GetHomeStatus((short)Config.CardId, (short)Config.AxisId, out mc_pulse.THomeStatus pHomeStatus);
                 //MessageQueue.Instance.Insert($"run={pHomeStatus.run},stage={pHomeStatus.stage},err={pHomeStatus.error}");
+                //MessageQueue.Instance.Insert($"run={pHomeStatus.run},stage={pHomeStatus.stage},err={pHomeStatus.error}");
                 Thread.Sleep(10);
                 if(pHomeStatus.run==0 && pHomeStatus.stage==100 && pHomeStatus.error==0)
                 {
@@ -872,6 +873,36 @@ namespace Rs.Motion.GugaoPulse
             return ErrorCode.Ok;
         }
 
+        public override ErrorCode IsArrived(out bool bIsArrived)
+        {
+            bIsArrived = false;
+            if (!cardManager.IsInitialized)
+            {
+                return ErrorCode.CardNotInit;
+            }
+            bool bIsStop = false;
+            ErrorCode err = IsStop(out bIsStop);
+            if (err > ErrorCode.Ok)
+            {
+                return err;
+            }
+            if (!bIsStop)
+            {
+                return ErrorCode.Ok;
+            }
+            double currentPos = 0.0;
+            if(Config.EnableEncoder==1)
+            {
+                GetEncoderPosition(out currentPos);
+            }
+            else
+            {
+                GetPrfPosition(out currentPos);
+            }
+            bIsArrived = (currentPos - m_dfCommandPosition) < 0.01;
+            return ErrorCode.Ok;
+        }
+
         /// <summary>
         /// 判断运动是否到位
         /// </summary>
@@ -1619,9 +1650,16 @@ namespace Rs.Motion.GugaoPulse
             return ErrorCode.Ok;
         }
 
-        public override ErrorCode ComparePulse(ushort channel)
+        public override ErrorCode ComparePulse(ushort channel,bool dp=true)
         {
-            apiResult = mc_pulse.GT_ComparePulse((short)Config.CardId, (short)channel, 0, (short)Config.HcmpPulseWidth);
+            short value = (short)channel;
+            if(value!=0)
+            {
+                value = (short)(1 << (channel - 1));
+                
+            }
+            MessageQueue.Instance.Insert(value.ToString());
+            apiResult = mc_pulse.GT_ComparePulse((short)Config.CardId, (short)(1<<(channel-1)), (short)(dp?1:0), (short)Config.HcmpPulseWidth);
             if(apiResult != 0)
             {
                 return ErrorCode.Fail;

Rs.Motion/GugaoPulse/GugaoPulseCardManager.cs

@@ -98,7 +98,9 @@ namespace Rs.Motion.GugaoPulse
                     {
                         return ErrorCode.Fail;
                     }
-                   
+                    short value = 32767 * 5 / 10;
+                    apiResult = mc_pulse.GT_SetDac(0, 11, ref value, 1);
+                    MessageQueue.Instance.Insert($"GT_SetDac ret={apiResult}");
                 }
             }
             else
@@ -128,5 +130,19 @@ namespace Rs.Motion.GugaoPulse
             //return null;
         }
 
+        public ErrorCode ComparePulse(short CardId,ushort channel, bool dp = true,short HcmpPulseWidth=100)
+        {
+            short value = (short)channel;
+            if (value != 0)
+            {
+                value = (short)(1 << (channel - 1));
+            }
+            apiResult = mc_pulse.GT_ComparePulse(CardId, (short)(1 << (channel - 1)), (short)(dp ? 1 : 0), HcmpPulseWidth);
+            if (apiResult != 0)
+            {
+                return ErrorCode.Fail;
+            }
+            return ErrorCode.Ok;
+        }
     }
 }

Rs.MotionPlat/Flow/LoadAndUnloadTask.cs

@@ -130,7 +130,7 @@ namespace Rs.MotionPlat.Flow
             infos.TurnoverID = m_schedulingMaterial.TurnoverID;
             infos.Infos = turnoverResult;
             string content = JsonConvert.SerializeObject(infos, new StringEnumConverter());
-            LogHelper.TestCenterLog("发送:" + content);
+            LogHelper.Debug("发送:" + content);
             return content;
         }
         public string GetTestLoadString()
@@ -141,7 +141,7 @@ namespace Rs.MotionPlat.Flow
             infos.TurnoverID = m_schedulingMaterial.TurnoverID;
             infos.Infos = testLoadTaskList;
             string content = JsonConvert.SerializeObject(infos, new StringEnumConverter());
-            LogHelper.TestCenterLog("发送:" + content);
+            LogHelper.Debug("发送:" + content);
             return content;
         }
         public string GetTestUnLoadString()
@@ -152,7 +152,7 @@ namespace Rs.MotionPlat.Flow
             infos.TurnoverID = m_schedulingMaterial.TurnoverID;
             infos.Infos = testUnloadTaskList;
             string content = JsonConvert.SerializeObject(infos, new StringEnumConverter());
-            LogHelper.TestCenterLog("发送:" + content);
+            LogHelper.Debug("发送:" + content);
             return content;
         }
 

Rs.MotionPlat/Flow/TestCenter.cs

@@ -80,13 +80,13 @@ namespace Rs.MotionPlat.Flow
                     ReplayTaskEvent?.Invoke(info.ToString());
                     break;
                 case EInstruction.LoadAndUnload:
-                    LogHelper.TestCenterLog("接收:" + msg);
+                    LogHelper.Debug("接收:" + msg);
                     MachineManage.Instance.RunState = ERunState.Busying;
                     sm = JsonConvert.DeserializeObject<SchedulingMaterial>(msg);
                     schedulResult = new SchedulingResult() { Instruction = sm.Instruction, State = ERunState.Busying, GroupID = sm.GroupID, TurnoverID = sm.TurnoverID };
                     string buffer = schedulResult.ToString();
                     client.Send(buffer);
-                    LogHelper.TestCenterLog(buffer);
+                    LogHelper.Debug(buffer);
                     LoadAndUnloadTask.Instance.Add(sm);
                     MessageQueue.Instance.Insert(sm.Instruction.ToString());
                     ReplayTaskEvent?.Invoke(schedulResult.ToString());
@@ -209,7 +209,7 @@ namespace Rs.MotionPlat.Flow
         private void Client_OnDisconnected(System.Net.Sockets.Socket obj)
         {
             MessageQueue.Instance.Insert($"中控断开连接");
-            LogHelper.TestCenterLog("中控断开连接");
+            LogHelper.Debug("中控断开连接");
         }
 
         /// <summary>
@@ -218,7 +218,7 @@ namespace Rs.MotionPlat.Flow
         /// <param name="obj"></param>
         private void Client_OnConnected(System.Net.Sockets.Socket obj)
         {
-            LogHelper.TestCenterLog("中控连接成功");
+            LogHelper.Debug("中控连接成功");
             MessageQueue.Instance.Insert($"中控连接成功");
         }
 

Rs.MotionPlat/Form2.Designer.cs

@@ -0,0 +1,90 @@
+namespace Rs.MotionPlat
+{
+    partial class Form2
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.button1 = new System.Windows.Forms.Button();
+            this.rsTray1 = new Rs.Controls.RsTray();
+            this.SuspendLayout();
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(606, 215);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 1;
+            this.button1.Text = "button1";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // rsTray1
+            // 
+            this.rsTray1.CanDraw = true;
+            this.rsTray1.ColSpace = 5;
+            this.rsTray1.ColumnNum = 10;
+            this.rsTray1.HeadText = "0000";
+            this.rsTray1.InitSlotStatus = Rs.Controls.ESlotStatus.Have;
+            this.rsTray1.ItemName = "1010";
+            this.rsTray1.LeftSpaceWidth = 20;
+            this.rsTray1.Location = new System.Drawing.Point(132, 89);
+            this.rsTray1.Name = "rsTray1";
+            this.rsTray1.OffsetX = 0F;
+            this.rsTray1.OffsetY = 0F;
+            this.rsTray1.OffsetYEven = 0F;
+            this.rsTray1.RowNum = 9;
+            this.rsTray1.RowSpace = 3;
+            this.rsTray1.SelectSlot = null;
+            this.rsTray1.ShowStatus = true;
+            this.rsTray1.ShowText = true;
+            this.rsTray1.SinglePoint = false;
+            this.rsTray1.Size = new System.Drawing.Size(315, 457);
+            this.rsTray1.SortDir = Rs.Controls.ESortDir.LeftToRight;
+            this.rsTray1.Status = null;
+            this.rsTray1.TabIndex = 0;
+            this.rsTray1.TopSpaceHeight = 20;
+            // 
+            // Form2
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
+            this.ClientSize = new System.Drawing.Size(883, 694);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.rsTray1);
+            this.Name = "Form2";
+            this.Text = "Form2";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Controls.RsTray rsTray1;
+        private System.Windows.Forms.Button button1;
+    }
+}

Rs.MotionPlat/Form2.cs

@@ -0,0 +1,27 @@
+using Rs.Controls;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Rs.MotionPlat
+{
+    public partial class Form2 : Form
+    {
+        public Form2()
+        {
+            InitializeComponent();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+           TraySlot slot = rsTray1.GetSlot(Rs.Controls.ESlotStatus.Have);
+            MessageBox.Show(slot.Index.ToString()+$" r={slot.Row},col={slot.Column}");
+        }
+    }
+}

Rs.MotionPlat/Form2.resx

@@ -0,0 +1,120 @@
+<?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>

Rs.MotionPlat/FormMain.Designer.cs

@@ -563,7 +563,6 @@
             this.trayEmpty1.ShowText = false;
             this.trayEmpty1.SinglePoint = false;
             this.trayEmpty1.Size = new System.Drawing.Size(121, 399);
-            this.trayEmpty1.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayEmpty1.Status = null;
             this.trayEmpty1.TabIndex = 0;
             this.trayEmpty1.TopSpaceHeight = 20;
@@ -591,7 +590,6 @@
             this.trayInput.ShowText = false;
             this.trayInput.SinglePoint = false;
             this.trayInput.Size = new System.Drawing.Size(121, 399);
-            this.trayInput.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayInput.Status = null;
             this.trayInput.TabIndex = 0;
             this.trayInput.TopSpaceHeight = 20;
@@ -619,7 +617,6 @@
             this.trayOk.ShowText = false;
             this.trayOk.SinglePoint = false;
             this.trayOk.Size = new System.Drawing.Size(121, 399); 
-            this.trayOk.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayOk.Status = null;
             this.trayOk.TabIndex = 0;
             this.trayOk.TopSpaceHeight = 20;
@@ -648,7 +645,6 @@
             this.trayNg.ShowText = false;
             this.trayNg.SinglePoint = false;
             this.trayNg.Size = new System.Drawing.Size(121, 399); 
-            this.trayNg.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayNg.Status = null;
             this.trayNg.TabIndex = 0;
             this.trayNg.TopSpaceHeight = 20;
@@ -677,7 +673,6 @@
             this.trayMulti.ShowText = false;
             this.trayMulti.SinglePoint = false;
             this.trayMulti.Size = new System.Drawing.Size(121, 399); 
-            this.trayMulti.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayMulti.Status = null;
             this.trayMulti.TabIndex = 0;
             this.trayMulti.TopSpaceHeight = 20;
@@ -706,7 +701,6 @@
             this.trayEmpty2.ShowText = false;
             this.trayEmpty2.SinglePoint = false;
             this.trayEmpty2.Size = new System.Drawing.Size(124, 399); 
-            this.trayEmpty2.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayEmpty2.Status = null;
             this.trayEmpty2.TabIndex = 0;
             this.trayEmpty2.TopSpaceHeight = 20;
@@ -759,7 +753,6 @@
             this.trayTurnover.ShowText = false;
             this.trayTurnover.SinglePoint = false;
             this.trayTurnover.Size = new System.Drawing.Size(244, 193);
-            this.trayTurnover.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.trayTurnover.Status = null;
             this.trayTurnover.TabIndex = 1;
             this.trayTurnover.TopSpaceHeight = 20;

Rs.MotionPlat/Recipe/DownCameraLocation.Designer.cs

@@ -130,7 +130,6 @@
             this.rsTray1.SelectSlot = null;
             this.rsTray1.ShowText = true;
             this.rsTray1.Size = new System.Drawing.Size(215, 577);
-            this.rsTray1.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.rsTray1.TabIndex = 0;
             this.rsTray1.TopSpaceHeight = 20;
             // 

Rs.MotionPlat/Recipe/StockTrayLocationRecipe.Designer.cs

@@ -454,7 +454,6 @@
             this.rsTray1.ShowText = false;
             this.rsTray1.SinglePoint = false;
             this.rsTray1.Size = new System.Drawing.Size(361, 242); 
-            this.rsTray1.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.rsTray1.TabIndex = 0;
             this.rsTray1.TopSpaceHeight = 20;
             this.rsTray1.SlotClickEvent += new System.Action<Rs.Controls.TraySlot, System.Windows.Forms.MouseEventArgs>(this.rsTray1_SlotClickEvent);

Rs.MotionPlat/Recipe/TrayRecipe.Designer.cs

@@ -139,7 +139,6 @@
             this.rsTray1.ShowText = true;
             this.rsTray1.SinglePoint = false;
             this.rsTray1.Size = new System.Drawing.Size(297, 585);
-            this.rsTray1.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.rsTray1.TabIndex = 0;
             this.rsTray1.TopSpaceHeight = 20;
             this.rsTray1.SlotClickEvent += new System.Action<Rs.Controls.TraySlot, System.Windows.Forms.MouseEventArgs>(this.rsTray1_SlotClickEvent);

Rs.MotionPlat/Recipe/TurnoverLocationRecipe.Designer.cs

@@ -851,7 +851,6 @@
             this.rsTray1.ShowText = false;
             this.rsTray1.SinglePoint = false;
             this.rsTray1.Size = new System.Drawing.Size(237, 265);
-            this.rsTray1.SortDir = Rs.Controls.ESortDir.Horizontal;
             this.rsTray1.TabIndex = 0;
             this.rsTray1.TopSpaceHeight = 20;
             this.rsTray1.SlotClickEvent += new System.Action<Rs.Controls.TraySlot, System.Windows.Forms.MouseEventArgs>(this.rsTray1_SlotClickEvent);

Rs.MotionPlat/Rs.MotionPlat.csproj

@@ -173,6 +173,12 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Form2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form2.Designer.cs">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </Compile>
     <Compile Include="FormIO.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -403,6 +409,9 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form2.resx">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FormIO.resx">
       <DependentUpon>FormIO.cs</DependentUpon>
     </EmbeddedResource>