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

Successful first compilation after merge

Browse Source
This commit is contained in:
kalman
2018-11-27 14:50:12 +08:00
parent b346f7fec9
commit 7a9f9139fd
12 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mynteye/device/channels.cc
View File

@@ -565,7 +565,7 @@ std::size_t from_data(
// TODO(Kalman): Is there a more elegant way?
std::size_t from_data(
Channels::img_params_t *img_params, const std::uint8_t *data,
device::img_params_t *img_params, const std::uint8_t *data,
const Version *spec_version) {
std::size_t i = 0;
@@ -600,7 +600,7 @@ std::size_t from_data(
}
std::size_t from_data(
Channels::imu_params_t *imu_params, const std::uint8_t *data,
device::imu_params_t *imu_params, const std::uint8_t *data,
const Version *spec_version) {
std::size_t i = 0;
i += from_data(&imu_params->in_accel, data + i, spec_version);
@@ -864,7 +864,7 @@ std::size_t to_data(
}
std::size_t to_data(
const Channels::img_params_t *img_params, std::uint8_t *data,
const device::img_params_t *img_params, std::uint8_t *data,
const Version *spec_version) {
std::size_t i = 3; // skip id, size

6
src/mynteye/device/channels.h
View File

@@ -21,6 +21,7 @@
#include "mynteye/mynteye.h"
#include "mynteye/types.h"
#include "mynteye/device/device.h"
#include "mynteye/device/types.h"
#include "mynteye/uvc/uvc.h"
@@ -67,6 +68,9 @@ class MYNTEYE_API Channels {
using device_info_t = DeviceInfo;
using imu_params_t = device::imu_params_t;
using img_params_t = device::img_params_t;
/*
typedef struct ImgParams {
bool ok;
std::map<Resolution, Intrinsics> in_left_map;
@@ -80,7 +84,7 @@ class MYNTEYE_API Channels {
ImuIntrinsics in_gyro;
Extrinsics ex_left_to_imu;
} imu_params_t;
*/
explicit Channels(std::shared_ptr<uvc::device> device);
~Channels();

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

@@ -557,8 +557,8 @@ void Device::ReadAllInfos() {
device_info_ = std::make_shared<DeviceInfo>();
CHECK_NOTNULL(channels_);
Channels::imu_params_t imu_params;
if (!channels_->GetFiles(device_info_.get(), &img_params, &imu_params)) {
Device::imu_params_t imu_params;
if (!channels_->GetFiles(device_info_.get(), &img_params_, &imu_params)) {
#if defined(WITH_DEVICE_INFO_REQUIRED)
LOG(FATAL)
#else
@@ -629,7 +629,7 @@ void Device::CallbackMotionData(const device::MotionData &data) {
}
}
Channels::img_params_t Device::GetImgParams() {
Device::img_params_t Device::GetImgParams() {
return img_params_;
}