diff --git a/DeviceAdapters/ASIStage/ASIStage.cpp b/DeviceAdapters/ASIStage/ASIStage.cpp index 2c11a4898..9ded17a0e 100644 --- a/DeviceAdapters/ASIStage/ASIStage.cpp +++ b/DeviceAdapters/ASIStage/ASIStage.cpp @@ -6,7 +6,6 @@ */ #include "ASIStage.h" -#include "ASICRIF.h" #include "ASICRISP.h" #include "ASILED.h" #include "ASIMagnifier.h" @@ -21,7 +20,6 @@ MODULE_API void InitializeModuleData() { RegisterDevice(g_ZStageDeviceName, MM::StageDevice, "Z Stage"); RegisterDevice(g_XYStageDeviceName, MM::XYStageDevice, "XY Stage"); - RegisterDevice(g_CRIFDeviceName, MM::AutoFocusDevice, "CRIF"); RegisterDevice(g_CRISPDeviceName, MM::AutoFocusDevice, "CRISP"); RegisterDevice(g_AZ100TurretName, MM::StateDevice, "AZ100 Turret"); RegisterDevice(g_StateDeviceName, MM::StateDevice, "State Device"); @@ -47,10 +45,6 @@ MODULE_API MM::Device* CreateDevice(const char* deviceName) { return new XYStage(); } - else if (name == g_CRIFDeviceName) - { - return new CRIF(); - } else if (name == g_CRISPDeviceName) { return new CRISP(); diff --git a/DeviceAdapters/ASIStage/ASIStage.h b/DeviceAdapters/ASIStage/ASIStage.h index 99e52a0ef..96f4db19e 100644 --- a/DeviceAdapters/ASIStage/ASIStage.h +++ b/DeviceAdapters/ASIStage/ASIStage.h @@ -40,7 +40,6 @@ const char* const g_Msg_ERR_INFO_COMMAND_NOT_SUPPORTED = "Cannot use the INFO co // external device names used used by the rest of the system to load a device from the .dll library const char* const g_XYStageDeviceName = "XYStage"; const char* const g_ZStageDeviceName = "ZStage"; -const char* const g_CRIFDeviceName = "CRIF"; const char* const g_CRISPDeviceName = "CRISP"; const char* const g_AZ100TurretName = "AZ100 Turret"; const char* const g_StateDeviceName = "State Device"; @@ -51,7 +50,6 @@ const char* const g_TIRFDeviceName = "TIRF"; // corresponding device descriptions const char* const g_XYStageDeviceDescription = "ASI XY stage driver adapter"; const char* const g_ZStageDeviceDescription = "ASI Z-stage driver adapter"; -const char* const g_CRIFDeviceDescription = "ASI CRIF Autofocus adapter"; const char* const g_CRISPDeviceDescription = "ASI CRISP Autofocus adapter"; const char* const g_AZ100TurretDescription = "ASI AZ100 Turret Controller"; const char* const g_StateDeviceDescription = "ASI State Device"; @@ -63,18 +61,6 @@ const char* const g_TIRFDeviceDescription = "ASI TIRF Actuator"; const char* const g_Open = "Open"; const char* const g_Closed = "Closed"; -// CRIF states -const char* const g_CRIFState = "CRIF State"; -const char* const g_CRIF_I = "Unlock (Laser Off)"; -const char* const g_CRIF_L = "Laser On"; -const char* const g_CRIF_Cal = "Calibrate"; -const char* const g_CRIF_G = "Calibration Succeeded"; -const char* const g_CRIF_B = "Calibration Failed"; -const char* const g_CRIF_k = "Locking"; -const char* const g_CRIF_K = "Lock"; -const char* const g_CRIF_E = "Error"; -const char* const g_CRIF_O = "Laser Off"; - // CRISP states const char* const g_CRISPState = "CRISP State"; const char* const g_CRISP_I = "Idle"; diff --git a/DeviceAdapters/ASIStage/ASIStage.vcxproj b/DeviceAdapters/ASIStage/ASIStage.vcxproj index 5e316356d..89e2e5205 100644 --- a/DeviceAdapters/ASIStage/ASIStage.vcxproj +++ b/DeviceAdapters/ASIStage/ASIStage.vcxproj @@ -97,7 +97,6 @@ </ItemGroup> <ItemGroup> <ClInclude Include="ASIBase.h" /> - <ClInclude Include="ASICRIF.h" /> <ClInclude Include="ASICRISP.h" /> <ClInclude Include="ASILED.h" /> <ClInclude Include="ASIMagnifier.h" /> @@ -110,7 +109,6 @@ </ItemGroup> <ItemGroup> <ClCompile Include="ASIBase.cpp" /> - <ClCompile Include="ASICRIF.cpp" /> <ClCompile Include="ASICRISP.cpp" /> <ClCompile Include="ASILED.cpp" /> <ClCompile Include="ASIMagnifier.cpp" /> @@ -124,4 +122,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file diff --git a/DeviceAdapters/ASIStage/ASIStage.vcxproj.filters b/DeviceAdapters/ASIStage/ASIStage.vcxproj.filters index 78d5b1758..5c03fef2d 100644 --- a/DeviceAdapters/ASIStage/ASIStage.vcxproj.filters +++ b/DeviceAdapters/ASIStage/ASIStage.vcxproj.filters @@ -15,9 +15,6 @@ </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="ASICRIF.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="ASICRISP.h"> <Filter>Header Files</Filter> </ClInclude> @@ -53,9 +50,6 @@ <ClCompile Include="ASIBase.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ASICRIF.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="ASICRISP.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -84,4 +78,4 @@ <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project> +</Project> \ No newline at end of file diff --git a/DeviceAdapters/ASIStage/Makefile.am b/DeviceAdapters/ASIStage/Makefile.am index 5b47d86d9..ef2516b97 100644 --- a/DeviceAdapters/ASIStage/Makefile.am +++ b/DeviceAdapters/ASIStage/Makefile.am @@ -3,8 +3,6 @@ deviceadapter_LTLIBRARIES = libmmgr_dal_ASIStage.la libmmgr_dal_ASIStage_la_SOURCES = \ ASIBase.cpp \ ASIBase.h \ - ASICRIF.cpp \ - ASICRIF.h \ ASICRISP.cpp \ ASICRISP.h \ ASILED.cpp \