Преглед на файлове

修改默认IP地址和端口号。

Dail преди 8 месеца
родител
ревизия
bb302ea8a1
променени са 23 файла, в които са добавени 87 реда и са изтрити 34 реда
  1. BIN
      .vs/MOTINOVA_MC_Test/FileContentIndex/50b2aa1d-062a-4641-b304-67faf2ea43af.vsidx
  2. 0 0
      .vs/MOTINOVA_MC_Test/FileContentIndex/read.lock
  3. BIN
      .vs/MOTINOVA_MC_Test/v17/.suo
  4. 62 12
      MOTINOVA_MC_Test/Form1.Designer.cs
  5. 8 5
      MOTINOVA_MC_Test/Form1.cs
  6. 2 2
      MOTINOVA_MC_Test/bin/Debug/Config.ttcfg
  7. 1 1
      MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.application
  8. BIN
      MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.exe
  9. 2 2
      MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.exe.manifest
  10. BIN
      MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.pdb
  11. BIN
      MOTINOVA_MC_Test/bin/Debug/app.publish/MOTINOVA_MC_Test.exe
  12. 7 7
      MOTINOVA_MC_Test/ftp.cs
  13. BIN
      MOTINOVA_MC_Test/obj/Debug/DesignTimeResolveAssemblyReferences.cache
  14. BIN
      MOTINOVA_MC_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  15. 1 1
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.application
  16. BIN
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.AssemblyReference.cache
  17. 0 0
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.CopyComplete
  18. 1 1
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.CoreCompileInputs.cache
  19. 1 1
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.FileListAbsolute.txt
  20. BIN
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.GenerateResource.cache
  21. BIN
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.exe
  22. 2 2
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.exe.manifest
  23. BIN
      MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.pdb

BIN
.vs/MOTINOVA_MC_Test/FileContentIndex/50b2aa1d-062a-4641-b304-67faf2ea43af.vsidx


+ 0 - 0
.vs/MOTINOVA_MC_Test/FileContentIndex/read.lock


BIN
.vs/MOTINOVA_MC_Test/v17/.suo


+ 62 - 12
MOTINOVA_MC_Test/Form1.Designer.cs

@@ -100,6 +100,7 @@
             this.textBox_RunInfo_Time = new System.Windows.Forms.TextBox();
             this.textBox_RunInfo_ErrorCode = new System.Windows.Forms.TextBox();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.radioButton_DebugMode_Confg = new System.Windows.Forms.RadioButton();
             this.radioButton_WorkMode_Confg = new System.Windows.Forms.RadioButton();
             this.radioButton_WorkMode_Run = new System.Windows.Forms.RadioButton();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
@@ -420,7 +421,10 @@
             this.label153 = new System.Windows.Forms.Label();
             this.label154 = new System.Windows.Forms.Label();
             this.label155 = new System.Windows.Forms.Label();
-            this.radioButton_DebugMode_Confg = new System.Windows.Forms.RadioButton();
+            this.textBox_LogAddrEnd = new System.Windows.Forms.TextBox();
+            this.textBox_LogAddrBegin = new System.Windows.Forms.TextBox();
+            this.label156 = new System.Windows.Forms.Label();
+            this.label157 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -1168,6 +1172,18 @@
             this.groupBox5.Text = "工作模式";
             this.groupBox5.Visible = false;
             // 
+            // radioButton_DebugMode_Confg
+            // 
+            this.radioButton_DebugMode_Confg.AutoSize = true;
+            this.radioButton_DebugMode_Confg.Location = new System.Drawing.Point(86, 32);
+            this.radioButton_DebugMode_Confg.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.radioButton_DebugMode_Confg.Name = "radioButton_DebugMode_Confg";
+            this.radioButton_DebugMode_Confg.Size = new System.Drawing.Size(55, 24);
+            this.radioButton_DebugMode_Confg.TabIndex = 6;
+            this.radioButton_DebugMode_Confg.Text = "调试";
+            this.radioButton_DebugMode_Confg.UseVisualStyleBackColor = true;
+            this.radioButton_DebugMode_Confg.Click += new System.EventHandler(this.radioButton_DebugMode_Confg_Click);
+            // 
             // radioButton_WorkMode_Confg
             // 
             this.radioButton_WorkMode_Confg.AutoSize = true;
