Skip to content

Commit a06aca8

Browse files
committed
Use Hikvision cameras as the base type
1 parent 0450e5b commit a06aca8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+5
-202
lines changed
File renamed without changes.

infinite_sense_core/third_party/mvcam/include/MvCameraControl.h renamed to example/GigeCam/mvcam/include/MvCameraControl.h

File renamed without changes.
File renamed without changes.

infinite_sense_core/third_party/mvcam/include/MvISPErrorDefine.h renamed to example/GigeCam/mvcam/include/MvISPErrorDefine.h

File renamed without changes.

infinite_sense_core/third_party/mvcam/include/MvObsoleteInterfaces.h renamed to example/GigeCam/mvcam/include/MvObsoleteInterfaces.h

File renamed without changes.

infinite_sense_core/third_party/mvcam/include/ObsoleteCamParams.h renamed to example/GigeCam/mvcam/include/ObsoleteCamParams.h

File renamed without changes.
File renamed without changes.

infinite_sense_core/CMakeLists.txt

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,59 +29,24 @@ add_library(${PROJECT_NAME} SHARED
2929
src/messenger.cpp
3030
src/ptp.cpp
3131
)
32-
# 检测平台并设置相关变量
33-
if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
34-
set(PLATFORM_DIR "arm")
35-
set(MVCAM_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/mvcam/lib/aarch64)
36-
elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
37-
set(PLATFORM_DIR "x86")
38-
set(MVCAM_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/mvcam/lib/x86/64)
39-
else ()
40-
message(STATUS "Unknown Architecture")
41-
set(PLATFORM_DIR "Unknown")
42-
endif ()
43-
message(STATUS "Find MVCAM_LIB_DIR : ${MVCAM_LIB_DIR}")
44-
# 设置目标链接目录
4532
target_link_directories(${PROJECT_NAME} PUBLIC
46-
BEFORE ${MVCAM_LIB_DIR}
4733
${CMAKE_INSTALL_RPATH}
4834
${ZeroMQ_INCLUDE_DIRS}
4935
)
5036

51-
# 链接库
5237
target_link_libraries(${PROJECT_NAME} PUBLIC
5338
${ZeroMQ_LIBRARIES}
54-
MvCameraControl
5539
serial
5640
udp
5741
)
5842

59-
# 包含目录
6043
target_include_directories(${PROJECT_NAME} PUBLIC
6144
include
62-
third_party/mvcam/include
6345
)
64-
# 设置目标的 RPATH
6546
set_target_properties(${PROJECT_NAME} PROPERTIES
6647
INSTALL_RPATH "$ORIGIN"
6748
)
6849

69-
# 如果是构建的动态库,也可以设置构建时的 RPATH(即在开发过程中)
7050
set_target_properties(${PROJECT_NAME} PROPERTIES
7151
BUILD_RPATH "$ORIGIN"
72-
)
73-
74-
# 安装库文件和头文件到平台特定目录
75-
# 安装目标库
76-
install(TARGETS ${PROJECT_NAME} serial udp
77-
DESTINATION ${PROJECT_INSTALL_DIR}/${PLATFORM_DIR}/lib)
78-
79-
# 安装头文件目录
80-
install(DIRECTORY include/
81-
DESTINATION ${PROJECT_INSTALL_DIR}/${PLATFORM_DIR}/include)
82-
83-
# 安装 MVCAM 库文件
84-
if (MVCAM_LIB_DIR)
85-
install(DIRECTORY ${MVCAM_LIB_DIR}/
86-
DESTINATION ${PROJECT_INSTALL_DIR}/${PLATFORM_DIR}/lib)
87-
endif ()
52+
)

infinite_sense_core/include/infinite_sense.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class Synchronizer {
6161
/**
6262
* @brief 使用工业相机,并配置其对应的触发设备。
6363
*
64-
* @param params 可选参数:映射相机名称到 TriggerDevice 枚举。
64+
* @param cam
6565
*/
66-
void UseMvCam(const std::map<std::string, TriggerDevice>& params = std::map<std::string, TriggerDevice>());
66+
void UseCam(const std::shared_ptr<Cam> &cam);
6767

6868
/**
6969
* @brief 获取指定设备最近一次的触发时间(静态方法)。

infinite_sense_core/src/infinite_sense.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void Synchronizer::SetUsbLink(std::string serial_dev, const int serial_baud_rate
2727
serial_manager_ = std::make_shared<UsbManager>(serial_dev_, serial_baud_rate_);
2828
net_manager_ = nullptr;
2929
}
30-
void Synchronizer::UseMvCam(const std::map<string, TriggerDevice>& params) {
31-
cam_manager_ = std::make_shared<CamManger>(params);
30+
void Synchronizer::UseCam(const std::shared_ptr<Cam> &cam) {
31+
cam_manager_ = cam;
3232
}
3333
bool Synchronizer::GetLastTriggerTime(const TriggerDevice dev, uint64_t time) {
3434
return GET_LAST_TRIGGER_STATUS(dev,time);

0 commit comments

Comments
 (0)