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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

singleton manager

File:

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

trunk/lib/FlairMeta/src/SimuX4.cpp

@@ -42 +42 @@
 
   if (multiplex == NULL)
-    SetMultiplex(new X4X8Multiplex(getFrameworkManager(), "motors", X4X8Multiplex::X4));
+    SetMultiplex(new X4X8Multiplex("motors", X4X8Multiplex::X4));
 
   SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
                        "motors", GetUavMultiplex()->MotorsCount(), simu_id));
-  SetUsRangeFinder(new SimuUs(getFrameworkManager(), "us", simu_id, 60));
-  SetAhrs(new SimuAhrs(getFrameworkManager(), "imu", simu_id, 70));
+  SetUsRangeFinder(new SimuUs("us", simu_id, 60));
+  SetAhrs(new SimuAhrs("imu", simu_id, 70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
   GetBatteryMonitor()->SetBatteryValue(12);
   SetVerticalCamera(
-      new SimuCamera(getFrameworkManager(), "simu_cam_v", 320, 240, 3, simu_id, 10));
+      new SimuCamera("simu_cam_v", 320, 240, 3, simu_id, 10));
 }