Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The stage won't be on movement when a move call is finished. #296

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

The stage won't be on movement when a move call is finished. #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions DeviceAdapters/Standa8SMC4/Standa8SMC4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@ int Standa8SMC4Z::SetPositionUm(double pos)
return DEVICE_UNKNOWN_POSITION;
}

command_wait_for_stop(device_, 1);

// Set future position
OnStagePositionChanged(pos);

Expand Down Expand Up @@ -404,6 +406,8 @@ int Standa8SMC4Z::SetPositionSteps(long steps)
return DEVICE_UNKNOWN_POSITION;
}

command_wait_for_stop(device_, 1);

// Set future position
OnStagePositionChanged(steps * unitMultiplier_);

Expand Down Expand Up @@ -1015,6 +1019,9 @@ int Standa8SMC4XY::SetPositionUm(double x, double y)
return DEVICE_UNKNOWN_POSITION;
}

command_wait_for_stop(deviceX_, 1);
command_wait_for_stop(deviceY_, 1);

// Set future position
OnXYStagePositionChanged(x, y);

Expand Down Expand Up @@ -1080,6 +1087,9 @@ int Standa8SMC4XY::SetRelativePositionUm(double dx, double dy)
return DEVICE_UNKNOWN_POSITION;
}

command_wait_for_stop(deviceX_, 1);
command_wait_for_stop(deviceY_, 1);

// Set future position
UpdatePositions(dx, dy);

Expand Down
6 changes: 3 additions & 3 deletions DeviceAdapters/Standa8SMC4/Standa8SMC4.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
Expand Down Expand Up @@ -68,15 +68,15 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(MM_3RDPARTYPRIVATE)\XIMC\ximc-2.10.5\ximc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MM_3RDPARTYPRIVATE)\XIMC\ximc-2.8.4\ximc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(MM_3RDPARTYPRIVATE)\XIMC\ximc-2.7.6\ximc\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(MM_3RDPARTYPRIVATE)\XIMC\ximc-2.8.4\ximc\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libximc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
Expand Down