From 3f72c0aaa0a42048034646c8eed937a0fb463d23 Mon Sep 17 00:00:00 2001
From: Hongtao Yang <Hongtao.Yang@cern.ch>
Date: Wed, 5 May 2021 14:33:11 -0700
Subject: [PATCH] Merging all the motion controller drivers & handlers under
libMotion
---
src/CMakeLists.txt | 3 +--
src/libGalil/CMakeLists.txt | 22 -------------------
src/libMotion/CMakeLists.txt | 12 ++++++++++
.../ControllerBase.cpp | 0
.../ControllerBase.h | 0
.../ControllerGalil.cpp | 0
.../ControllerGalil.h | 0
.../ControllerZaber.cpp | 0
.../ControllerZaber.h | 0
src/{libWaferProb => libMotion}/Helper.cpp | 0
src/{libWaferProb => libMotion}/Helper.h | 0
src/{libGalil => libMotion}/arrays.cpp | 0
src/{libGalil => libMotion}/gclib.h | 0
src/{libGalil => libMotion}/gclib_errors.h | 0
src/{libGalil => libMotion}/gclib_record.h | 0
src/{libGalil => libMotion}/gclibo.cpp | 0
src/{libGalil => libMotion}/gclibo.h | 0
src/{libZaber => libMotion}/z_common.h | 0
src/{libZaber => libMotion}/za_serial.cpp | 0
src/{libZaber => libMotion}/za_serial.h | 0
src/libWaferProb/CMakeLists.txt | 4 ----
src/libZaber/CMakeLists.txt | 6 -----
22 files changed, 13 insertions(+), 34 deletions(-)
delete mode 100644 src/libGalil/CMakeLists.txt
create mode 100644 src/libMotion/CMakeLists.txt
rename src/{libWaferProb => libMotion}/ControllerBase.cpp (100%)
rename src/{libWaferProb => libMotion}/ControllerBase.h (100%)
rename src/{libWaferProb => libMotion}/ControllerGalil.cpp (100%)
rename src/{libWaferProb => libMotion}/ControllerGalil.h (100%)
rename src/{libWaferProb => libMotion}/ControllerZaber.cpp (100%)
rename src/{libWaferProb => libMotion}/ControllerZaber.h (100%)
rename src/{libWaferProb => libMotion}/Helper.cpp (100%)
rename src/{libWaferProb => libMotion}/Helper.h (100%)
rename src/{libGalil => libMotion}/arrays.cpp (100%)
rename src/{libGalil => libMotion}/gclib.h (100%)
rename src/{libGalil => libMotion}/gclib_errors.h (100%)
rename src/{libGalil => libMotion}/gclib_record.h (100%)
rename src/{libGalil => libMotion}/gclibo.cpp (100%)
rename src/{libGalil => libMotion}/gclibo.h (100%)
rename src/{libZaber => libMotion}/z_common.h (100%)
rename src/{libZaber => libMotion}/za_serial.cpp (100%)
rename src/{libZaber => libMotion}/za_serial.h (100%)
delete mode 100644 src/libZaber/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d63b5a3..05c30ae9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,9 +89,8 @@ add_subdirectory(libMeter)
add_subdirectory(libLoad)
add_subdirectory(libCom)
add_subdirectory(libDevCom)
-add_subdirectory(libGalil)
add_subdirectory(libImageRec)
-add_subdirectory(libZaber)
+add_subdirectory(libMotion)
add_subdirectory(libWaferProb)
add_subdirectory(libScope)
add_subdirectory(libWaveFormGen)
diff --git a/src/libGalil/CMakeLists.txt b/src/libGalil/CMakeLists.txt
deleted file mode 100644
index 7289c32a..00000000
--- a/src/libGalil/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-find_package( libgclib QUIET)
-find_package( ZLIB )
-
-if ( NOT "${LIBGCLIB_FOUND}" )
- message(STATUS "Disabling libGalil due to missing dependencies (LIBGCLIB_FOUND = ${LIBGCLIB_FOUND})")
-
- set(libGalil_FOUND FALSE PARENT_SCOPE)
- return()
-endif()
-
-#
-# Prepare the library
-add_library(Galil SHARED)
-target_sources(Galil
- PRIVATE
- arrays.cpp
- gclibo.cpp
- )
-target_link_libraries(Galil ${LIBGCLIB_LIBRARIES} ${zlib_libraries} )
-
-# Tell rest of labRemote that the library exists
-set(libGalil_FOUND TRUE PARENT_SCOPE)
diff --git a/src/libMotion/CMakeLists.txt b/src/libMotion/CMakeLists.txt
new file mode 100644
index 00000000..2af6e250
--- /dev/null
+++ b/src/libMotion/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(Motion SHARED)
+target_sources(Motion
+ PRIVATE
+ za_serial.cpp
+ arrays.cpp
+ gclibo.cpp
+ ControllerBase.cpp
+ ControllerGalil.cpp
+ ControllerZaber.cpp
+ Helper.cpp
+)
+target_include_directories(Motion PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/libWaferProb/ControllerBase.cpp b/src/libMotion/ControllerBase.cpp
similarity index 100%
rename from src/libWaferProb/ControllerBase.cpp
rename to src/libMotion/ControllerBase.cpp
diff --git a/src/libWaferProb/ControllerBase.h b/src/libMotion/ControllerBase.h
similarity index 100%
rename from src/libWaferProb/ControllerBase.h
rename to src/libMotion/ControllerBase.h
diff --git a/src/libWaferProb/ControllerGalil.cpp b/src/libMotion/ControllerGalil.cpp
similarity index 100%
rename from src/libWaferProb/ControllerGalil.cpp
rename to src/libMotion/ControllerGalil.cpp
diff --git a/src/libWaferProb/ControllerGalil.h b/src/libMotion/ControllerGalil.h
similarity index 100%
rename from src/libWaferProb/ControllerGalil.h
rename to src/libMotion/ControllerGalil.h
diff --git a/src/libWaferProb/ControllerZaber.cpp b/src/libMotion/ControllerZaber.cpp
similarity index 100%
rename from src/libWaferProb/ControllerZaber.cpp
rename to src/libMotion/ControllerZaber.cpp
diff --git a/src/libWaferProb/ControllerZaber.h b/src/libMotion/ControllerZaber.h
similarity index 100%
rename from src/libWaferProb/ControllerZaber.h
rename to src/libMotion/ControllerZaber.h
diff --git a/src/libWaferProb/Helper.cpp b/src/libMotion/Helper.cpp
similarity index 100%
rename from src/libWaferProb/Helper.cpp
rename to src/libMotion/Helper.cpp
diff --git a/src/libWaferProb/Helper.h b/src/libMotion/Helper.h
similarity index 100%
rename from src/libWaferProb/Helper.h
rename to src/libMotion/Helper.h
diff --git a/src/libGalil/arrays.cpp b/src/libMotion/arrays.cpp
similarity index 100%
rename from src/libGalil/arrays.cpp
rename to src/libMotion/arrays.cpp
diff --git a/src/libGalil/gclib.h b/src/libMotion/gclib.h
similarity index 100%
rename from src/libGalil/gclib.h
rename to src/libMotion/gclib.h
diff --git a/src/libGalil/gclib_errors.h b/src/libMotion/gclib_errors.h
similarity index 100%
rename from src/libGalil/gclib_errors.h
rename to src/libMotion/gclib_errors.h
diff --git a/src/libGalil/gclib_record.h b/src/libMotion/gclib_record.h
similarity index 100%
rename from src/libGalil/gclib_record.h
rename to src/libMotion/gclib_record.h
diff --git a/src/libGalil/gclibo.cpp b/src/libMotion/gclibo.cpp
similarity index 100%
rename from src/libGalil/gclibo.cpp
rename to src/libMotion/gclibo.cpp
diff --git a/src/libGalil/gclibo.h b/src/libMotion/gclibo.h
similarity index 100%
rename from src/libGalil/gclibo.h
rename to src/libMotion/gclibo.h
diff --git a/src/libZaber/z_common.h b/src/libMotion/z_common.h
similarity index 100%
rename from src/libZaber/z_common.h
rename to src/libMotion/z_common.h
diff --git a/src/libZaber/za_serial.cpp b/src/libMotion/za_serial.cpp
similarity index 100%
rename from src/libZaber/za_serial.cpp
rename to src/libMotion/za_serial.cpp
diff --git a/src/libZaber/za_serial.h b/src/libMotion/za_serial.h
similarity index 100%
rename from src/libZaber/za_serial.h
rename to src/libMotion/za_serial.h
diff --git a/src/libWaferProb/CMakeLists.txt b/src/libWaferProb/CMakeLists.txt
index 1181d617..07c74e39 100644
--- a/src/libWaferProb/CMakeLists.txt
+++ b/src/libWaferProb/CMakeLists.txt
@@ -10,11 +10,7 @@ endif()
add_library(WaferProb SHARED)
target_sources(WaferProb
PRIVATE
- ControllerBase.cpp
- ControllerGalil.cpp
- ControllerZaber.cpp
Handler.cpp
- Helper.cpp
MotionController.cpp
)
diff --git a/src/libZaber/CMakeLists.txt b/src/libZaber/CMakeLists.txt
deleted file mode 100644
index 794fd41d..00000000
--- a/src/libZaber/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_library(Zaber SHARED)
-target_sources(Zaber
- PRIVATE
- za_serial.cpp
-)
-target_include_directories(Zaber PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
--
GitLab