chenjiangqun 2 жил өмнө
parent
commit
a6ceea2086

+ 30 - 5
FactoryTool_CShare/IO/SerialCMD.cs

@@ -3201,12 +3201,29 @@ namespace MOKA_Factory_Tools
                 l++;
             }
         }
-
+        /// <summary>
+        /// RMCA抄写
+        /// </summary>
+        /// <param name="Comport"></param>
+        /// <param name="param"></param>
+        /// <param name="result"></param>
+        /// <param name="data"></param>
+        /// <param name="error"></param>
+        /// <param name="waitTime"></param>
+        /// <returns></returns>
         public static bool SetRMCA(SerialPort Comport, byte[] param, out byte[] result, out byte[] data, out string error, int waitTime)
         {
             return SendcmdEx(Comport, new byte[] { 0xAA, 0xFE }, new byte[] { 0xFC, 0x00, 0x18 }, param, false, false, out result, out data, out error, waitTime);
         }
-
+        /// <summary>
+        /// RCMA校验
+        /// </summary>
+        /// <param name="Comport"></param>
+        /// <param name="result"></param>
+        /// <param name="data"></param>
+        /// <param name="error"></param>
+        /// <param name="waitTime"></param>
+        /// <returns></returns>
         public static bool CheckRMCA(SerialPort Comport, out byte[] result, out byte[] data, out string error, int waitTime)
         {
             if (SendcmdEx(Comport, new byte[] { 0xAA }, new byte[] { 0xFC, 0x01, 0x18 }, new byte[] { }, true, false, out result, out data, out error, waitTime))
@@ -3215,7 +3232,7 @@ namespace MOKA_Factory_Tools
                     return true;
                 else
                 {
-                    error = "Playready return status fail,should be 0x02,0x18,0x01";
+                    error = "RMCA return status fail,should be 0x02,0x18,0x01";
                     return false;
                 }
 
@@ -3223,7 +3240,15 @@ namespace MOKA_Factory_Tools
             else
                 return false;
         }
-
+        /// <summary>
+        /// RCMA读取
+        /// </summary>
+        /// <param name="Comport"></param>
+        /// <param name="result"></param>
+        /// <param name="data"></param>
+        /// <param name="error"></param>
+        /// <param name="waitTime"></param>
+        /// <returns></returns>
         public static bool ReadRMCA(SerialPort Comport, out byte[] result, out byte[] data, out string error, int waitTime)
         {
             if (SendcmdEx(Comport, new byte[] { 0xAA }, new byte[] { 0xFC, 0x03, 0x18 }, new byte[] { }, true, true, out result, out data, out error, waitTime))
@@ -3235,7 +3260,7 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    error = "返回Playready类型错误,应为0x04, 0x18";
+                    error = "返回RMCA类型错误,应为0x04, 0x18";
                     return false;
                 }
 

+ 94 - 37
FactoryTool_CShare/Views/OperationPanel.Designer.cs

@@ -67,6 +67,11 @@
             this.skinLabel10 = new CCWin.SkinControl.SkinLabel();
             this.skinGroupBox2 = new CCWin.SkinControl.SkinGroupBox();
             this.skinPanel1 = new CCWin.SkinControl.SkinPanel();
+            this.m_readKFP = new CCWin.SkinControl.SkinLabel();
+            this.m_checkKFP = new CCWin.SkinControl.SkinLabel();
+            this.m_writeKFP = new CCWin.SkinControl.SkinLabel();
+            this.KFPCount = new CCWin.SkinControl.SkinLabel();
+            this.WriteKFP = new CCWin.SkinControl.SkinCheckBox();
             this.m_readDAK = new CCWin.SkinControl.SkinLabel();
             this.m_checkDAK = new CCWin.SkinControl.SkinLabel();
             this.m_writeDAK = new CCWin.SkinControl.SkinLabel();
@@ -205,11 +210,11 @@
             this.SNText = new CCWin.SkinControl.SkinWaterTextBox();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.m_readKFP = new CCWin.SkinControl.SkinLabel();
