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

8
samples/tutorials/control/iic_address.cc
View File

@@ -28,15 +28,15 @@ int main(int argc, char *argv[]) {
api->ConfigStreamRequest(request);
Model model = api->GetModel();
if (model == Model::STANDARD210A) {
if (model == Model::STANDARD210A || model == Model::STANDARD2) {
api->SetOptionValue(Option::IIC_ADDRESS_SETTING, 0x31);
LOG(INFO) << "Set iic address to " << std::hex << "0x"
<< api->GetOptionValue(Option::IIC_ADDRESS_SETTING);
}
// MYNTEYE-S1030/S2100 don't support this option
if (model == Model::STANDARD2 || model == Model::STANDARD) {
LOG(INFO) << "Sorry,MYNTEYE-S1030/S2100 don't support iic address setting";
// MYNTEYE-S1030 don't support this option
if (model == Model::STANDARD) {
LOG(INFO) << "Sorry,MYNTEYE-S1030 don't support iic address setting";
return 0;
}