Merge remote-tracking branch 'origin/zhangzhuo'

# Conflicts:
#	config/DeviceSettings.ini

config/DeviceSettings.ini

@@ -1,9 +1,9 @@
 [DEVICE INFO]
-TotalSpectrometer=2
+TotalSpectrometer=1
 [FS1]
-Model=OSIFAlpha
-Port=-1
-UID=FLMS15815
+Model=ISIF
+Port=COM7
+UID=21351029
 AEMax=0.85
 AEMin=0.75
 Depth=65535
@@ -12,8 +12,8 @@ Model=OSIFBeta
 Port=-1
 UID=QEP02975
 AEMax=0.85
-AEMin=0.80
-Depth=200000
+AEMin=0.75
+Depth=230000
 [FS3]
 Model=Null
 [FS4]
@@ -24,10 +24,10 @@ AEMax=0.85
 AEMin=0.75
 Depth=65535
 [LINEAR SHUTTER]
-Port=/dev/ttyUSB1
+Port=COM8
 Type=1
 DCID=1
-TotalPosition=6
+TotalPosition=5
 Position0=2000
 Position1=110000
 Position2=220000
@@ -35,4 +35,4 @@ Position3=330000
 Position4=440000
 Position5=550000
 [HUMITURE]
-Port=/dev/ttyUSB3
+Port=COM11