-            this.m_checkKFP = new CCWin.SkinControl.SkinLabel();
-            this.m_writeKFP = new CCWin.SkinControl.SkinLabel();
-            this.KFPCount = new CCWin.SkinControl.SkinLabel();
-            this.WriteKFP = new CCWin.SkinControl.SkinCheckBox();
+            this.WriteRMCA = new CCWin.SkinControl.SkinCheckBox();
+            this.skinLabelRMCA = new CCWin.SkinControl.SkinLabel();
+            this.m_writeRMCA = new CCWin.SkinControl.SkinLabel();
+            this.m_checkRMCA = new CCWin.SkinControl.SkinLabel();
+            this.m_readRMCA = new CCWin.SkinControl.SkinLabel();
             this.skinGroupBox1.SuspendLayout();
             this.skinGroupBox2.SuspendLayout();
             this.skinPanel1.SuspendLayout();
@@ -565,6 +570,11 @@
             // 
             resources.ApplyResources(this.skinPanel1, "skinPanel1");
             this.skinPanel1.BackColor = System.Drawing.Color.Transparent;
+            this.skinPanel1.Controls.Add(this.m_readRMCA);
+            this.skinPanel1.Controls.Add(this.m_checkRMCA);
+            this.skinPanel1.Controls.Add(this.m_writeRMCA);
+            this.skinPanel1.Controls.Add(this.skinLabelRMCA);
+            this.skinPanel1.Controls.Add(this.WriteRMCA);
             this.skinPanel1.Controls.Add(this.m_readKFP);
             this.skinPanel1.Controls.Add(this.m_checkKFP);
             this.skinPanel1.Controls.Add(this.m_writeKFP);
@@ -706,6 +716,48 @@
             this.skinPanel1.Name = "skinPanel1";
             this.skinPanel1.NormlBack = null;
             // 
+            // m_readKFP
+            // 
+            resources.ApplyResources(this.m_readKFP, "m_readKFP");
+            this.m_readKFP.BackColor = System.Drawing.Color.Transparent;
+            this.m_readKFP.BorderColor = System.Drawing.Color.White;
+            this.m_readKFP.Name = "m_readKFP";
+            // 
+            // m_checkKFP
+            // 
+            resources.ApplyResources(this.m_checkKFP, "m_checkKFP");
+            this.m_checkKFP.BackColor = System.Drawing.Color.Transparent;
+            this.m_checkKFP.BorderColor = System.Drawing.Color.White;
+            this.m_checkKFP.Name = "m_checkKFP";
+            // 
+            // m_writeKFP
+            // 
+            resources.ApplyResources(this.m_writeKFP, "m_writeKFP");
+            this.m_writeKFP.BackColor = System.Drawing.Color.Transparent;
+            this.m_writeKFP.BorderColor = System.Drawing.Color.White;
+            this.m_writeKFP.Name = "m_writeKFP";
+            // 
+            // KFPCount
+            // 
+            resources.ApplyResources(this.KFPCount, "KFPCount");
+            this.KFPCount.BackColor = System.Drawing.Color.Transparent;
+            this.KFPCount.BorderColor = System.Drawing.Color.White;
+            this.KFPCount.Name = "KFPCount";
+            // 
+            // WriteKFP
+            // 
+            resources.ApplyResources(this.WriteKFP, "WriteKFP");
+            this.WriteKFP.BackColor = System.Drawing.Color.Transparent;
+            this.WriteKFP.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.WriteKFP.DownBack = null;
+            this.WriteKFP.MouseBack = null;
+            this.WriteKFP.Name = "WriteKFP";
+            this.WriteKFP.NormlBack = null;
+            this.WriteKFP.SelectedDownBack = null;
+            this.WriteKFP.SelectedMouseBack = null;
+            this.WriteKFP.SelectedNormlBack = null;
+            this.WriteKFP.UseVisualStyleBackColor = false;
+            // 
             // m_readDAK
             // 
             resources.ApplyResources(this.m_readDAK, "m_readDAK");
@@ -1847,47 +1899,47 @@
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
-            // m_readKFP
+            // WriteRMCA
             // 
-            resources.ApplyResources(this.m_readKFP, "m_readKFP");
-            this.m_readKFP.BackColor = System.Drawing.Color.Transparent;
-            this.m_readKFP.BorderColor = System.Drawing.Color.White;
-            this.m_readKFP.Name = "m_readKFP";
+            resources.ApplyResources(this.WriteRMCA, "WriteRMCA");
+            this.WriteRMCA.BackColor = System.Drawing.Color.Transparent;
+            this.WriteRMCA.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.WriteRMCA.DownBack = null;
+            this.WriteRMCA.MouseBack = null;
+            this.WriteRMCA.Name = "WriteRMCA";
+            this.WriteRMCA.NormlBack = null;
+            this.WriteRMCA.SelectedDownBack = null;
+            this.WriteRMCA.SelectedMouseBack = null;
+            this.WriteRMCA.SelectedNormlBack = null;
+            this.WriteRMCA.UseVisualStyleBackColor = false;
             // 
