Changeset 137 in flair-src for trunk/lib/FlairMeta/src/XAir.cpp

Timestamp:

Feb 14, 2017, 3:06:20 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

File:

• trunk/lib/FlairMeta/src/XAir.cpp (modified) (1 diff)

trunk/lib/FlairMeta/src/XAir.cpp

@@ -45 +45 @@
 
   if (multiplex == NULL)
-    SetMultiplex(new X4X8Multiplex(getFrameworkManager(), "motors", X4X8Multiplex::X8));
+    SetMultiplex(new X4X8Multiplex("motors", X4X8Multiplex::X8));
 
   SetBldc(new AfroBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
                        "motors", GetUavMultiplex()->MotorsCount(), i2cport));
-  SetUsRangeFinder(new Srf08(getFrameworkManager(), "SRF08", i2cport, 0x70, 60));
-  SetAhrs(new Gx3_25_ahrs(getFrameworkManager(), "imu", imu_port,
+  SetUsRangeFinder(new Srf08("SRF08", i2cport, 0x70, 60));
+  SetAhrs(new Gx3_25_ahrs("imu", imu_port,
                           Gx3_25_imu::AccelerationAngularRateAndOrientationMatrix, 70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
   GetBatteryMonitor()->SetBatteryValue(12);
-  SetVerticalCamera(new Ps3Eye(getFrameworkManager(), "camv", 0, 50));
+  SetVerticalCamera(new Ps3Eye("camv", 0, 50));
 }