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

Merge branch 'hotfix/ros_imu_timestamp' into develop

Browse Source 
* hotfix/ros_imu_timestamp:
  fix(ros): ros error enum error
  fix: 14.04 complie error
  feat(doc): supported set address for 2100
  feat(src): supported set iic address for s2100
  fix(ros): fixed bug of imu align for part of device

# Conflicts:
#	wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc
This commit is contained in:
John Zhao
2019-04-15 09:51:58 +08:00
parent 1a080d438f b3f6c82f8d
commit 3383d43360
4 changed files with 106 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mynteye/device/config.cc
View File

@@ -45,7 +45,8 @@ const std::map<Model, OptionSupports> option_supports_map = {
Option::IR_CONTROL, Option::MIN_EXPOSURE_TIME,
Option::DESIRED_BRIGHTNESS, Option::ACCELEROMETER_RANGE,
Option::GYROSCOPE_RANGE, Option::ACCELEROMETER_LOW_PASS_FILTER,
Option::GYROSCOPE_LOW_PASS_FILTER, Option::ERASE_CHIP}
Option::GYROSCOPE_LOW_PASS_FILTER, Option::IIC_ADDRESS_SETTING,
Option::ERASE_CHIP}
},
{Model::STANDARD210A, {
Option::BRIGHTNESS,