From 9277b1aedd88ddadfbc28de60f8aea2bcdd30b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=AB=8B=E6=96=B0?= <renlixin@iris-rs.cn>
Date: Mon, 14 Feb 2022 09:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9moving?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/index.html                               | 12 +++++----
 .../source/LinearShutter/VSMD12XMiscDefines.h | 26 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/html/index.html b/html/index.html
index f0db299..4015d47 100644
--- a/html/index.html
+++ b/html/index.html
@@ -59,26 +59,28 @@
                     <tr>
                         <td>GPS经度 <input type="text" class="TextInput" name="GPS_Longtitude" id="GPS_Longtitude"></td>
                         <td>GPS经度 <input type="text" class="TextInput" name="GPS_Latitude" id="GPS_Latitude"> </td>
-                        <td>GPS高程 <input type="text" class="TextInput" name="GPS_Atitude" id="GPS_Atitude"> </td>
+                        <td>GPS高程 <input type="text" class="TextInput" name="GPS_Altitude" id="GPS_Altitude"> </td>
 
                     </tr>
                 </table>
                     <p></p>
                 <table style="width:100%">
                     <tr>
-                        <td>安装时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="date"   name="InstallTime" id="InstallTime"></td>
+                        <td>安装时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="date"   name="InstallationTime" id="InstallationTime"></td>
                         <td>ISIF定标时间&nbsp;&nbsp;<input type="date"  name="ISIFCalibrationTime" id="ISIFCalibrationTime"> </td>
                         <td>IS1定标时间  <input type="date"  name="IS1CalibrationTime" id="IS1CalibrationTime"> </td>
                     </tr>
                     <tr>
-                        <td>设备维护人员 <input type="text" class="TextInput" name="NameOfMaintenance" id="NameOfMaintenance"></td>
-                        <td>维护人员电话 <input type="number" name="PhoneOfMaintenance" id="PhoneOfMaintenance" style="width: 100px" ></td>
+                        <td>设备维护人员 <input type="text" class="TextInput" name="NameOfMaintenanceStaff" id="NameOfMaintenanceStaff"></td>
+                        <td>维护人员电话 <input type="number" name="PhoneNumberOfMaintenanceStaff" id="PhoneNumberOfMaintenanceStaff" style="width: 100px" ></td>
                         
                     </tr>
                     <tr>
                         <td>远程资源用户ID <input type="text" name="DownloadUserID" class="TextInput" id="DownloadUserID"></td>
-                        <td>定标文件下载路径<input type="text" name="DownlaodAddress" id="DownlaodAddress"></td>
+                        <td>定标文件下载路径<input type="url" name="DownlaodAddress" id="DownlaodAddress"></td>
+                        <td>远程服务器<input type="url" name="HTTPServer" id="HTTPServer"></td>
                     </tr>
+
                 </table>
             </div>
             <div id="devinfo">
diff --git a/othersoft/shuttercali/source/LinearShutter/VSMD12XMiscDefines.h b/othersoft/shuttercali/source/LinearShutter/VSMD12XMiscDefines.h
index 92e2ac2..c2400a5 100644
--- a/othersoft/shuttercali/source/LinearShutter/VSMD12XMiscDefines.h
+++ b/othersoft/shuttercali/source/LinearShutter/VSMD12XMiscDefines.h
@@ -65,8 +65,8 @@ typedef struct tagControllerParams
 		bdr = 9600;
 
 		cra = 0.8;
-		crh = 0.4;
-		crn = 0.6;
+		crh = 0.8;
+		crn = 0.8;
 
 		acc = 100000;
 		dec = 100000;
@@ -75,7 +75,7 @@ typedef struct tagControllerParams
 		osv = 0;
 		snr = 0;
 		zmd = 3;
-		zsp = 20;
+		zsp = 200;
 		zsd = 50000;
 
 		mcs = 6;
@@ -94,15 +94,15 @@ typedef union
 
 enum emVSMDTriggerEvent
 {
-	NoAction =0,        //�޶�����ֻ��״̬λ S1 �仯֪ͨ��
-	ResetZeroPosition,  //��������ԭ��λ��
-	DecSpdStop,         //����ֹͣ
-	DecSpdStopRZP,      //����ֹͣ������ֹͣ����������ԭ��λ��
-	Stop,               //����ֹͣ
-	StopRZP,            //����ֹͣ������ֹͣ����������ԭ��λ��
-	RunningPosDirect,   //����������ת�����ٶȣ�
-	RunningNegDirect,   //����������ת�����ٶȣ�
-	OfflineModeOn,      //����ģʽ����
-	OfflineModeOff      //����ģʽֹͣ
+	NoAction =0,        //�޶�����ֻ��״̬λ S1 �仯֪ͨ��
+	ResetZeroPosition,  //��������ԭ��λ��
+	DecSpdStop,         //����ֹͣ
+	DecSpdStopRZP,      //����ֹͣ������ֹͣ����������ԭ��λ��
+	Stop,               //����ֹͣ
+	StopRZP,            //����ֹͣ������ֹͣ����������ԭ��λ��
+	RunningPosDirect,   //����������ת�����ٶȣ�
+	RunningNegDirect,   //����������ת�����ٶȣ�
+	OfflineModeOn,      //����ģʽ����
+	OfflineModeOff      //����ģʽֹͣ
 };