@@ -3087,9 +3103,13 @@
             // 
             // groupBox14
             // 
+            this.groupBox14.Controls.Add(this.textBox_LogAddrEnd);
             this.groupBox14.Controls.Add(this.label99);
+            this.groupBox14.Controls.Add(this.textBox_LogAddrBegin);
             this.groupBox14.Controls.Add(this.button_ReadErrorLog);
+            this.groupBox14.Controls.Add(this.label156);
             this.groupBox14.Controls.Add(this.button_ReadRunLog);
+            this.groupBox14.Controls.Add(this.label157);
             this.groupBox14.Controls.Add(this.label96);
             this.groupBox14.Controls.Add(this.textBox_Runlog1_MCU_MIN);
             this.groupBox14.Controls.Add(this.textBox_Runlog1_Coil_MIN);
@@ -4720,17 +4740,43 @@
             this.label155.TabIndex = 66;
             this.label155.Text = "状态机1";
             // 
-            // radioButton_DebugMode_Confg
+            // textBox_LogAddrEnd
             // 
-            this.radioButton_DebugMode_Confg.AutoSize = true;
-            this.radioButton_DebugMode_Confg.Location = new System.Drawing.Point(86, 32);
-            this.radioButton_DebugMode_Confg.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
-            this.radioButton_DebugMode_Confg.Name = "radioButton_DebugMode_Confg";
-            this.radioButton_DebugMode_Confg.Size = new System.Drawing.Size(55, 24);
-            this.radioButton_DebugMode_Confg.TabIndex = 6;
-            this.radioButton_DebugMode_Confg.Text = "调试";
-            this.radioButton_DebugMode_Confg.UseVisualStyleBackColor = true;
-            this.radioButton_DebugMode_Confg.Click += new System.EventHandler(this.radioButton_DebugMode_Confg_Click);
+            this.textBox_LogAddrEnd.Location = new System.Drawing.Point(228, 492);
+            this.textBox_LogAddrEnd.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.textBox_LogAddrEnd.Name = "textBox_LogAddrEnd";
+            this.textBox_LogAddrEnd.Size = new System.Drawing.Size(80, 26);
+            this.textBox_LogAddrEnd.TabIndex = 9;
+            this.textBox_LogAddrEnd.Text = "0801F3FF";
+            // 
+            // textBox_LogAddrBegin
+            // 
+            this.textBox_LogAddrBegin.Location = new System.Drawing.Point(76, 492);
+            this.textBox_LogAddrBegin.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.textBox_LogAddrBegin.Name = "textBox_LogAddrBegin";
+            this.textBox_LogAddrBegin.Size = new System.Drawing.Size(80, 26);
+            this.textBox_LogAddrBegin.TabIndex = 10;
+            this.textBox_LogAddrBegin.Text = "0801F000";
+            // 
+            // label156
+            // 
+            this.label156.AutoSize = true;
+            this.label156.Location = new System.Drawing.Point(159, 495);
+            this.label156.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label156.Name = "label156";
+            this.label156.Size = new System.Drawing.Size(65, 20);
+            this.label156.TabIndex = 11;
+            this.label156.Text = "结束地址";
+            // 
+            // label157
+            // 
+            this.label157.AutoSize = true;
+            this.label157.Location = new System.Drawing.Point(6, 495);
+            this.label157.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label157.Name = "label157";
+            this.label157.Size = new System.Drawing.Size(65, 20);
+            this.label157.TabIndex = 12;
+            this.label157.Text = "起始地址";
             // 
             // Form1
             // 
@@ -4770,7 +4816,7 @@
             this.MaximizeBox = false;
             this.Name = "Form1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "MOTINOVA中置电机配置软件V3.0.0(内部使用)";