-            // m_checkKFP
+            // skinLabelRMCA
             // 
-            resources.ApplyResources(this.m_checkKFP, "m_checkKFP");
-            this.m_checkKFP.BackColor = System.Drawing.Color.Transparent;
-            this.m_checkKFP.BorderColor = System.Drawing.Color.White;
-            this.m_checkKFP.Name = "m_checkKFP";
+            resources.ApplyResources(this.skinLabelRMCA, "skinLabelRMCA");
+            this.skinLabelRMCA.BackColor = System.Drawing.Color.Transparent;
+            this.skinLabelRMCA.BorderColor = System.Drawing.Color.White;
+            this.skinLabelRMCA.Name = "skinLabelRMCA";
             // 
-            // m_writeKFP
+            // m_writeRMCA
             // 
-            resources.ApplyResources(this.m_writeKFP, "m_writeKFP");
-            this.m_writeKFP.BackColor = System.Drawing.Color.Transparent;
-            this.m_writeKFP.BorderColor = System.Drawing.Color.White;
-            this.m_writeKFP.Name = "m_writeKFP";
+            resources.ApplyResources(this.m_writeRMCA, "m_writeRMCA");
+            this.m_writeRMCA.BackColor = System.Drawing.Color.Transparent;
+            this.m_writeRMCA.BorderColor = System.Drawing.Color.White;
+            this.m_writeRMCA.Name = "m_writeRMCA";
             // 
-            // KFPCount
+            // m_checkRMCA
             // 
-            resources.ApplyResources(this.KFPCount, "KFPCount");
-            this.KFPCount.BackColor = System.Drawing.Color.Transparent;
-            this.KFPCount.BorderColor = System.Drawing.Color.White;
-            this.KFPCount.Name = "KFPCount";
+            resources.ApplyResources(this.m_checkRMCA, "m_checkRMCA");
+            this.m_checkRMCA.BackColor = System.Drawing.Color.Transparent;
+            this.m_checkRMCA.BorderColor = System.Drawing.Color.White;
+            this.m_checkRMCA.Name = "m_checkRMCA";
             // 
-            // WriteKFP
+            // m_readRMCA
             // 
-            resources.ApplyResources(this.WriteKFP, "WriteKFP");
-            this.WriteKFP.BackColor = System.Drawing.Color.Transparent;
-            this.WriteKFP.ControlState = CCWin.SkinClass.ControlState.Normal;
-            this.WriteKFP.DownBack = null;
-            this.WriteKFP.MouseBack = null;
-            this.WriteKFP.Name = "WriteKFP";
-            this.WriteKFP.NormlBack = null;
-            this.WriteKFP.SelectedDownBack = null;
-            this.WriteKFP.SelectedMouseBack = null;
-            this.WriteKFP.SelectedNormlBack = null;
-            this.WriteKFP.UseVisualStyleBackColor = false;
+            resources.ApplyResources(this.m_readRMCA, "m_readRMCA");
+            this.m_readRMCA.BackColor = System.Drawing.Color.Transparent;
+            this.m_readRMCA.BorderColor = System.Drawing.Color.White;
+            this.m_readRMCA.Name = "m_readRMCA";
             // 
             // OperationPanel
             // 
@@ -2099,5 +2151,10 @@
         private CCWin.SkinControl.SkinLabel m_writeKFP;
         private CCWin.SkinControl.SkinLabel KFPCount;
         private CCWin.SkinControl.SkinCheckBox WriteKFP;
+        private CCWin.SkinControl.SkinLabel m_readRMCA;
+        private CCWin.SkinControl.SkinLabel m_checkRMCA;
+        private CCWin.SkinControl.SkinLabel m_writeRMCA;
+        private CCWin.SkinControl.SkinLabel skinLabelRMCA;
+        private CCWin.SkinControl.SkinCheckBox WriteRMCA;
     }
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 260 - 92
FactoryTool_CShare/Views/OperationPanel.resx


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно