VSAG/amadeus_26_fb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verified something and made it possible to run on a OSX machine (videos input only)

Browse Source
This commit is contained in:
wanpiqiu123
2019-07-06 10:42:23 +08:00
parent aedee4b723
commit 370114db37
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -26,6 +26,8 @@ FIND_PACKAGE(Eigen3 REQUIRED)
FIND_PACKAGE(OpenCV 3 REQUIRED) FIND_PACKAGE(OpenCV 3 REQUIRED)
FIND_PACKAGE(Threads) FIND_PACKAGE(Threads)
LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/others)
INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/energy/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/energy/include)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/armor/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/armor/include)
@@ -42,6 +44,9 @@ IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows") ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
MESSAGE(STATUS "current platform: Windows") MESSAGE(STATUS "current platform: Windows")
TARGET_LINK_LIBRARIES(${BIN_NAME} "${PROJECT_SOURCE_DIR}/others/MVCAMSDK_X64.lib") TARGET_LINK_LIBRARIES(${BIN_NAME} "${PROJECT_SOURCE_DIR}/others/MVCAMSDK_X64.lib")
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
MESSAGE(STATUS "current platform: Mac")
TARGET_LINK_LIBRARIES(${BIN_NAME} "${PROJECT_SOURCE_DIR}/others/libmvsdk.dylib")
ELSE () ELSE ()
MESSAGE(STATUS "Unsupport platform: ${CMAKE_SYSTEM_NAME}") MESSAGE(STATUS "Unsupport platform: ${CMAKE_SYSTEM_NAME}")
ENDIF() ENDIF()

6
main.cpp
View File

@@ -26,7 +26,7 @@ using namespace std;
mcu_data mcuData = { mcu_data mcuData = {
0, 0,
0, 0,
ARMOR_STATE, BIG_ENERGY_STATE,
0, 0,
1, 1,
ENEMY_RED, ENEMY_RED,
@@ -56,8 +56,8 @@ int main(int argc, char *argv[]) {
video_gimble = new CameraWrapper(0, "armor"); video_gimble = new CameraWrapper(0, "armor");
video_chassis = new CameraWrapper(1, "energy"); video_chassis = new CameraWrapper(1, "energy");
} else { } else {
video_gimble = new VideoWrapper("/home/sun/项目/energy_video/energy_test.avi"); video_gimble = new VideoWrapper("/Users/leo/Desktop/videos/170.avi");
video_chassis = new VideoWrapper("/home/sun/项目/energy_video/energy_test.avi"); video_chassis = new VideoWrapper("/Users/leo/Desktop/videos/170.avi");
} }
if (video_gimble->init()) { if (video_gimble->init()) {
LOGM("video_armor source initialization successfully."); LOGM("video_armor source initialization successfully.");

2
others/include/camera/camera_wrapper.h
View File

@@ -16,7 +16,7 @@
#include "camera/wrapper_head.h" #include "camera/wrapper_head.h"
#ifdef Windows #ifdef Windows
#include "camera/CameraApi.h" #include "camera/CameraApi.h"
#elif defined(Linux) #elif defined(Linux) || defined(Darwin)
#include "camera/camera_api.h" #include "camera/camera_api.h"
#endif #endif

2
others/include/serial/serial.h
View File

@@ -29,7 +29,7 @@ private:
DWORD dwCommEvents; DWORD dwCommEvents;
}; };
#elif defined(Linux) #elif defined(Linux) || defined(Darwin)
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

2
others/src/serial/serial.cpp
View File

@@ -174,7 +174,7 @@ bool Serial::ReadData(unsigned char *buffer, unsigned int length) {
return bResult; return bResult;
} }
#elif defined(Linux) #elif defined(Linux) || defined(Darwin)
#include <string.h> #include <string.h>