+            this.Text = "MOTINOVA中置电机配置软件V3.0.1(内部使用)";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed);
             this.Load += new System.EventHandler(this.Form1_Load);
@@ -5211,6 +5257,10 @@
         private System.Windows.Forms.Label label154;
         private System.Windows.Forms.Label label155;
         private System.Windows.Forms.RadioButton radioButton_DebugMode_Confg;
+        private System.Windows.Forms.TextBox textBox_LogAddrEnd;
+        private System.Windows.Forms.TextBox textBox_LogAddrBegin;
+        private System.Windows.Forms.Label label156;
+        private System.Windows.Forms.Label label157;
     }
 }
 

+ 8 - 5
MOTINOVA_MC_Test/Form1.cs

@@ -166,8 +166,8 @@ namespace MOTINOVA_MC_Test
             else //不存在配置文件,生成文件写入默认值
             {
                 string CfgFileInfo = "";
-                ServerIP = "10.176.42.30";
-                ServerPort = "21";
+                ServerIP = "10.177.130.30";
+                ServerPort = "15021";
                 ServerUser = "factory_test";
                 ServerPasswd = "ttium";
                 ServerPath = "MotorRunTest";
@@ -2605,7 +2605,10 @@ namespace MOTINOVA_MC_Test
             {
                 if (c is TextBox)
                 {
-                    c.Text = "---";
+                    if ((c == textBox_LogAddrBegin) || (c == textBox_LogAddrEnd))
+                        continue;
+                    else
+                        c.Text = "---";
                 }                         
             }
         }
@@ -3618,8 +3621,8 @@ namespace MOTINOVA_MC_Test
             UInt32 Address_Begin;
             UInt32 Addres_End;
 
-            string textBox_Address_Begin = "0801F000";
-            string textBox_Address_End = "0801F3FF";
+            string textBox_Address_Begin = textBox_LogAddrBegin.Text;
+            string textBox_Address_End = textBox_LogAddrEnd.Text;
 
             if (!serialPort1.IsOpen)
             {

+ 2 - 2
MOTINOVA_MC_Test/bin/Debug/Config.ttcfg

@@ -1,6 +1,6 @@
 [ServerSet]
-IPAddress:10.176.42.30
-Port:21
+IPAddress:10.177.130.30
+Port:15021
 User:factory_test
 Password:ttium
 PathName:MotorRunTest

+ 1 - 1
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.application

@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>MRSfo1BJ0WlDs/xu2qwyBDsSRUM=</dsig:DigestValue>
+        <dsig:DigestValue>AKwpSNiGgH9F/GT0HMfjFEMLZjM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.exe


+ 2 - 2
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.exe.manifest

@@ -48,14 +48,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="265728">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="266752">
       <assemblyIdentity name="MOTINOVA_MC_Test" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>LI1cPGMRX9sbMMQcpyEi+ltHO/k=</dsig:DigestValue>
+        <dsig:DigestValue>4T60cxSFukUfm+nJ/LQEty159Ys=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/bin/Debug/MOTINOVA_MC_Test.pdb


BIN
MOTINOVA_MC_Test/bin/Debug/app.publish/MOTINOVA_MC_Test.exe


+ 7 - 7
MOTINOVA_MC_Test/ftp.cs

@@ -38,7 +38,7 @@ namespace MOTINOVA_MC_Test
         {
             try
             {
-                Uri uri = new Uri(string.Format("ftp://{0}/{1}", serverIP, "/"));
+                Uri uri = new Uri(string.Format("ftp://" + serverIP + ":" + serverPort));
                 FtpWebRequest ftpRequest = (FtpWebRequest)FtpWebRequest.Create(uri);
                 ftpRequest.Credentials = new NetworkCredential(userId, passWord);
                 ftpRequest.Method = WebRequestMethods.Ftp.PrintWorkingDirectory;
@@ -126,7 +126,7 @@ namespace MOTINOVA_MC_Test
                 if (Directory.Exists(targetFullPath) == false)
                     Directory.CreateDirectory(targetFullPath);
                 outputStream = new FileStream(targetFullPath + "\\" + fileName, FileMode.Create);
-                Uri uri = new Uri("ftp://" + serverIP + "/" + sourceFullPath);
+                Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + "/" + sourceFullPath);
                 ftpRequest = (FtpWebRequest)FtpWebRequest.Create(uri);
                 ftpRequest.Method = WebRequestMethods.Ftp.DownloadFile;
                 ftpRequest.UseBinary = true;
@@ -165,7 +165,7 @@ namespace MOTINOVA_MC_Test
         {
             try
             {
-                Uri uri = new Uri("ftp://" + serverIP + "/" + fileName);
+                Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + "/" + fileName);
                 FtpWebRequest reqFTP;
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
 
@@ -198,7 +198,7 @@ namespace MOTINOVA_MC_Test
         {
             try
             {
-                Uri uri = new Uri("ftp://" + serverIP + "/" + folderName);
+                Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + "/" + folderName);
                 FtpWebRequest reqFTP;
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
 
@@ -240,7 +240,7 @@ namespace MOTINOVA_MC_Test
             try
             {
                 result = new StringBuilder();
-                Uri uri = new Uri("ftp://" + serverIP + "/" + ServerPath);
+                Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + "/" + ServerPath);
                 ftp = (FtpWebRequest)FtpWebRequest.Create(uri);
                 ftp.Credentials = new NetworkCredential(userId,passWord);
                 ftp.Method = WebRequestMethods.Ftp.ListDirectoryDetails;
@@ -401,7 +401,7 @@ namespace MOTINOVA_MC_Test
             FtpWebRequest reqFTP;
             try
             {
-                Uri uri = new Uri("ftp://" + serverIP + "/" + dirName);
+                Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + "/" + dirName);
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
                 reqFTP.Method = WebRequestMethods.Ftp.MakeDirectory;
                 reqFTP.UseBinary = true;
@@ -428,7 +428,7 @@ namespace MOTINOVA_MC_Test
             FtpWebRequest reqFTP;
             try
             {
-                Uri uri = new Uri("ftp://" + serverIP + "/" + currentFilename);
+                Uri uri = new Uri("ftp://" + serverIP + ":" + serverPort + "/" + "/" + currentFilename);
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(uri);
                 reqFTP.Method = WebRequestMethods.Ftp.Rename;
                 reqFTP.RenameTo = newFilename;

BIN
MOTINOVA_MC_Test/obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
MOTINOVA_MC_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 1 - 1
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.application

@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>MRSfo1BJ0WlDs/xu2qwyBDsSRUM=</dsig:DigestValue>
+        <dsig:DigestValue>AKwpSNiGgH9F/GT0HMfjFEMLZjM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.AssemblyReference.cache


+ 0 - 0
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.CopyComplete


+ 1 - 1
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2e035bf05926716499d0ae46b305da9cd9636664
+d308014ba0d23291d764f2e268893ec4fcb1f8c662a4ae123f8dcbeb218d72f5

+ 1 - 1
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.FileListAbsolute.txt

@@ -312,7 +312,7 @@ D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj
 D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.csproj.CoreCompileInputs.cache
 D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.exe.manifest
 D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.application
-D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.csproj.CopyComplete
 D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.exe
 D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.pdb
 D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA_MC_Test.topFormCapture.resources
+D:\笔记本20221223\zhouxiong9\Documents\Tools\ThreeSensor\MOTINOVA_MC_Test\obj\Debug\MOTINOVA.D6365B1F.Up2Date

BIN
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.csproj.GenerateResource.cache


BIN
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.exe


+ 2 - 2
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.exe.manifest

@@ -48,14 +48,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="265728">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_MC_Test.exe" size="266752">
       <assemblyIdentity name="MOTINOVA_MC_Test" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>LI1cPGMRX9sbMMQcpyEi+ltHO/k=</dsig:DigestValue>
+        <dsig:DigestValue>4T60cxSFukUfm+nJ/LQEty159Ys=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
MOTINOVA_MC_Test/obj/Debug/MOTINOVA_MC_Test.pdb