tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the conflict again

Browse Source
This commit is contained in:
kalman 2018-11-24 16:56:52 +08:00
parent 1811f20a14
commit b346f7fec9
27 changed files with 0 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CMakeLists.txt
View File

@ -117,39 +117,11 @@ endif()
## libmynteye ## libmynteye
<<<<<<< HEAD
if(NOT WITH_GLOG)
=======
if(NOT WITH_GLOG AND NOT OS_WIN) if(NOT WITH_GLOG AND NOT OS_WIN)
>>>>>>> origin/develop
set(__MINIGLOG_FLAGS "-Wno-unused-parameter -Wno-format -Wno-return-type") set(__MINIGLOG_FLAGS "-Wno-unused-parameter -Wno-format -Wno-return-type")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${__MINIGLOG_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${__MINIGLOG_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__MINIGLOG_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__MINIGLOG_FLAGS}")
unset(__MINIGLOG_FLAGS) unset(__MINIGLOG_FLAGS)
<<<<<<< HEAD
endif()
set(MYNTEYE_PUBLIC_H
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/callbacks.h
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/global.h
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/logger.h
${CMAKE_CURRENT_BINARY_DIR}/include/mynteye/mynteye.h
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/utils.h
${CMAKE_CURRENT_SOURCE_DIR}/src/device/context.h
${CMAKE_CURRENT_SOURCE_DIR}/src/device/device.h
${CMAKE_CURRENT_SOURCE_DIR}/src/internal/files.h
${CMAKE_CURRENT_SOURCE_DIR}/src/internal/strings.h
${CMAKE_CURRENT_SOURCE_DIR}/src/internal/times.h
)
if(WITH_API)
list(APPEND MYNTEYE_PUBLIC_H
${CMAKE_CURRENT_SOURCE_DIR}/src/api/api.h
${CMAKE_CURRENT_SOURCE_DIR}/src/api/plugin.h
${CMAKE_CURRENT_SOURCE_DIR}/src/api/processor/object.h
)
=======
>>>>>>> origin/develop
endif() endif()
if(NOT WITH_GLOG) if(NOT WITH_GLOG)
list(APPEND MYNTEYE_PUBLIC_H list(APPEND MYNTEYE_PUBLIC_H
@ -201,11 +173,7 @@ if(WITH_API)
) )
endif() endif()
if(NOT WITH_GLOG) if(NOT WITH_GLOG)
<<<<<<< HEAD
list(APPEND MYNTEYE_SRCS src/public/miniglog.cc)
=======
list(APPEND MYNTEYE_SRCS src/mynteye/miniglog.cc) list(APPEND MYNTEYE_SRCS src/mynteye/miniglog.cc)
>>>>>>> origin/develop
endif() endif()
set(MYNTEYE_LINKLIBS ${UVC_LIB}) set(MYNTEYE_LINKLIBS ${UVC_LIB})
@ -222,11 +190,7 @@ endif()
add_library(${MYNTEYE_NAME} SHARED ${MYNTEYE_SRCS}) add_library(${MYNTEYE_NAME} SHARED ${MYNTEYE_SRCS})
target_link_libraries(${MYNTEYE_NAME} ${MYNTEYE_LINKLIBS}) target_link_libraries(${MYNTEYE_NAME} ${MYNTEYE_LINKLIBS})
<<<<<<< HEAD
option(WITH_GLOG "Include glog support" OFF)
=======
target_link_threads(${MYNTEYE_NAME}) target_link_threads(${MYNTEYE_NAME})
>>>>>>> origin/develop
if(OS_WIN) if(OS_WIN)
target_compile_definitions(${MYNTEYE_NAME} target_compile_definitions(${MYNTEYE_NAME}

3
Makefile
View File

@ -73,10 +73,7 @@ cleandoc:
submodules: submodules:
@git submodule update --init @git submodule update --init
<<<<<<< HEAD
=======
>>>>>>> origin/develop
.PHONY: submodules .PHONY: submodules
# init # init

12
include/mynteye/types.h
View File

@ -198,7 +198,6 @@ enum class Option : std::uint8_t {
/** Erase chip */ /** Erase chip */
ERASE_CHIP, ERASE_CHIP,
/** /**
<<<<<<< HEAD
* min exposure time, valid if auto-exposure * min exposure time, valid if auto-exposure
* *
* range: [0,1000], default: 0 * range: [0,1000], default: 0
@ -208,17 +207,11 @@ enum class Option : std::uint8_t {
* The range of accelerometer * The range of accelerometer
* *
* values: {6,12,24,48}, default: 6 * values: {6,12,24,48}, default: 6
=======
* The range of accelerometer
*
* values: {4,8,16,32}, default: 8
>>>>>>> origin/develop
*/ */
ACCELEROMETER_RANGE, ACCELEROMETER_RANGE,
/** /**
* The range of gyroscope * The range of gyroscope
* *
<<<<<<< HEAD
* values: {250,500,1000,2000,4000}, default: 1000 * values: {250,500,1000,2000,4000}, default: 1000
*/ */
GYROSCOPE_RANGE, GYROSCOPE_RANGE,
@ -234,11 +227,6 @@ enum class Option : std::uint8_t {
* values: {23,64}, default: 64 * values: {23,64}, default: 64
*/ */
GYROSCOPE_LOW_PASS_FILTER, GYROSCOPE_LOW_PASS_FILTER,
=======
* values: {500,1000,2000,4000}, default: 1000
*/
GYROSCOPE_RANGE,
>>>>>>> origin/develop
/** Last guard */ /** Last guard */
LAST LAST
}; };

8
samples/device/camera.cc
View File

@ -15,17 +15,9 @@
#include <opencv2/imgproc/imgproc.hpp> #include <opencv2/imgproc/imgproc.hpp>
#include "mynteye/logger.h" #include "mynteye/logger.h"
<<<<<<< HEAD
#include "mynteye/device.h"
#include "mynteye/utils.h"
#include "mynteye/times.h"
=======
#include "mynteye/device/device.h" #include "mynteye/device/device.h"
#include "mynteye/device/utils.h" #include "mynteye/device/utils.h"
#include "mynteye/util/times.h" #include "mynteye/util/times.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/control/auto_exposure.cc
View File

@ -13,13 +13,8 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
#include "util/cv_painter.h" #include "util/cv_painter.h"

10
samples/tutorials/control/framerate.cc
View File

@ -11,15 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
<<<<<<< HEAD
#include <opencv2/highgui/highgui.hpp>
#include <atomic>
#include "mynteye/api.h"
#include "mynteye/logger.h"
#include "mynteye/times.h"
=======
#include <atomic> #include <atomic>
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
@ -27,7 +18,6 @@
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
#include "mynteye/util/times.h" #include "mynteye/util/times.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/control/infrared.cc
View File

@ -13,13 +13,8 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/control/manual_exposure.cc
View File

@ -13,13 +13,8 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
#include "util/cv_painter.h" #include "util/cv_painter.h"

5
samples/tutorials/data/get_depth.cc
View File

@ -13,12 +13,7 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/data/get_device_info.cc
View File

@ -11,13 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

6
samples/tutorials/data/get_disparity.cc
View File

@ -13,13 +13,7 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

10
samples/tutorials/data/get_from_callbacks.cc
View File

@ -11,25 +11,15 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
<<<<<<< HEAD
#include <opencv2/highgui/highgui.hpp>
=======
>>>>>>> origin/develop
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <sstream> #include <sstream>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
#include "util/cv_painter.h" #include "util/cv_painter.h"

5
samples/tutorials/data/get_img_params.cc
View File

@ -11,13 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/data/get_imu.cc
View File

@ -13,13 +13,8 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
#include "util/cv_painter.h" #include "util/cv_painter.h"

5
samples/tutorials/data/get_imu_params.cc
View File

@ -11,13 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/data/get_points.cc
View File

@ -13,12 +13,7 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
#include "util/pc_viewer.h" #include "util/pc_viewer.h"

5
samples/tutorials/data/get_stereo.cc
View File

@ -13,12 +13,7 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/data/get_stereo_rectified.cc
View File

@ -13,12 +13,7 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/data/get_with_plugin.cc
View File

@ -13,12 +13,7 @@
// limitations under the License. // limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
#include "mynteye/logger.h"
=======
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

6
samples/tutorials/intermediate/get_all_device_info.cc
View File

@ -11,15 +11,9 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
<<<<<<< HEAD
#include "mynteye/context.h"
#include "mynteye/device.h"
#include "mynteye/logger.h"
=======
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/device/context.h" #include "mynteye/device/context.h"
#include "mynteye/device/device.h" #include "mynteye/device/device.h"
>>>>>>> origin/develop
MYNTEYE_USE_NAMESPACE MYNTEYE_USE_NAMESPACE

5
samples/tutorials/intermediate/get_depth_and_points.cc
View File

@ -14,13 +14,8 @@
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp> #include <opencv2/imgproc/imgproc.hpp>
<<<<<<< HEAD
#include "mynteye/api.h"
=======
// #include "mynteye/logger.h" // #include "mynteye/logger.h"
#include "mynteye/api/api.h" #include "mynteye/api/api.h"
>>>>>>> origin/develop
#include "util/cv_painter.h" #include "util/cv_painter.h"
#include "util/pc_viewer.h" #include "util/pc_viewer.h"

10
samples/tutorials/util/cv_painter.cc
View File

@ -13,25 +13,15 @@
// limitations under the License. // limitations under the License.
#include "util/cv_painter.h" #include "util/cv_painter.h"
<<<<<<< HEAD
#include <opencv2/imgproc/imgproc.hpp>
=======
>>>>>>> origin/develop
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <utility> #include <utility>
<<<<<<< HEAD
#include "mynteye/logger.h"
#include "mynteye/utils.h"
=======
#include <opencv2/imgproc/imgproc.hpp> #include <opencv2/imgproc/imgproc.hpp>
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/device/utils.h" #include "mynteye/device/utils.h"
>>>>>>> origin/develop
#define FONT_FACE cv::FONT_HERSHEY_PLAIN #define FONT_FACE cv::FONT_HERSHEY_PLAIN
#define FONT_SCALE 1 #define FONT_SCALE 1

3
samples/uvc/camera.cc
View File

@ -17,12 +17,9 @@
#include <iostream> #include <iostream>
#include <mutex> #include <mutex>
<<<<<<< HEAD
=======
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp> #include <opencv2/imgproc/imgproc.hpp>
>>>>>>> origin/develop
#include "mynteye/logger.h" #include "mynteye/logger.h"
#include "mynteye/mynteye.h" #include "mynteye/mynteye.h"
#include "mynteye/types.h" #include "mynteye/types.h"

30
src/mynteye/api/api.cc
View File

@ -88,15 +88,8 @@ bool dir_exists(const std::string &p) {
#endif #endif
std::vector<std::string> get_plugin_paths() { std::vector<std::string> get_plugin_paths() {
<<<<<<< HEAD:src/api/api.cc
std::string info_path(MYNTEYE_SDK_INSTALL_DIR);
info_path.append(
MYNTEYE_OS_SEP "share" MYNTEYE_OS_SEP "mynteye" MYNTEYE_OS_SEP
"build.info");
=======
std::string info_path = utils::get_sdk_install_dir(); std::string info_path = utils::get_sdk_install_dir();
info_path.append(MYNTEYE_OS_SEP "share" MYNTEYE_OS_SEP "mynteye" MYNTEYE_OS_SEP "build.info"); info_path.append(MYNTEYE_OS_SEP "share" MYNTEYE_OS_SEP "mynteye" MYNTEYE_OS_SEP "build.info");
>>>>>>> origin/develop:src/mynteye/api/api.cc
cv::FileStorage fs(info_path, cv::FileStorage::READ); cv::FileStorage fs(info_path, cv::FileStorage::READ);
if (!fs.isOpened()) { if (!fs.isOpened()) {
@ -217,30 +210,7 @@ std::vector<std::string> get_plugin_paths() {
API::API(std::shared_ptr<Device> device) : device_(device) { API::API(std::shared_ptr<Device> device) : device_(device) {
VLOG(2) << __func__; VLOG(2) << __func__;
<<<<<<< HEAD:src/api/api.cc
std::dynamic_pointer_cast<StandardDevice>(device_); std::dynamic_pointer_cast<StandardDevice>(device_);
=======
if (std::dynamic_pointer_cast<StandardDevice>(device_) != nullptr) {
bool in_l_ok, in_r_ok, ex_r2l_ok;
device_->GetIntrinsics(Stream::LEFT, &in_l_ok);
device_->GetIntrinsics(Stream::RIGHT, &in_r_ok);
device_->GetExtrinsics(Stream::RIGHT, Stream::LEFT, &ex_r2l_ok);
if (!in_l_ok || !in_r_ok || !ex_r2l_ok) {
#if defined(WITH_DEVICE_INFO_REQUIRED)
LOG(FATAL)
#else
LOG(WARNING)
#endif
<< "Image params not found, but we need it to process the "
"images. Please `make tools` and use `img_params_writer` "
"to write the image params. If you update the SDK from "
"1.x, the `SN*.conf` is the file contains them. Besides, "
"you could also calibrate them by yourself. Read the guide "
"doc (https://github.com/slightech/MYNT-EYE-S-SDK-Guide) "
"to learn more.";
}
}
>>>>>>> origin/develop:src/mynteye/api/api.cc
synthetic_.reset(new Synthetic(this)); synthetic_.reset(new Synthetic(this));
} }

17
src/mynteye/device/device.cc
View File

@ -558,11 +558,6 @@ void Device::ReadAllInfos() {
CHECK_NOTNULL(channels_); CHECK_NOTNULL(channels_);
Channels::imu_params_t imu_params; Channels::imu_params_t imu_params;
<<<<<<< HEAD:src/device/device.cc
if (!channels_->GetFiles(device_info_.get(), &img_params_, &imu_params)) {
LOG(FATAL) << "Read device infos failed. Please upgrade your firmware to "
"the latest version.";
=======
if (!channels_->GetFiles(device_info_.get(), &img_params, &imu_params)) { if (!channels_->GetFiles(device_info_.get(), &img_params, &imu_params)) {
#if defined(WITH_DEVICE_INFO_REQUIRED) #if defined(WITH_DEVICE_INFO_REQUIRED)
LOG(FATAL) LOG(FATAL)
@ -571,7 +566,6 @@ void Device::ReadAllInfos() {
#endif #endif
<< "Read device infos failed. Please upgrade your firmware to the " << "Read device infos failed. Please upgrade your firmware to the "
"latest version."; "latest version.";
>>>>>>> origin/develop:src/mynteye/device/device.cc
} }
VLOG(2) << "Device info: {name: " << device_info_->name VLOG(2) << "Device info: {name: " << device_info_->name
<< ", serial_number: " << device_info_->serial_number << ", serial_number: " << device_info_->serial_number
@ -585,21 +579,10 @@ void Device::ReadAllInfos() {
<< ", nominal_baseline: " << device_info_->nominal_baseline << "}"; << ", nominal_baseline: " << device_info_->nominal_baseline << "}";
device_info_->name = uvc::get_name(*device_); device_info_->name = uvc::get_name(*device_);
<<<<<<< HEAD:src/device/device.cc
if (img_params_.ok) { if (img_params_.ok) {
SetExtrinsics(Stream::LEFT, Stream::RIGHT, img_params_.ex_right_to_left); SetExtrinsics(Stream::LEFT, Stream::RIGHT, img_params_.ex_right_to_left);
VLOG(2) << "Extrinsics left to right: {" VLOG(2) << "Extrinsics left to right: {"
<< GetExtrinsics(Stream::LEFT, Stream::RIGHT) << "}"; << GetExtrinsics(Stream::LEFT, Stream::RIGHT) << "}";
=======
if (img_params.ok) {
SetIntrinsics(Stream::LEFT, img_params.in_left);
SetIntrinsics(Stream::RIGHT, img_params.in_right);
SetExtrinsics(Stream::RIGHT, Stream::LEFT, img_params.ex_right_to_left);
VLOG(2) << "Intrinsics left: {" << GetIntrinsics(Stream::LEFT) << "}";
VLOG(2) << "Intrinsics right: {" << GetIntrinsics(Stream::RIGHT) << "}";
VLOG(2) << "Extrinsics right to left: {"
<< GetExtrinsics(Stream::RIGHT, Stream::LEFT) << "}";
>>>>>>> origin/develop:src/mynteye/device/device.cc
} else { } else {
LOG(WARNING) << "Intrinsics & extrinsics not exist"; LOG(WARNING) << "Intrinsics & extrinsics not exist";
} }

4
src/mynteye/uvc/linux/uvc-v4l2.cc
View File

@ -409,16 +409,12 @@ struct device {
} }
if (no_data_count > NO_DATA_MAX_COUNT) { if (no_data_count > NO_DATA_MAX_COUNT) {
<<<<<<< HEAD:src/uvc/uvc-v4l2.cc
no_data_count = 0; no_data_count = 0;
living_count = 0; living_count = 0;
LOG(WARNING) << __func__ LOG(WARNING) << __func__
<< " failed: v4l2 get stream time out,Try to reboot!"; << " failed: v4l2 get stream time out,Try to reboot!";
stop_capture(); stop_capture();
start_capture(); start_capture();
=======
throw_error("v4l2 get stream time out!");
>>>>>>> origin/develop:src/mynteye/uvc/linux/uvc-v4l2.cc
} }
} }

10
wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt
View File

@ -79,10 +79,7 @@ catkin_package(
#get_filename_component(SDK_DIR "${PROJECT_SOURCE_DIR}/../../../.." ABSOLUTE) #get_filename_component(SDK_DIR "${PROJECT_SOURCE_DIR}/../../../.." ABSOLUTE)
#LIST(APPEND CMAKE_PREFIX_PATH ${SDK_DIR}/_install/lib/cmake) #LIST(APPEND CMAKE_PREFIX_PATH ${SDK_DIR}/_install/lib/cmake)
<<<<<<< HEAD
=======
LIST(APPEND CMAKE_MODULE_PATH cmake) LIST(APPEND CMAKE_MODULE_PATH cmake)
>>>>>>> origin/develop
find_package(mynteye REQUIRED) find_package(mynteye REQUIRED)
message(STATUS "Found mynteye: ${mynteye_VERSION}") message(STATUS "Found mynteye: ${mynteye_VERSION}")
@ -91,12 +88,6 @@ if(NOT mynteye_WITH_API)
message(FATAL_ERROR "Must with API layer :(") message(FATAL_ERROR "Must with API layer :(")
endif() endif()
<<<<<<< HEAD
include(${SDK_DIR}/cmake/DetectOpenCV.cmake)
if(mynteye_WITH_GLOG)
include(${SDK_DIR}/cmake/DetectGLog.cmake)
=======
include(cmake/DetectOpenCV.cmake) include(cmake/DetectOpenCV.cmake)
if(mynteye_WITH_GLOG) if(mynteye_WITH_GLOG)
@ -104,7 +95,6 @@ if(mynteye_WITH_GLOG)
if(glog_FOUND) if(glog_FOUND)
add_definitions(-DWITH_GLOG) add_definitions(-DWITH_GLOG)
endif() endif()
>>>>>>> origin/develop
endif() endif()
# targets # targets