From 6f4d6ed99844e62fb2537e9f6a8ca3d2ed60da84 Mon Sep 17 00:00:00 2001 From: Thomas Clark Date: Wed, 29 Oct 2014 13:38:43 -0400 Subject: [PATCH] Add support for vision in C++ Add IMAQdx and its dependencies Change-Id: I6befa563e96db224db83fb90985c86eb3e8d4f3e Add a "CameraServer" class for C++ This class allows the driver station's camera viewer to interact with a C++ program. It includes both an automatic mode to send images from a webcam to the dashboard in a background thread, and an option to manually feed it IMAQ images. Change-Id: I54fdb164c00dce165859c22f435be647dc9927cc --- CMakeLists.txt | 1 - .../resources/templates/.cproject | 1 + ni-libraries/libGCBase_gcc-4.4-arm_v2_3.so | Bin 0 -> 110437 bytes ni-libraries/libGenApi_gcc-4.4-arm_v2_3.so | Bin 0 -> 3437504 bytes ni-libraries/libLog_gcc-4.4-arm_v2_3.so | Bin 0 -> 26237 bytes .../libMathParser_gcc-4.4-arm_v2_3.so | Bin 0 -> 49301 bytes ni-libraries/liblog4cpp_gcc-4.4-arm_v2_3.so | Bin 0 -> 324751 bytes ni-libraries/libniimaqdx.so | Bin 0 -> 2215400 bytes ni-libraries/libnivision.so | Bin 0 -> 9654528 bytes ni-libraries/libnivissvc.so | Bin 0 -> 2806736 bytes ni-libraries/libwpi_2015.so | 2 +- .../wpilibC++Devices/include/CameraServer.h | 59 ++ wpilibc/wpilibC++Devices/include/NIIMAQdx.h | 646 ++++++++++++++++++ wpilibc/wpilibC++Devices/include/WPILib.h | 1 + wpilibc/wpilibC++Devices/src/CameraServer.cpp | 250 +++++++ .../wpilibC++IntegrationTests/CMakeLists.txt | 2 + 16 files changed, 960 insertions(+), 2 deletions(-) create mode 100755 ni-libraries/libGCBase_gcc-4.4-arm_v2_3.so create mode 100755 ni-libraries/libGenApi_gcc-4.4-arm_v2_3.so create mode 100755 ni-libraries/libLog_gcc-4.4-arm_v2_3.so create mode 100755 ni-libraries/libMathParser_gcc-4.4-arm_v2_3.so create mode 100755 ni-libraries/liblog4cpp_gcc-4.4-arm_v2_3.so create mode 100755 ni-libraries/libniimaqdx.so create mode 100755 ni-libraries/libnivision.so create mode 100755 ni-libraries/libnivissvc.so create mode 100644 wpilibc/wpilibC++Devices/include/CameraServer.h create mode 100644 wpilibc/wpilibC++Devices/include/NIIMAQdx.h create mode 100644 wpilibc/wpilibC++Devices/src/CameraServer.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 193c3ff524..926eff84b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(All-WPILib) set(CMAKE_BUILD_TYPE Debug) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -fPIC") -SET(CMAKE_SKIP_BUILD_RPATH TRUE) file(GLOB_RECURSE NI_LIBS ni-libraries/*.so*) list(REMOVE_ITEM NI_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/ni-libraries/libwpi.so ${CMAKE_CURRENT_SOURCE_DIR}/ni-libraries/libwpi_2015.so) diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject index 4832288334..e50ccd50f1 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject @@ -41,6 +41,7 @@ +