1

.gitattributes

+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -7,6 +7,7 @@
 *.userosscache
 *.userosscache
 *.sln.docstates
 *.sln.docstates
 
 
+
 # User-specific files (MonoDevelop/Xamarin Studio)
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 *.userprefs
 
 
@@ -258,5 +259,4 @@ paket-files/
 
 
 # Python Tools for Visual Studio (PTVS)
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 __pycache__/
-*.pyc
-*.DS_Store
+*.pyc
\ No newline at end of file

UI/bin/Debug/AGVControl_Steel.exe.config

@@ -24,17 +24,18 @@
 
 
 	<!--3楼-->
 	<!--3楼-->
 	<appSettings>
 	<appSettings>
-		<add key="FLEET_IP" value="10.85.199.140"/>
-		<add key="FLEET_Send" value="true"/>
-		<add key="WebService" value="http://127.0.0.1:8090/"/>
-		<!--<add key="WebService" value="http://10.85.196.40:8090/"/>-->
-		<add key="Board" value="http://10.85.162.124/myproject/rest/api/qisda/device/updateDeviceAlarmMsg"/>
-		<add key="BoardTimeout" value="3"/>
-		<add key="AGV_BATTERY_MAX" value="100"/>
-		<add key="AGV_BATTERY_MIN" value="40"/>
-		<add key="WorkTimeout" value="10"/>
-		<add key="WorkTimeoutDel" value="false"/>
-		<add key="WorkAutoDel" value="false"/>
-		<add key="11号_4C" value="false"/>
-	</appSettings>
+  <add key="FLEET_IP" value="10.85.199.140" />
+  <add key="FLEET_Send" value="true" />
+  <add key="WebService" value="http://127.0.0.1:8090/" />
+  <add key="Board" value="http://10.85.162.124/myproject/rest/api/qisda/device/updateDeviceAlarmMsg" />
+  <add key="BoardTimeout" value="3" />
+  <add key="AGV_BATTERY_MAX" value="100" />
+  <add key="AGV_BATTERY_MIN" value="40" />
+  <add key="WorkTimeout" value="10" />
+  <add key="WorkTimeoutDel" value="false" />
+  <add key="WorkAutoDel" value="false" />
+  <add key="11号_4C" value="false" />
+  <add key="21号_3S" value="false" />
+  <add key="21号_3S_Scope" value="0" />
+ </appSettings>
 </configuration>
 </configuration>