Changeset 100 in flair-src for trunk/lib/FlairMeta/src

Timestamp:

Oct 5, 2016, 4:11:18 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

passage quaternoin 3dmgx3

Location:

trunk/lib/FlairMeta/src

Files:

• HdsX8.cpp (modified) (1 diff)
• XAir.cpp (modified) (1 diff)

trunk/lib/FlairMeta/src/HdsX8.cpp

@@ -48 +48 @@
   SetUsRangeFinder(new Srf08(parent, "SRF08", i2cport, 0x70, 60));
   SetAhrs(new Gx3_25_ahrs(parent, "imu", imu_port,
-                          Gx3_25_imu::EulerAnglesAndAngularRates, 70));
+                          Gx3_25_imu::AccelerationAngularRateAndOrientationMatrix, 70));
   SetBatteryMonitor(((BlCtrlV2 *)GetBldc())->GetBatteryMonitor());
 

trunk/lib/FlairMeta/src/XAir.cpp

@@ -51 +51 @@
   SetUsRangeFinder(new Srf08(parent, "SRF08", i2cport, 0x70, 60));
   SetAhrs(new Gx3_25_ahrs(parent, "imu", imu_port,
-                          Gx3_25_imu::EulerAnglesAndAngularRates, 70));
+                          Gx3_25_imu::AccelerationAngularRateAndOrientationMatrix, 70));
   Tab *bat_tab = new Tab(parent->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));