Переглянути джерело

update bruker driver to the newest 2.4 version.

gsp_shanghai 2 роки тому
батько
коміт
592565fbfe

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" />
+  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Bruker" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

+ 1 - 1
Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0.5,1,2,5,30,100" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />

BIN
Bin/x64/Debug/Config/SysData/IncSysLib/IncASTDData.db


+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />

+ 1 - 0
OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -2545,6 +2545,7 @@ BOOL COTSBrukerImpl::GetXRayByPoints(CPosXraysList& a_listXrayPois, DWORD a_nACT
 			CPoint poi = a_listXrayPois[i]->GetPosition();
 			segmentArray[i].Y = poi.y;
 			segmentArray[i].XStart = poi.x;
+			segmentArray[i].XCount = 1;
 		}
 
 		// ask Bruker to collect a set of x ray data