送丝调试修改

DeviceLibrary/deviceLibrary/jbc/SendWireManager.cs

@@ -24,7 +24,7 @@ namespace URSoldering.DeviceLibrary
         private static Parity parity = Parity.None;//校验位
         private static int dataBits = 8;//数据位
         private static StopBits stopBits = StopBits.One; //停止位
-        private static SerialBean sb = null;
+        private static AcSerialBean sb = null;
 
         private static string CMD_WriteMode = "0010WMOD00002";
         private static string CMD_SetSpeed = "0010WSPD";
@@ -35,7 +35,8 @@ namespace URSoldering.DeviceLibrary
         private static string CMD_StartForwardSend = "0010WSFD00001";
         private static string CMD_StartBackSend = "0010WSFD00000";
         private static string CMD_StopSend = "0010WSSD00000";
-        private static string CMD_Reset = "0010WCTP00000"; 
+        private static string CMD_Reset = "0010WECV00001";
+        //private static string CMD_Reset = "0010WCTP00000";
 
         //private static string CMD_WriteMode = "02 57 4D 4F 44 30 30 30 30 32 03 22";
         //private static string CMD_SetSpeed = "02 57 53 50 44 30 30 31 31 30 03 21";
@@ -54,7 +55,7 @@ namespace URSoldering.DeviceLibrary
             if (sb == null)
             {
                 serialPort = port;
-                sb = new SerialBean(serialPort, bautRate, parity, dataBits, stopBits);
+                sb = new AcSerialBean(serialPort, bautRate, parity, dataBits, stopBits);
             }
             try
             {
@@ -106,19 +107,19 @@ namespace URSoldering.DeviceLibrary
             bool isOk = false;
             parseCommand(CMD_Reset, out isOk);
         }
-        public static int querySpeed()
+        public static double querySpeed()
         {
             bool isOk = false;
             byte[] reviceData = parseCommand(CMD_GetSpeed, out isOk);
-            int data = getReviceData(reviceData);
+            double data = (double)getReviceData(reviceData)/10;
             return data ;
         }
 
-        public static int queryLength()
+        public static double queryLength()
         {
             bool isOk = false;
             byte[] reviceData = parseCommand(CMD_GetSendLength, out isOk);
-            int data = getReviceData(reviceData);
+            double data = (double)getReviceData(reviceData)/10;
             return data;
         }
         public static int getReviceData(byte[] dataArray)
@@ -142,7 +143,7 @@ namespace URSoldering.DeviceLibrary
             {
                 LOGGER.Info("转换出错：" + ex.ToString());
             }
-            ///string rawMsg = Encoding.Default.GetString(dataArray, 0, dataArray.Length);
+             
             int data = 0;
             try
             {
@@ -157,20 +158,21 @@ namespace URSoldering.DeviceLibrary
         public static void SendWire(double time, int speed)
         {
             setSpeed(speed);
-            setLength(time * speed);
+            double length = (time * speed);
+            setLength(length);
             StartFSend();
         }
         public static bool setSpeed(double speed)
         {
             bool isOk = false;
-            int data = (int)speed * 10;
+            int data = (int)(speed * 10);
             parseCommand(CMD_SetSpeed + data.ToString().PadLeft(5, '0'), out isOk);
             return isOk;
         }
         public static bool setLength(double length)
         {
             bool isOk = false;
-            int data = (int)length * 10;
+            int data = (int)(length * 10);
             parseCommand(CMD_SetSendLength + data.ToString().PadLeft(5, '0'), out isOk);
             return isOk;
         }
@@ -248,8 +250,8 @@ namespace URSoldering.DeviceLibrary
             string str = SerialBean.byteToHexStr(messageAll);
             LogUtil.info(" 【"+commandText+"】 转换后【"+str+"】");
             //data = new byte[messageAll.Length];
-            sb.SendCommand(messageAll, ref data, 2, out  isOk);
-            string rawMsg = Encoding.ASCII.GetString(data, 0, data.Length);
+            sb.SendCommand(messageAll, ref data, 100, out  isOk);
+            //string rawMsg = Encoding.ASCII.GetString(data, 100, data.Length);
             return data;
         }
     

URSolderingClient/FrmSendWire.cs

@@ -2,6 +2,7 @@
 using System; 
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Windows.Forms;
 using URSoldering.Common;
 using URSoldering.DeviceLibrary;
@@ -67,8 +68,8 @@ namespace URSoldering.Client
 
         private void btnSetSold_Click(object sender, EventArgs e)
         {
-            int speed = FormUtil.GetIntValue(txtSpeed);
-            int length = FormUtil.GetIntValue(txtLength);
+            double speed = FormUtil.getDoubleValue(txtSpeed);
+            double length = FormUtil.getDoubleValue(txtLength);
             SendWireManager.setLength(length);
             SendWireManager.setSpeed(speed);
         }
@@ -125,12 +126,12 @@ namespace URSoldering.Client
 
         private void btnReadError_Click_1(object sender, EventArgs e)
         {
-            int speed = SendWireManager.querySpeed();
-            int length = SendWireManager.queryLength();
+            double speed = SendWireManager.querySpeed();
+            txtSpeed.Text = speed.ToString();
+            double length = SendWireManager.queryLength();
+            txtLength.Text = length.ToString(); 
             int value = SendWireManager.ReadPortError();
             txtPortError.Text = value.ToString();
-            txtLength.Text = length.ToString();
-            txtSpeed.Text = speed.ToString();
         }
 
         private void btnReset_Click(object sender, EventArgs e)