Skip to content
Snippets Groups Projects
Commit 10d01cf5 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

replace origin frame pointer for origin capture pointer in CaptureIMU

parent 0c5daca5
No related branches found
No related tags found
3 merge requests!39release after RAL,!38After 2nd RAL submission,!12Capture motion
...@@ -17,14 +17,14 @@ class CaptureIMU : public CaptureMotion ...@@ -17,14 +17,14 @@ class CaptureIMU : public CaptureMotion
SensorBasePtr _sensor_ptr, SensorBasePtr _sensor_ptr,
const Eigen::Vector6s& _data, const Eigen::Vector6s& _data,
const Eigen::MatrixXs& _data_cov, const Eigen::MatrixXs& _data_cov,
FrameBasePtr _origin_frame_ptr = nullptr); CaptureBasePtr _origin_capture = nullptr);
CaptureIMU(const TimeStamp& _init_ts, CaptureIMU(const TimeStamp& _init_ts,
SensorBasePtr _sensor_ptr, SensorBasePtr _sensor_ptr,
const Eigen::Vector6s& _data, const Eigen::Vector6s& _data,
const Eigen::MatrixXs& _data_cov, const Eigen::MatrixXs& _data_cov,
const Vector6s& _bias, const Vector6s& _bias,
FrameBasePtr _origin_frame_ptr = nullptr); CaptureBasePtr _origin_capture = nullptr);
virtual ~CaptureIMU(); virtual ~CaptureIMU();
......
...@@ -69,7 +69,7 @@ class ProcessorIMU : public ProcessorMotion{ ...@@ -69,7 +69,7 @@ class ProcessorIMU : public ProcessorMotion{
const MatrixXs& _data_cov, const MatrixXs& _data_cov,
const VectorXs& _calib, const VectorXs& _calib,
const VectorXs& _calib_preint, const VectorXs& _calib_preint,
const FrameBasePtr& _frame_origin) override; const CaptureBasePtr& _capture_origin) override;
virtual FeatureBasePtr emplaceFeature(CaptureMotionPtr _capture_motion) override; virtual FeatureBasePtr emplaceFeature(CaptureMotionPtr _capture_motion) override;
virtual FactorBasePtr emplaceFactor(FeatureBasePtr _feature_motion, virtual FactorBasePtr emplaceFactor(FeatureBasePtr _feature_motion,
CaptureBasePtr _capture_origin) override; CaptureBasePtr _capture_origin) override;
......
...@@ -8,8 +8,8 @@ CaptureIMU::CaptureIMU(const TimeStamp& _init_ts, ...@@ -8,8 +8,8 @@ CaptureIMU::CaptureIMU(const TimeStamp& _init_ts,
SensorBasePtr _sensor_ptr, SensorBasePtr _sensor_ptr,
const Eigen::Vector6s& _acc_gyro_data, const Eigen::Vector6s& _acc_gyro_data,
const Eigen::MatrixXs& _data_cov, const Eigen::MatrixXs& _data_cov,
FrameBasePtr _origin_frame_ptr) : CaptureBasePtr _origin_capture) :
CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_frame_ptr, nullptr, nullptr, std::make_shared<StateBlock>(6, false)) CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_capture, nullptr, nullptr, std::make_shared<StateBlock>(6, false))
{ {
// //
} }
...@@ -19,8 +19,8 @@ CaptureIMU::CaptureIMU(const TimeStamp& _init_ts, ...@@ -19,8 +19,8 @@ CaptureIMU::CaptureIMU(const TimeStamp& _init_ts,
const Eigen::Vector6s& _acc_gyro_data, const Eigen::Vector6s& _acc_gyro_data,
const Eigen::MatrixXs& _data_cov, const Eigen::MatrixXs& _data_cov,
const Vector6s& _bias, const Vector6s& _bias,
FrameBasePtr _origin_frame_ptr) : CaptureBasePtr _origin_capture) :
CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_frame_ptr, nullptr, nullptr, std::make_shared<StateBlock>(_bias, false)) CaptureMotion("IMU", _init_ts, _sensor_ptr, _acc_gyro_data, _data_cov, 10, 9, _origin_capture, nullptr, nullptr, std::make_shared<StateBlock>(_bias, false))
{ {
// //
} }
......
...@@ -65,14 +65,14 @@ CaptureMotionPtr ProcessorIMU::emplaceCapture(const FrameBasePtr& _frame_own, ...@@ -65,14 +65,14 @@ CaptureMotionPtr ProcessorIMU::emplaceCapture(const FrameBasePtr& _frame_own,
const MatrixXs& _data_cov, const MatrixXs& _data_cov,
const VectorXs& _calib, const VectorXs& _calib,
const VectorXs& _calib_preint, const VectorXs& _calib_preint,
const FrameBasePtr& _frame_origin) const CaptureBasePtr& _capture_origin)
{ {
auto cap_motion = std::static_pointer_cast<CaptureMotion>(CaptureBase::emplace<CaptureIMU>(_frame_own, auto cap_motion = std::static_pointer_cast<CaptureMotion>(CaptureBase::emplace<CaptureIMU>(_frame_own,
_ts, _ts,
_sensor, _sensor,
_data, _data,
_data_cov, _data_cov,
_frame_origin)); _capture_origin));
cap_motion->setCalibration(_calib); cap_motion->setCalibration(_calib);
cap_motion->setCalibrationPreint(_calib_preint); cap_motion->setCalibrationPreint(_calib_preint);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment